Moving a few files around to clean the app