restructed the app folder