Folder structure cleanup for Common project