diff --git a/src/uml/class_diagram/model/class.cc b/src/class_diagram/model/class.cc
similarity index 100%
rename from src/uml/class_diagram/model/class.cc
rename to src/class_diagram/model/class.cc
diff --git a/src/uml/class_diagram/model/class.h b/src/class_diagram/model/class.h
similarity index 100%
rename from src/uml/class_diagram/model/class.h
rename to src/class_diagram/model/class.h
diff --git a/src/uml/class_diagram/model/class_element.cc b/src/class_diagram/model/class_element.cc
similarity index 100%
rename from src/uml/class_diagram/model/class_element.cc
rename to src/class_diagram/model/class_element.cc
diff --git a/src/uml/class_diagram/model/class_element.h b/src/class_diagram/model/class_element.h
similarity index 100%
rename from src/uml/class_diagram/model/class_element.h
rename to src/class_diagram/model/class_element.h
diff --git a/src/uml/class_diagram/model/class_member.cc b/src/class_diagram/model/class_member.cc
similarity index 100%
rename from src/uml/class_diagram/model/class_member.cc
rename to src/class_diagram/model/class_member.cc
diff --git a/src/uml/class_diagram/model/class_member.h b/src/class_diagram/model/class_member.h
similarity index 100%
rename from src/uml/class_diagram/model/class_member.h
rename to src/class_diagram/model/class_member.h
diff --git a/src/uml/class_diagram/model/class_method.cc b/src/class_diagram/model/class_method.cc
similarity index 100%
rename from src/uml/class_diagram/model/class_method.cc
rename to src/class_diagram/model/class_method.cc
diff --git a/src/uml/class_diagram/model/class_method.h b/src/class_diagram/model/class_method.h
similarity index 100%
rename from src/uml/class_diagram/model/class_method.h
rename to src/class_diagram/model/class_method.h
diff --git a/src/uml/class_diagram/model/class_parent.cc b/src/class_diagram/model/class_parent.cc
similarity index 100%
rename from src/uml/class_diagram/model/class_parent.cc
rename to src/class_diagram/model/class_parent.cc
diff --git a/src/uml/class_diagram/model/class_parent.h b/src/class_diagram/model/class_parent.h
similarity index 100%
rename from src/uml/class_diagram/model/class_parent.h
rename to src/class_diagram/model/class_parent.h
diff --git a/src/uml/class_diagram/model/class_relationship.cc b/src/class_diagram/model/class_relationship.cc
similarity index 100%
rename from src/uml/class_diagram/model/class_relationship.cc
rename to src/class_diagram/model/class_relationship.cc
diff --git a/src/uml/class_diagram/model/class_relationship.h b/src/class_diagram/model/class_relationship.h
similarity index 100%
rename from src/uml/class_diagram/model/class_relationship.h
rename to src/class_diagram/model/class_relationship.h
diff --git a/src/uml/class_diagram/model/class_template.cc b/src/class_diagram/model/class_template.cc
similarity index 100%
rename from src/uml/class_diagram/model/class_template.cc
rename to src/class_diagram/model/class_template.cc
diff --git a/src/uml/class_diagram/model/class_template.h b/src/class_diagram/model/class_template.h
similarity index 100%
rename from src/uml/class_diagram/model/class_template.h
rename to src/class_diagram/model/class_template.h
diff --git a/src/uml/class_diagram/model/decorated_element.cc b/src/class_diagram/model/decorated_element.cc
similarity index 100%
rename from src/uml/class_diagram/model/decorated_element.cc
rename to src/class_diagram/model/decorated_element.cc
diff --git a/src/uml/class_diagram/model/decorated_element.h b/src/class_diagram/model/decorated_element.h
similarity index 97%
rename from src/uml/class_diagram/model/decorated_element.h
rename to src/class_diagram/model/decorated_element.h
index 0158ee7a..caae177a 100644
--- a/src/uml/class_diagram/model/decorated_element.h
+++ b/src/class_diagram/model/decorated_element.h
@@ -19,7 +19,7 @@
 
 #include "enums.h"
 
-#include "uml/decorators.h"
+#include "decorators/decorators.h"
 
 #include <memory>
 #include <string>
