Major Refactoring: Solution renaming