diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14421251..9866c8ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,8 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/spdlog)
 
 # Add imgui
 set(IMGUI_INCLUDE_DIRS
-${CMAKE_CURRENT_SOURCE_DIR}/external/imgui
-${CMAKE_CURRENT_SOURCE_DIR}/external/imgui/backends
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/imgui
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/imgui/backends
 )
 set(IMGUI_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/external/imgui/imgui.cpp
@@ -44,8 +44,8 @@ add_library(imgui ${IMGUI_SRCS})
 set(FMT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/fmt/include)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/fmt)
 
-# Add nlohmann_json
-set(NLOHMANN_JSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/nlohmann_json/include)
+# Add nlohmann
+set(NLOHMANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/nlohmann/include)
 
 # Add embree
 set(EMBREE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/external/embree/include)
@@ -68,7 +68,7 @@ include_directories(
     ${SPDLOG_INCLUDE_DIRS}
     ${IMGUI_INCLUDE_DIRS}
     ${FMT_INCLUDE_DIRS}
-    ${NLOHMANN_JSON_INCLUDE_DIRS}
+    ${NLOHMANN_INCLUDE_DIRS}
     ${EMBREE_INCLUDE_DIRS}
     ${STB_INCLUDE_DIRS}
     ${TINY_INCLUDE_DIRS}
diff --git a/external/nlohmann_json/debug/lib/pkgconfig/nlohmann_json.pc b/external/nlohmann/debug/lib/pkgconfig/nlohmann_json.pc
similarity index 100%
rename from external/nlohmann_json/debug/lib/pkgconfig/nlohmann_json.pc
rename to external/nlohmann/debug/lib/pkgconfig/nlohmann_json.pc
diff --git a/external/nlohmann_json/include/nlohmann/adl_serializer.hpp b/external/nlohmann/include/nlohmann/adl_serializer.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/adl_serializer.hpp
rename to external/nlohmann/include/nlohmann/adl_serializer.hpp
diff --git a/external/nlohmann_json/include/nlohmann/byte_container_with_subtype.hpp b/external/nlohmann/include/nlohmann/byte_container_with_subtype.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/byte_container_with_subtype.hpp
rename to external/nlohmann/include/nlohmann/byte_container_with_subtype.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/conversions/from_json.hpp b/external/nlohmann/include/nlohmann/detail/conversions/from_json.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/conversions/from_json.hpp
rename to external/nlohmann/include/nlohmann/detail/conversions/from_json.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/conversions/to_chars.hpp b/external/nlohmann/include/nlohmann/detail/conversions/to_chars.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/conversions/to_chars.hpp
rename to external/nlohmann/include/nlohmann/detail/conversions/to_chars.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/conversions/to_json.hpp b/external/nlohmann/include/nlohmann/detail/conversions/to_json.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/conversions/to_json.hpp
rename to external/nlohmann/include/nlohmann/detail/conversions/to_json.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/exceptions.hpp b/external/nlohmann/include/nlohmann/detail/exceptions.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/exceptions.hpp
rename to external/nlohmann/include/nlohmann/detail/exceptions.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/hash.hpp b/external/nlohmann/include/nlohmann/detail/hash.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/hash.hpp
rename to external/nlohmann/include/nlohmann/detail/hash.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/input/binary_reader.hpp b/external/nlohmann/include/nlohmann/detail/input/binary_reader.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/input/binary_reader.hpp
rename to external/nlohmann/include/nlohmann/detail/input/binary_reader.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/input/input_adapters.hpp b/external/nlohmann/include/nlohmann/detail/input/input_adapters.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/input/input_adapters.hpp
rename to external/nlohmann/include/nlohmann/detail/input/input_adapters.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/input/json_sax.hpp b/external/nlohmann/include/nlohmann/detail/input/json_sax.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/input/json_sax.hpp
rename to external/nlohmann/include/nlohmann/detail/input/json_sax.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/input/lexer.hpp b/external/nlohmann/include/nlohmann/detail/input/lexer.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/input/lexer.hpp
rename to external/nlohmann/include/nlohmann/detail/input/lexer.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/input/parser.hpp b/external/nlohmann/include/nlohmann/detail/input/parser.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/input/parser.hpp
rename to external/nlohmann/include/nlohmann/detail/input/parser.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/input/position_t.hpp b/external/nlohmann/include/nlohmann/detail/input/position_t.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/input/position_t.hpp
rename to external/nlohmann/include/nlohmann/detail/input/position_t.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/iterators/internal_iterator.hpp b/external/nlohmann/include/nlohmann/detail/iterators/internal_iterator.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/iterators/internal_iterator.hpp
rename to external/nlohmann/include/nlohmann/detail/iterators/internal_iterator.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/iterators/iter_impl.hpp b/external/nlohmann/include/nlohmann/detail/iterators/iter_impl.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/iterators/iter_impl.hpp
rename to external/nlohmann/include/nlohmann/detail/iterators/iter_impl.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/iterators/iteration_proxy.hpp b/external/nlohmann/include/nlohmann/detail/iterators/iteration_proxy.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/iterators/iteration_proxy.hpp
rename to external/nlohmann/include/nlohmann/detail/iterators/iteration_proxy.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/iterators/iterator_traits.hpp b/external/nlohmann/include/nlohmann/detail/iterators/iterator_traits.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/iterators/iterator_traits.hpp
rename to external/nlohmann/include/nlohmann/detail/iterators/iterator_traits.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp b/external/nlohmann/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
rename to external/nlohmann/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/iterators/primitive_iterator.hpp b/external/nlohmann/include/nlohmann/detail/iterators/primitive_iterator.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/iterators/primitive_iterator.hpp
rename to external/nlohmann/include/nlohmann/detail/iterators/primitive_iterator.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/json_pointer.hpp b/external/nlohmann/include/nlohmann/detail/json_pointer.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/json_pointer.hpp
rename to external/nlohmann/include/nlohmann/detail/json_pointer.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/json_ref.hpp b/external/nlohmann/include/nlohmann/detail/json_ref.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/json_ref.hpp
rename to external/nlohmann/include/nlohmann/detail/json_ref.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/macro_scope.hpp b/external/nlohmann/include/nlohmann/detail/macro_scope.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/macro_scope.hpp
rename to external/nlohmann/include/nlohmann/detail/macro_scope.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/macro_unscope.hpp b/external/nlohmann/include/nlohmann/detail/macro_unscope.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/macro_unscope.hpp
rename to external/nlohmann/include/nlohmann/detail/macro_unscope.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/call_std/begin.hpp b/external/nlohmann/include/nlohmann/detail/meta/call_std/begin.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/call_std/begin.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/call_std/begin.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/call_std/end.hpp b/external/nlohmann/include/nlohmann/detail/meta/call_std/end.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/call_std/end.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/call_std/end.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/cpp_future.hpp b/external/nlohmann/include/nlohmann/detail/meta/cpp_future.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/cpp_future.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/cpp_future.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/detected.hpp b/external/nlohmann/include/nlohmann/detail/meta/detected.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/detected.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/detected.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/identity_tag.hpp b/external/nlohmann/include/nlohmann/detail/meta/identity_tag.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/identity_tag.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/identity_tag.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/is_sax.hpp b/external/nlohmann/include/nlohmann/detail/meta/is_sax.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/is_sax.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/is_sax.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/type_traits.hpp b/external/nlohmann/include/nlohmann/detail/meta/type_traits.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/type_traits.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/type_traits.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/meta/void_t.hpp b/external/nlohmann/include/nlohmann/detail/meta/void_t.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/meta/void_t.hpp
rename to external/nlohmann/include/nlohmann/detail/meta/void_t.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/output/binary_writer.hpp b/external/nlohmann/include/nlohmann/detail/output/binary_writer.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/output/binary_writer.hpp
rename to external/nlohmann/include/nlohmann/detail/output/binary_writer.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/output/output_adapters.hpp b/external/nlohmann/include/nlohmann/detail/output/output_adapters.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/output/output_adapters.hpp
rename to external/nlohmann/include/nlohmann/detail/output/output_adapters.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/output/serializer.hpp b/external/nlohmann/include/nlohmann/detail/output/serializer.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/output/serializer.hpp
rename to external/nlohmann/include/nlohmann/detail/output/serializer.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/string_escape.hpp b/external/nlohmann/include/nlohmann/detail/string_escape.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/string_escape.hpp
rename to external/nlohmann/include/nlohmann/detail/string_escape.hpp
diff --git a/external/nlohmann_json/include/nlohmann/detail/value_t.hpp b/external/nlohmann/include/nlohmann/detail/value_t.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/detail/value_t.hpp
rename to external/nlohmann/include/nlohmann/detail/value_t.hpp
diff --git a/external/nlohmann_json/include/nlohmann/json.hpp b/external/nlohmann/include/nlohmann/json.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/json.hpp
rename to external/nlohmann/include/nlohmann/json.hpp
diff --git a/external/nlohmann_json/include/nlohmann/json_fwd.hpp b/external/nlohmann/include/nlohmann/json_fwd.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/json_fwd.hpp
rename to external/nlohmann/include/nlohmann/json_fwd.hpp
diff --git a/external/nlohmann_json/include/nlohmann/ordered_map.hpp b/external/nlohmann/include/nlohmann/ordered_map.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/ordered_map.hpp
rename to external/nlohmann/include/nlohmann/ordered_map.hpp
diff --git a/external/nlohmann_json/include/nlohmann/thirdparty/hedley/hedley.hpp b/external/nlohmann/include/nlohmann/thirdparty/hedley/hedley.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/thirdparty/hedley/hedley.hpp
rename to external/nlohmann/include/nlohmann/thirdparty/hedley/hedley.hpp
diff --git a/external/nlohmann_json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp b/external/nlohmann/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
similarity index 100%
rename from external/nlohmann_json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
rename to external/nlohmann/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
diff --git a/external/nlohmann_json/lib/pkgconfig/nlohmann_json.pc b/external/nlohmann/lib/pkgconfig/nlohmann_json.pc
similarity index 100%
rename from external/nlohmann_json/lib/pkgconfig/nlohmann_json.pc
rename to external/nlohmann/lib/pkgconfig/nlohmann_json.pc
diff --git a/external/nlohmann_json/share/nlohmann_json/nlohmann_json.natvis b/external/nlohmann/share/nlohmann_json/nlohmann_json.natvis
similarity index 100%
rename from external/nlohmann_json/share/nlohmann_json/nlohmann_json.natvis
rename to external/nlohmann/share/nlohmann_json/nlohmann_json.natvis
diff --git a/external/nlohmann_json/share/nlohmann_json/nlohmann_jsonConfig.cmake b/external/nlohmann/share/nlohmann_json/nlohmann_jsonConfig.cmake
similarity index 100%
rename from external/nlohmann_json/share/nlohmann_json/nlohmann_jsonConfig.cmake
rename to external/nlohmann/share/nlohmann_json/nlohmann_jsonConfig.cmake
diff --git a/external/nlohmann_json/share/nlohmann_json/nlohmann_jsonConfigVersion.cmake b/external/nlohmann/share/nlohmann_json/nlohmann_jsonConfigVersion.cmake
similarity index 100%
rename from external/nlohmann_json/share/nlohmann_json/nlohmann_jsonConfigVersion.cmake
rename to external/nlohmann/share/nlohmann_json/nlohmann_jsonConfigVersion.cmake
diff --git a/external/nlohmann_json/share/nlohmann_json/nlohmann_jsonTargets.cmake b/external/nlohmann/share/nlohmann_json/nlohmann_jsonTargets.cmake
similarity index 100%
rename from external/nlohmann_json/share/nlohmann_json/nlohmann_jsonTargets.cmake
rename to external/nlohmann/share/nlohmann_json/nlohmann_jsonTargets.cmake