restructure app folder