Solution reorganization (ready for build server)