Merge "[CDM][1/2] Modulize files" into main