Moved everything to one folder

Makes TDD easier