More project structure

Adding in testing, and more project structure