diff --git a/pagetop-node/src/migration/mod.rs b/pagetop-node/src/migration.rs
similarity index 100%
rename from pagetop-node/src/migration/mod.rs
rename to pagetop-node/src/migration.rs
diff --git a/pagetop-user/src/migration/mod.rs b/pagetop-user/src/migration.rs
similarity index 100%
rename from pagetop-user/src/migration/mod.rs
rename to pagetop-user/src/migration.rs
diff --git a/pagetop/src/base/mod.rs b/pagetop/src/base.rs
similarity index 100%
rename from pagetop/src/base/mod.rs
rename to pagetop/src/base.rs
diff --git a/pagetop/src/base/component/mod.rs b/pagetop/src/base/component.rs
similarity index 100%
rename from pagetop/src/base/component/mod.rs
rename to pagetop/src/base/component.rs
diff --git a/pagetop/src/base/component/form/mod.rs b/pagetop/src/base/component/form.rs
similarity index 100%
rename from pagetop/src/base/component/form/mod.rs
rename to pagetop/src/base/component/form.rs
diff --git a/pagetop/src/base/component/grid/mod.rs b/pagetop/src/base/component/grid.rs
similarity index 100%
rename from pagetop/src/base/component/grid/mod.rs
rename to pagetop/src/base/component/grid.rs
diff --git a/pagetop/src/base/module/mod.rs b/pagetop/src/base/module.rs
similarity index 100%
rename from pagetop/src/base/module/mod.rs
rename to pagetop/src/base/module.rs
diff --git a/pagetop/src/base/module/demopage/mod.rs b/pagetop/src/base/module/demopage.rs
similarity index 100%
rename from pagetop/src/base/module/demopage/mod.rs
rename to pagetop/src/base/module/demopage.rs
diff --git a/pagetop/src/base/theme/mod.rs b/pagetop/src/base/theme.rs
similarity index 100%
rename from pagetop/src/base/theme/mod.rs
rename to pagetop/src/base/theme.rs
diff --git a/pagetop/src/base/theme/aliner/mod.rs b/pagetop/src/base/theme/aliner.rs
similarity index 100%
rename from pagetop/src/base/theme/aliner/mod.rs
rename to pagetop/src/base/theme/aliner.rs
diff --git a/pagetop/src/base/theme/bootsier/mod.rs b/pagetop/src/base/theme/bootsier.rs
similarity index 100%
rename from pagetop/src/base/theme/bootsier/mod.rs
rename to pagetop/src/base/theme/bootsier.rs
diff --git a/pagetop/src/base/theme/bulmix/mod.rs b/pagetop/src/base/theme/bulmix.rs
similarity index 100%
rename from pagetop/src/base/theme/bulmix/mod.rs
rename to pagetop/src/base/theme/bulmix.rs
diff --git a/pagetop/src/base/theme/minimal/mod.rs b/pagetop/src/base/theme/minimal.rs
similarity index 100%
rename from pagetop/src/base/theme/minimal/mod.rs
rename to pagetop/src/base/theme/minimal.rs
diff --git a/pagetop/src/core/mod.rs b/pagetop/src/core.rs
similarity index 100%
rename from pagetop/src/core/mod.rs
rename to pagetop/src/core.rs
diff --git a/pagetop/src/core/app/mod.rs b/pagetop/src/core/app.rs
similarity index 100%
rename from pagetop/src/core/app/mod.rs
rename to pagetop/src/core/app.rs
diff --git a/pagetop/src/core/app/banner/mod.rs b/pagetop/src/core/app/banner.rs
similarity index 52%
rename from pagetop/src/core/app/banner/mod.rs
rename to pagetop/src/core/app/banner.rs
index 1cce7146..a4dfd5b3 100644
--- a/pagetop/src/core/app/banner/mod.rs
+++ b/pagetop/src/core/app/banner.rs
@@ -1,35 +1,10 @@
-use crate::Lazy;
+mod figfont;
+use figfont::FIGFONT;
+
 use crate::config::SETTINGS;
 
-use figlet_rs::FIGfont;
 use substring::Substring;
 
