Added CMake, cleaned up directories