Cleaning up the main folder, and fixing the test app