Sorted bad project structure
Merge pull request #2 from stridecolossus/cleanup

Sorted bad project structure