Moved things around a bit, and improved CMakeLists.txt