Changed structure and added CMakeLists.txt