Refactored Project structure, should have one less level to wade through, closes #14