Merge pull request #2 from Mindar/master

Merge #1
Refactor

Total refactor to bring project in line with class diagram.
Fixed solution setup
Fixed solution setup
Merge pull request #4 from ohbbies/master

Refactor