Reorganised solution/project structure.