app folder restructuring