diff --git a/src/uml/class_diagram/model/diagram.cc b/src/class_diagram/model/diagram.cc
similarity index 100%
rename from src/uml/class_diagram/model/diagram.cc
rename to src/class_diagram/model/diagram.cc
diff --git a/src/uml/class_diagram/model/diagram.h b/src/class_diagram/model/diagram.h
similarity index 100%
rename from src/uml/class_diagram/model/diagram.h
rename to src/class_diagram/model/diagram.h
diff --git a/src/uml/class_diagram/model/element.cc b/src/class_diagram/model/element.cc
similarity index 100%
rename from src/uml/class_diagram/model/element.cc
rename to src/class_diagram/model/element.cc
diff --git a/src/uml/class_diagram/model/element.h b/src/class_diagram/model/element.h
similarity index 100%
rename from src/uml/class_diagram/model/element.h
rename to src/class_diagram/model/element.h
diff --git a/src/uml/class_diagram/model/enum.cc b/src/class_diagram/model/enum.cc
similarity index 100%
rename from src/uml/class_diagram/model/enum.cc
rename to src/class_diagram/model/enum.cc
diff --git a/src/uml/class_diagram/model/enum.h b/src/class_diagram/model/enum.h
similarity index 100%
rename from src/uml/class_diagram/model/enum.h
rename to src/class_diagram/model/enum.h
diff --git a/src/uml/class_diagram/model/enums.h b/src/class_diagram/model/enums.h
similarity index 100%
rename from src/uml/class_diagram/model/enums.h
rename to src/class_diagram/model/enums.h
diff --git a/src/uml/class_diagram/model/method_parameter.cc b/src/class_diagram/model/method_parameter.cc
similarity index 100%
rename from src/uml/class_diagram/model/method_parameter.cc
rename to src/class_diagram/model/method_parameter.cc
diff --git a/src/uml/class_diagram/model/method_parameter.h b/src/class_diagram/model/method_parameter.h
similarity index 100%
rename from src/uml/class_diagram/model/method_parameter.h
rename to src/class_diagram/model/method_parameter.h
diff --git a/src/uml/class_diagram/model/stylable_element.cc b/src/class_diagram/model/stylable_element.cc
similarity index 100%
rename from src/uml/class_diagram/model/stylable_element.cc
rename to src/class_diagram/model/stylable_element.cc
diff --git a/src/uml/class_diagram/model/stylable_element.h b/src/class_diagram/model/stylable_element.h
similarity index 100%
rename from src/uml/class_diagram/model/stylable_element.h
rename to src/class_diagram/model/stylable_element.h
diff --git a/src/uml/class_diagram/model/type_alias.cc b/src/class_diagram/model/type_alias.cc
similarity index 100%
rename from src/uml/class_diagram/model/type_alias.cc
rename to src/class_diagram/model/type_alias.cc
diff --git a/src/uml/class_diagram/model/type_alias.h b/src/class_diagram/model/type_alias.h
similarity index 100%
rename from src/uml/class_diagram/model/type_alias.h
rename to src/class_diagram/model/type_alias.h
diff --git a/src/uml/class_diagram/visitor/element_visitor_context.cc b/src/class_diagram/visitor/element_visitor_context.cc
similarity index 100%
rename from src/uml/class_diagram/visitor/element_visitor_context.cc
rename to src/class_diagram/visitor/element_visitor_context.cc
diff --git a/src/uml/class_diagram/visitor/element_visitor_context.h b/src/class_diagram/visitor/element_visitor_context.h
similarity index 93%
rename from src/uml/class_diagram/visitor/element_visitor_context.h
rename to src/class_diagram/visitor/element_visitor_context.h
index e0a0f292..a79264e2 100644
--- a/src/uml/class_diagram/visitor/element_visitor_context.h
+++ b/src/class_diagram/visitor/element_visitor_context.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "uml/class_diagram/model/class.h"
-#include "uml/class_diagram/model/diagram.h"
+#include "class_diagram/model/class.h"
+#include "class_diagram/model/diagram.h"
 
 namespace clanguml::class_diagram::visitor {
 
diff --git a/src/uml/class_diagram/visitor/translation_unit_context.cc b/src/class_diagram/visitor/translation_unit_context.cc
similarity index 100%
rename from src/uml/class_diagram/visitor/translation_unit_context.cc
rename to src/class_diagram/visitor/translation_unit_context.cc
diff --git a/src/uml/class_diagram/visitor/translation_unit_context.h b/src/class_diagram/visitor/translation_unit_context.h
similarity index 100%
rename from src/uml/class_diagram/visitor/translation_unit_context.h
rename to src/class_diagram/visitor/translation_unit_context.h
diff --git a/src/uml/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
similarity index 100%
rename from src/uml/class_diagram/visitor/translation_unit_visitor.cc
rename to src/class_diagram/visitor/translation_unit_visitor.cc
diff --git a/src/uml/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h
similarity index 97%
rename from src/uml/class_diagram/visitor/translation_unit_visitor.h
rename to src/class_diagram/visitor/translation_unit_visitor.h
index a6f83e69..17313db8 100644
--- a/src/uml/class_diagram/visitor/translation_unit_visitor.h
+++ b/src/class_diagram/visitor/translation_unit_visitor.h
@@ -17,10 +17,10 @@
  */
 #pragma once
 
+#include "class_diagram/model/diagram.h"
+#include "class_diagram/visitor/translation_unit_context.h"
 #include "config/config.h"
 #include "cx/cursor.h"
-#include "uml/class_diagram/model/diagram.h"
-#include "uml/class_diagram/visitor/translation_unit_context.h"
 
 #include <clang-c/CXCompilationDatabase.h>
 #include <clang-c/Index.h>
diff --git a/src/config/config.h b/src/config/config.h
index 13c7c4ac..d085e40e 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -17,8 +17,8 @@
  */
 #pragma once
 
-#include "uml/class_diagram/model/diagram.h"
-#include "uml/class_diagram/model/enums.h"
+#include "class_diagram/model/diagram.h"
+#include "class_diagram/model/enums.h"
 #include "util/util.h"
 
 #include <spdlog/spdlog.h>
diff --git a/src/uml/decorators.cc b/src/decorators/decorators.cc
similarity index 100%
rename from src/uml/decorators.cc
rename to src/decorators/decorators.cc
diff --git a/src/uml/decorators.h b/src/decorators/decorators.h
similarity index 100%
rename from src/uml/decorators.h
rename to src/decorators/decorators.h
diff --git a/src/main.cc b/src/main.cc
index 0334f790..63629f94 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -18,13 +18,13 @@
 
 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
 
+#include "class_diagram/model/diagram.h"
+#include "class_diagram/visitor/translation_unit_visitor.h"
 #include "config/config.h"
 #include "cx/compilation_database.h"
 #include "puml/class_diagram_generator.h"
 #include "puml/sequence_diagram_generator.h"
-#include "uml/class_diagram/model/diagram.h"
-#include "uml/class_diagram/visitor/translation_unit_visitor.h"
-#include "uml/sequence_diagram/visitor/translation_unit_context.h"
+#include "sequence_diagram/visitor/translation_unit_context.h"
 #include "util/util.h"
 
 #include <cli11/CLI11.hpp>
diff --git a/src/puml/class_diagram_generator.h b/src/puml/class_diagram_generator.h
index 82334e19..8c8de4b3 100644
--- a/src/puml/class_diagram_generator.h
+++ b/src/puml/class_diagram_generator.h
@@ -17,13 +17,13 @@
  */
 #pragma once
 
+#include "class_diagram/model/class.h"
+#include "class_diagram/model/class_relationship.h"
+#include "class_diagram/model/diagram.h"
+#include "class_diagram/model/enum.h"
+#include "class_diagram/visitor/translation_unit_visitor.h"
 #include "config/config.h"
 #include "cx/compilation_database.h"
-#include "uml/class_diagram/model/class.h"
-#include "uml/class_diagram/model/class_relationship.h"
-#include "uml/class_diagram/model/diagram.h"
-#include "uml/class_diagram/model/enum.h"
-#include "uml/class_diagram/visitor/translation_unit_visitor.h"
 #include "util/util.h"
 
 #include <cppast/cpp_entity_index.hpp>
diff --git a/src/puml/sequence_diagram_generator.cc b/src/puml/sequence_diagram_generator.cc
index d318f759..10439686 100644
--- a/src/puml/sequence_diagram_generator.cc
+++ b/src/puml/sequence_diagram_generator.cc
@@ -18,7 +18,7 @@
 
 #include "puml/sequence_diagram_generator.h"
 
-#include "uml/sequence_diagram/visitor/translation_unit_context.h"
+#include "sequence_diagram/visitor/translation_unit_context.h"
 
 namespace clanguml::generators::sequence_diagram {
 namespace puml {
diff --git a/src/puml/sequence_diagram_generator.h b/src/puml/sequence_diagram_generator.h
index ca4d8efe..f5eb202b 100644
--- a/src/puml/sequence_diagram_generator.h
+++ b/src/puml/sequence_diagram_generator.h
@@ -19,8 +19,8 @@
 
 #include "config/config.h"
 #include "cx/compilation_database.h"
-#include "uml/sequence_diagram/model/diagram.h"
-#include "uml/sequence_diagram/visitor/translation_unit_visitor.h"
+#include "sequence_diagram/model/diagram.h"
+#include "sequence_diagram/visitor/translation_unit_visitor.h"
 #include "util/util.h"
 
 #include <glob/glob.hpp>
diff --git a/src/uml/sequence_diagram/model/activity.cc b/src/sequence_diagram/model/activity.cc
similarity index 100%
rename from src/uml/sequence_diagram/model/activity.cc
rename to src/sequence_diagram/model/activity.cc
diff --git a/src/uml/sequence_diagram/model/activity.h b/src/sequence_diagram/model/activity.h
similarity index 100%
rename from src/uml/sequence_diagram/model/activity.h
rename to src/sequence_diagram/model/activity.h
diff --git a/src/uml/sequence_diagram/model/diagram.cc b/src/sequence_diagram/model/diagram.cc
similarity index 100%
rename from src/uml/sequence_diagram/model/diagram.cc
rename to src/sequence_diagram/model/diagram.cc
diff --git a/src/uml/sequence_diagram/model/diagram.h b/src/sequence_diagram/model/diagram.h
similarity index 100%
rename from src/uml/sequence_diagram/model/diagram.h
rename to src/sequence_diagram/model/diagram.h
diff --git a/src/uml/sequence_diagram/model/enums.h b/src/sequence_diagram/model/enums.h
similarity index 100%
rename from src/uml/sequence_diagram/model/enums.h
rename to src/sequence_diagram/model/enums.h
diff --git a/src/uml/sequence_diagram/model/message.cc b/src/sequence_diagram/model/message.cc
similarity index 100%
rename from src/uml/sequence_diagram/model/message.cc
rename to src/sequence_diagram/model/message.cc
diff --git a/src/uml/sequence_diagram/model/message.h b/src/sequence_diagram/model/message.h
similarity index 100%
rename from src/uml/sequence_diagram/model/message.h
rename to src/sequence_diagram/model/message.h
diff --git a/src/uml/sequence_diagram/visitor/translation_unit_context.cc b/src/sequence_diagram/visitor/translation_unit_context.cc
similarity index 100%
rename from src/uml/sequence_diagram/visitor/translation_unit_context.cc
rename to src/sequence_diagram/visitor/translation_unit_context.cc
diff --git a/src/uml/sequence_diagram/visitor/translation_unit_context.h b/src/sequence_diagram/visitor/translation_unit_context.h
similarity index 97%
rename from src/uml/sequence_diagram/visitor/translation_unit_context.h
rename to src/sequence_diagram/visitor/translation_unit_context.h
index a7ef5ce8..7b00d1ab 100644
--- a/src/uml/sequence_diagram/visitor/translation_unit_context.h
+++ b/src/sequence_diagram/visitor/translation_unit_context.h
@@ -19,7 +19,7 @@
 
 #include "config/config.h"
 #include "cx/cursor.h"
-#include "uml/sequence_diagram/model/diagram.h"
+#include "sequence_diagram/model/diagram.h"
 
 #include <functional>
 #include <memory>
diff --git a/src/uml/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
similarity index 100%
rename from src/uml/sequence_diagram/visitor/translation_unit_visitor.cc
rename to src/sequence_diagram/visitor/translation_unit_visitor.cc
diff --git a/src/uml/sequence_diagram/visitor/translation_unit_visitor.h b/src/sequence_diagram/visitor/translation_unit_visitor.h
similarity index 95%
rename from src/uml/sequence_diagram/visitor/translation_unit_visitor.h
rename to src/sequence_diagram/visitor/translation_unit_visitor.h
index 7cd10fca..6247fb3d 100644
--- a/src/uml/sequence_diagram/visitor/translation_unit_visitor.h
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.h
@@ -19,7 +19,7 @@
 
 #include "config/config.h"
 #include "cx/cursor.h"
-#include "uml/sequence_diagram/model/diagram.h"
+#include "sequence_diagram/model/diagram.h"
 
 namespace clanguml::sequence_diagram::visitor {
 
diff --git a/tests/test_cases.h b/tests/test_cases.h
index e84968ff..7df04eba 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -19,13 +19,13 @@
 
 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
 
+#include "class_diagram/model/diagram.h"
+#include "class_diagram/visitor/translation_unit_visitor.h"
 #include "config/config.h"
 #include "cx/compilation_database.h"
 #include "puml/class_diagram_generator.h"
 #include "puml/sequence_diagram_generator.h"
-#include "uml/class_diagram/model/diagram.h"
-#include "uml/class_diagram/visitor/translation_unit_visitor.h"
-#include "uml/sequence_diagram/visitor/translation_unit_visitor.h"
+#include "sequence_diagram/visitor/translation_unit_visitor.h"
 #include "util/util.h"
 
 #define CATCH_CONFIG_RUNNER
diff --git a/tests/test_decorator_parser.cc b/tests/test_decorator_parser.cc
index 203a0c2f..01cdd0db 100644
--- a/tests/test_decorator_parser.cc
+++ b/tests/test_decorator_parser.cc
@@ -17,7 +17,7 @@
  */
 #define CATCH_CONFIG_MAIN
 
-#include "uml/decorators.h"
+#include "decorators/decorators.h"
 
 #include "catch.h"