Restructured Directory, put everything in the App folder.