Reconfigured CMakeLists and Structure