diff --git a/DocGen4.lean b/DocGen4.lean
index e91e7c7..0ae1c74 100644
--- a/DocGen4.lean
+++ b/DocGen4.lean
@@ -3,10 +3,7 @@ Copyright (c) 2021 Henrik Böving. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Henrik Böving
 -/
-import DocGen4.Hierarchy
 import DocGen4.Process
 import DocGen4.Load
-import DocGen4.ToHtmlFormat
 import DocGen4.IncludeStr
 import DocGen4.Output
-import DocGen4.Attributes
diff --git a/DocGen4/Output/Base.lean b/DocGen4/Output/Base.lean
index 4aef3b9..66bb358 100644
--- a/DocGen4/Output/Base.lean
+++ b/DocGen4/Output/Base.lean
@@ -5,7 +5,7 @@ Authors: Henrik Böving
 -/
 import DocGen4.Process
 import DocGen4.IncludeStr
-import DocGen4.ToHtmlFormat
+import DocGen4.Output.ToHtmlFormat
 
 namespace DocGen4
 namespace Output
diff --git a/DocGen4/Output/Index.lean b/DocGen4/Output/Index.lean
index e0342b6..d31ea3d 100644
--- a/DocGen4/Output/Index.lean
+++ b/DocGen4/Output/Index.lean
@@ -3,7 +3,7 @@ Copyright (c) 2021 Henrik Böving. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Henrik Böving
 -/
-import DocGen4.ToHtmlFormat
+import DocGen4.Output.ToHtmlFormat
 import DocGen4.Output.Template
 
 namespace DocGen4
diff --git a/DocGen4/Output/Navbar.lean b/DocGen4/Output/Navbar.lean
index 7d00102..c9cb196 100644
--- a/DocGen4/Output/Navbar.lean
+++ b/DocGen4/Output/Navbar.lean
@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Henrik Böving
 -/
 import Lean
-import DocGen4.ToHtmlFormat
+import DocGen4.Output.ToHtmlFormat
 import DocGen4.Output.Base
 
 namespace DocGen4
diff --git a/DocGen4/Output/NotFound.lean b/DocGen4/Output/NotFound.lean
index a700963..c5161c4 100644
--- a/DocGen4/Output/NotFound.lean
+++ b/DocGen4/Output/NotFound.lean
@@ -3,7 +3,7 @@ Copyright (c) 2021 Henrik Böving. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Henrik Böving
 -/
-import DocGen4.ToHtmlFormat
+import DocGen4.Output.ToHtmlFormat
 import DocGen4.Output.Template
 
 namespace DocGen4
diff --git a/DocGen4/Output/Template.lean b/DocGen4/Output/Template.lean
index aed65c7..33d7c59 100644
--- a/DocGen4/Output/Template.lean
+++ b/DocGen4/Output/Template.lean
@@ -3,7 +3,7 @@ Copyright (c) 2021 Henrik Böving. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Henrik Böving
 -/
-import DocGen4.ToHtmlFormat
+import DocGen4.Output.ToHtmlFormat
 import DocGen4.Output.Navbar
 
 namespace DocGen4
diff --git a/DocGen4/ToHtmlFormat.lean b/DocGen4/Output/ToHtmlFormat.lean
similarity index 100%
rename from DocGen4/ToHtmlFormat.lean
rename to DocGen4/Output/ToHtmlFormat.lean
diff --git a/DocGen4/Process.lean b/DocGen4/Process.lean
index d815f96..3ce8d3b 100644
--- a/DocGen4/Process.lean
+++ b/DocGen4/Process.lean
@@ -9,8 +9,8 @@ import Lean.PrettyPrinter
 import Std.Data.HashMap
 import Lean.Meta.SynthInstance
 
-import DocGen4.Hierarchy
-import DocGen4.Attributes
+import DocGen4.Process.Hierarchy
+import DocGen4.Process.Attributes
 
 namespace DocGen4
 
diff --git a/DocGen4/Attributes.lean b/DocGen4/Process/Attributes.lean
similarity index 100%
rename from DocGen4/Attributes.lean
rename to DocGen4/Process/Attributes.lean
diff --git a/DocGen4/Hierarchy.lean b/DocGen4/Process/Hierarchy.lean
similarity index 100%
rename from DocGen4/Hierarchy.lean
rename to DocGen4/Process/Hierarchy.lean