Refactor solution structure
Merge pull request #7 from danblack101/master

Refactor solution structure