* Added CMakeLists.txt and moved a few things around