Finished refactoring
Missed sln file