Clean up app folder and update naming convension