restructuring apps file structure