Big reorganisation with CMake
Removed the 'old' files.