adding files moving tests
final cleanup
Merge pull request #40 from joeandrewkey/project_restructure

Project restructure