Fix solution/project structure