Refactoring and Solved Problem 10

Renamed solution and project and updated directories to reflect name
changes.