[none][Refactor] (CP) updated layout of files