Initial update of structure and adding CMakeLists