WIP: Move files to app folder