Renamed solution
Updated readme.md
Refactoring,
Partially fixed #2 (unit tests needed)