-static FIGFONT: Lazy<FIGfont> = Lazy::new(|| {
-    let slant    = include_str!("slant.flf");
-    let small    = include_str!("small.flf");
-    let speed    = include_str!("speed.flf");
-    let starwars = include_str!("starwars.flf");
-
-    FIGfont::from_content(
-        match SETTINGS.app.startup_banner.to_lowercase().as_str() {
-            "off"      => slant,
-            "slant"    => slant,
-            "small"    => small,
-            "speed"    => speed,
-            "starwars" => starwars,
-            _ => {
-                println!(
-                    "\n FIGfont \"{}\" not found for banner. {}. {}.",
-                    SETTINGS.app.startup_banner,
-                    "Using \"Slant\"",
-                    "Check the settings file",
-                );
-                slant
-            }
-        }
-    ).unwrap()
-});
-
 pub fn print_on_startup() {
     if SETTINGS.app.startup_banner.to_lowercase() != "off" {
         if let Some((term_width, _)) = term_size::dimensions() {
diff --git a/pagetop/src/core/app/banner/figfont.rs b/pagetop/src/core/app/banner/figfont.rs
new file mode 100644
index 00000000..8fe0a4e7
--- /dev/null
+++ b/pagetop/src/core/app/banner/figfont.rs
@@ -0,0 +1,30 @@
+use crate::Lazy;
+use crate::config::SETTINGS;
+
+use figlet_rs::FIGfont;
+
+pub static FIGFONT: Lazy<FIGfont> = Lazy::new(|| {
+    let slant    = include_str!("slant.flf");
+    let small    = include_str!("small.flf");
+    let speed    = include_str!("speed.flf");
+    let starwars = include_str!("starwars.flf");
+
+    FIGfont::from_content(
+        match SETTINGS.app.startup_banner.to_lowercase().as_str() {
+            "off"      => slant,
+            "slant"    => slant,
+            "small"    => small,
+            "speed"    => speed,
+            "starwars" => starwars,
+            _ => {
+                println!(
+                    "\n FIGfont \"{}\" not found for banner. {}. {}.",
+                    SETTINGS.app.startup_banner,
+                    "Using \"Slant\"",
+                    "Check the settings file",
+                );
+                slant
+            }
+        }
+    ).unwrap()
+});
diff --git a/pagetop/src/core/component/mod.rs b/pagetop/src/core/component.rs
similarity index 100%
rename from pagetop/src/core/component/mod.rs
rename to pagetop/src/core/component.rs
diff --git a/pagetop/src/core/hook/mod.rs b/pagetop/src/core/hook.rs
similarity index 100%
rename from pagetop/src/core/hook/mod.rs
rename to pagetop/src/core/hook.rs
diff --git a/pagetop/src/core/module/mod.rs b/pagetop/src/core/module.rs
similarity index 100%
rename from pagetop/src/core/module/mod.rs
rename to pagetop/src/core/module.rs
diff --git a/pagetop/src/core/theme/mod.rs b/pagetop/src/core/theme.rs
similarity index 100%
rename from pagetop/src/core/theme/mod.rs
rename to pagetop/src/core/theme.rs
diff --git a/pagetop/src/html/mod.rs b/pagetop/src/html.rs
similarity index 100%
rename from pagetop/src/html/mod.rs
rename to pagetop/src/html.rs
diff --git a/pagetop/src/response/mod.rs b/pagetop/src/response.rs
similarity index 100%
rename from pagetop/src/response/mod.rs
rename to pagetop/src/response.rs
diff --git a/pagetop/src/response/page/mod.rs b/pagetop/src/response/page.rs
similarity index 66%
rename from pagetop/src/response/page/mod.rs
rename to pagetop/src/response/page.rs
index 82c5d7da..5f517471 100644
--- a/pagetop/src/response/page/mod.rs
+++ b/pagetop/src/response/page.rs
@@ -4,5 +4,5 @@ pub use hook::{
     BeforeRenderPageHook,
 };
 
-mod page;
-pub use page::Page;
+mod definition;
+pub use definition::Page;
diff --git a/pagetop/src/response/page/page.rs b/pagetop/src/response/page/definition.rs
similarity index 100%
rename from pagetop/src/response/page/page.rs
rename to pagetop/src/response/page/definition.rs