First commit after hackathon. Cleaning up some of the folder