clean up app folder and naming convention