Refactoring.
Refactored classes, project and solution.