layout fix: replace solution markers with /*
renaming: main.cc -> ..._main.cc
fix master test: wrong source in CMakeLists (was mysolution, not master)