Reorganized folder structure and cleaned up app delegate