moving tests around and cleaning up the project structure