diff --git a/maliput_object/CHANGELOG.rst b/CHANGELOG.rst
similarity index 100%
rename from maliput_object/CHANGELOG.rst
rename to CHANGELOG.rst
diff --git a/maliput_object/CMakeLists.txt b/CMakeLists.txt
similarity index 92%
rename from maliput_object/CMakeLists.txt
rename to CMakeLists.txt
index e0579cc..fbd36ac 100644
--- a/maliput_object/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,8 @@ message(STATUS "\n\n========= Project Configuration ========\n")
set(BUILD_SHARED_LIBS true)
-include(${PROJECT_SOURCE_DIR}/../cmake/DefaultCFlags.cmake)
-include(${PROJECT_SOURCE_DIR}/../cmake/SanitizersConfig.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/DefaultCFlags.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/SanitizersConfig.cmake)
##############################################################################
@@ -58,7 +58,7 @@ if(BUILD_TESTING)
find_package(ament_cmake_clang_format REQUIRED)
enable_testing()
add_subdirectory(test)
- ament_clang_format(CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../.clang-format)
+ ament_clang_format(CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format)
endif()
##############################################################################
diff --git a/maliput_object/doc/Doxyfile.overlay.in b/doc/Doxyfile.overlay.in
similarity index 100%
rename from maliput_object/doc/Doxyfile.overlay.in
rename to doc/Doxyfile.overlay.in
diff --git a/maliput_object/include/CMakeLists.txt b/include/CMakeLists.txt
similarity index 100%
rename from maliput_object/include/CMakeLists.txt
rename to include/CMakeLists.txt
diff --git a/maliput_object/include/maliput_object/CMakeLists.txt b/include/maliput_object/CMakeLists.txt
similarity index 100%
rename from maliput_object/include/maliput_object/CMakeLists.txt
rename to include/maliput_object/CMakeLists.txt
diff --git a/maliput_object/include/maliput_object/api/CMakeLists.txt b/include/maliput_object/api/CMakeLists.txt
similarity index 100%
rename from maliput_object/include/maliput_object/api/CMakeLists.txt
rename to include/maliput_object/api/CMakeLists.txt
diff --git a/maliput_object/include/maliput_object/api/bounding_region.h b/include/maliput_object/api/bounding_region.h
similarity index 100%
rename from maliput_object/include/maliput_object/api/bounding_region.h
rename to include/maliput_object/api/bounding_region.h
diff --git a/maliput_object/include/maliput_object/api/object.h b/include/maliput_object/api/object.h
similarity index 100%
rename from maliput_object/include/maliput_object/api/object.h
rename to include/maliput_object/api/object.h
diff --git a/maliput_object/include/maliput_object/api/object_book.h b/include/maliput_object/api/object_book.h
similarity index 100%
rename from maliput_object/include/maliput_object/api/object_book.h
rename to include/maliput_object/api/object_book.h
diff --git a/maliput_object/include/maliput_object/api/object_query.h b/include/maliput_object/api/object_query.h
similarity index 100%
rename from maliput_object/include/maliput_object/api/object_query.h
rename to include/maliput_object/api/object_query.h
diff --git a/maliput_object/include/maliput_object/api/overlapping_type.h b/include/maliput_object/api/overlapping_type.h
similarity index 100%
rename from maliput_object/include/maliput_object/api/overlapping_type.h
rename to include/maliput_object/api/overlapping_type.h
diff --git a/maliput_object/include/maliput_object/base/CMakeLists.txt b/include/maliput_object/base/CMakeLists.txt
similarity index 100%
rename from maliput_object/include/maliput_object/base/CMakeLists.txt
rename to include/maliput_object/base/CMakeLists.txt
diff --git a/maliput_object/include/maliput_object/base/bounding_box.h b/include/maliput_object/base/bounding_box.h
similarity index 100%
rename from maliput_object/include/maliput_object/base/bounding_box.h
rename to include/maliput_object/base/bounding_box.h
diff --git a/maliput_object/include/maliput_object/base/manual_object_book.h b/include/maliput_object/base/manual_object_book.h
similarity index 100%
rename from maliput_object/include/maliput_object/base/manual_object_book.h
rename to include/maliput_object/base/manual_object_book.h
diff --git a/maliput_object/include/maliput_object/base/simple_object_query.h b/include/maliput_object/base/simple_object_query.h
similarity index 100%
rename from maliput_object/include/maliput_object/base/simple_object_query.h
rename to include/maliput_object/base/simple_object_query.h
diff --git a/maliput_object/include/maliput_object/loader/CMakeLists.txt b/include/maliput_object/loader/CMakeLists.txt
similarity index 100%
rename from maliput_object/include/maliput_object/loader/CMakeLists.txt
rename to include/maliput_object/loader/CMakeLists.txt
diff --git a/maliput_object/include/maliput_object/loader/loader.h b/include/maliput_object/loader/loader.h
similarity index 100%
rename from maliput_object/include/maliput_object/loader/loader.h
rename to include/maliput_object/loader/loader.h
diff --git a/maliput_object/include/maliput_object/test_utilities/CMakeLists.txt b/include/maliput_object/test_utilities/CMakeLists.txt
similarity index 100%
rename from maliput_object/include/maliput_object/test_utilities/CMakeLists.txt
rename to include/maliput_object/test_utilities/CMakeLists.txt
diff --git a/maliput_object/include/maliput_object/test_utilities/mock.h b/include/maliput_object/test_utilities/mock.h
similarity index 100%
rename from maliput_object/include/maliput_object/test_utilities/mock.h
rename to include/maliput_object/test_utilities/mock.h
diff --git a/maliput_object/package.xml b/package.xml
similarity index 93%
rename from maliput_object/package.xml
rename to package.xml
index 0f23b35..f65e59f 100644
--- a/maliput_object/package.xml
+++ b/package.xml
@@ -5,7 +5,7 @@
1.0.0
Maliput Object
Daniel Stonier
- BSD Clause 3
+ BSD Clause 3
ament_cmake
ament_cmake_doxygen
diff --git a/maliput_object/src/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from maliput_object/src/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/maliput_object/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
similarity index 100%
rename from maliput_object/src/api/CMakeLists.txt
rename to src/api/CMakeLists.txt
diff --git a/maliput_object/src/api/object.cc b/src/api/object.cc
similarity index 100%
rename from maliput_object/src/api/object.cc
rename to src/api/object.cc
diff --git a/maliput_object/src/api/overlapping_type.cc b/src/api/overlapping_type.cc
similarity index 100%
rename from maliput_object/src/api/overlapping_type.cc
rename to src/api/overlapping_type.cc
diff --git a/maliput_object/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
similarity index 100%
rename from maliput_object/src/base/CMakeLists.txt
rename to src/base/CMakeLists.txt
diff --git a/maliput_object/src/base/bounding_box.cc b/src/base/bounding_box.cc
similarity index 100%
rename from maliput_object/src/base/bounding_box.cc
rename to src/base/bounding_box.cc
diff --git a/maliput_object/src/base/manual_object_book.cc b/src/base/manual_object_book.cc
similarity index 100%
rename from maliput_object/src/base/manual_object_book.cc
rename to src/base/manual_object_book.cc
diff --git a/maliput_object/src/base/simple_object_query.cc b/src/base/simple_object_query.cc
similarity index 100%
rename from maliput_object/src/base/simple_object_query.cc
rename to src/base/simple_object_query.cc
diff --git a/maliput_object/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt
similarity index 100%
rename from maliput_object/src/loader/CMakeLists.txt
rename to src/loader/CMakeLists.txt
diff --git a/maliput_object/src/loader/loader.cc b/src/loader/loader.cc
similarity index 100%
rename from maliput_object/src/loader/loader.cc
rename to src/loader/loader.cc
diff --git a/maliput_object/test/CMakeLists.txt b/test/CMakeLists.txt
similarity index 100%
rename from maliput_object/test/CMakeLists.txt
rename to test/CMakeLists.txt
diff --git a/maliput_object/test/api/CMakeLists.txt b/test/api/CMakeLists.txt
similarity index 100%
rename from maliput_object/test/api/CMakeLists.txt
rename to test/api/CMakeLists.txt
diff --git a/maliput_object/test/api/bounding_region_test.cc b/test/api/bounding_region_test.cc
similarity index 100%
rename from maliput_object/test/api/bounding_region_test.cc
rename to test/api/bounding_region_test.cc
diff --git a/maliput_object/test/api/object_book_test.cc b/test/api/object_book_test.cc
similarity index 100%
rename from maliput_object/test/api/object_book_test.cc
rename to test/api/object_book_test.cc
diff --git a/maliput_object/test/api/object_query_test.cc b/test/api/object_query_test.cc
similarity index 100%
rename from maliput_object/test/api/object_query_test.cc
rename to test/api/object_query_test.cc
diff --git a/maliput_object/test/api/object_test.cc b/test/api/object_test.cc
similarity index 100%
rename from maliput_object/test/api/object_test.cc
rename to test/api/object_test.cc
diff --git a/maliput_object/test/api/overlapping_type_test.cc b/test/api/overlapping_type_test.cc
similarity index 100%
rename from maliput_object/test/api/overlapping_type_test.cc
rename to test/api/overlapping_type_test.cc
diff --git a/maliput_object/test/base/CMakeLists.txt b/test/base/CMakeLists.txt
similarity index 100%
rename from maliput_object/test/base/CMakeLists.txt
rename to test/base/CMakeLists.txt
diff --git a/maliput_object/test/base/bounding_box_test.cc b/test/base/bounding_box_test.cc
similarity index 100%
rename from maliput_object/test/base/bounding_box_test.cc
rename to test/base/bounding_box_test.cc
diff --git a/maliput_object/test/base/manual_object_book_test.cc b/test/base/manual_object_book_test.cc
similarity index 100%
rename from maliput_object/test/base/manual_object_book_test.cc
rename to test/base/manual_object_book_test.cc
diff --git a/maliput_object/test/base/simple_object_query_test.cc b/test/base/simple_object_query_test.cc
similarity index 100%
rename from maliput_object/test/base/simple_object_query_test.cc
rename to test/base/simple_object_query_test.cc
diff --git a/maliput_object/test/loader/CMakeLists.txt b/test/loader/CMakeLists.txt
similarity index 100%
rename from maliput_object/test/loader/CMakeLists.txt
rename to test/loader/CMakeLists.txt
diff --git a/maliput_object/test/loader/loader_test.cc b/test/loader/loader_test.cc
similarity index 100%
rename from maliput_object/test/loader/loader_test.cc
rename to test/loader/loader_test.cc
diff --git a/maliput_object/tools/reformat_code.sh b/tools/reformat_code.sh
similarity index 96%
rename from maliput_object/tools/reformat_code.sh
rename to tools/reformat_code.sh
index 8fb03fc..a2486da 100755
--- a/maliput_object/tools/reformat_code.sh
+++ b/tools/reformat_code.sh
@@ -45,7 +45,7 @@ export PATH=$PATH:/home/$USER/.local/bin
declare -i CLANGFORMATFAILED=0
pushd $REPO_DIR
-ament_clang_format --config=./../.clang-format --reformat || CLANGFORMATFAILED=1
+ament_clang_format --config=./.clang-format --reformat || CLANGFORMATFAILED=1
popd
if [ "$CLANGFORMATFAILED" -ne "0" ]; then