Merge "Re-org the IEC repo to adapt to actual deployment"