Moved structure around, added CMakeLists