diff --git a/pagetop/src/base/component.rs b/pagetop/src/base/component.rs
index 23048e55..65794739 100644
--- a/pagetop/src/base/component.rs
+++ b/pagetop/src/base/component.rs
@@ -136,21 +136,34 @@ pub mod flex;
 
 mod icon;
 pub use icon::Icon;
+
 mod heading;
 pub use heading::{Heading, HeadingDisplay, HeadingType};
+
 mod paragraph;
 pub use paragraph::Paragraph;
+
 mod button;
 pub use button::{Button, ButtonTarget, ButtonType};
+
 mod image;
 pub use image::{Image, ImageSize};
+
 mod block;
 pub use block::Block;
+
 mod branding;
 pub use branding::Branding;
+
 mod powered_by;
 pub use powered_by::{PoweredBy, PoweredByLogo};
 
+mod error403;
+pub use error403::Error403;
+
+mod error404;
+pub use error404::Error404;
+
 pub mod menu;
 pub use menu::Menu;
 
diff --git a/pagetop/src/response/fatal_error/error403.rs b/pagetop/src/base/component/error403.rs
similarity index 96%
rename from pagetop/src/response/fatal_error/error403.rs
rename to pagetop/src/base/component/error403.rs
index 906391ae..d5f64931 100644
--- a/pagetop/src/response/fatal_error/error403.rs
+++ b/pagetop/src/base/component/error403.rs
@@ -7,7 +7,7 @@ pub struct Error403;
 
 impl ComponentTrait for Error403 {
     fn new() -> Self {
-        Self
+        Error403
     }
 
     fn prepare_component(&self, _cx: &mut Context) -> PrepareMarkup {
diff --git a/pagetop/src/response/fatal_error/error404.rs b/pagetop/src/base/component/error404.rs
similarity index 96%
rename from pagetop/src/response/fatal_error/error404.rs
rename to pagetop/src/base/component/error404.rs
index cd41b34c..3e6043a8 100644
--- a/pagetop/src/response/fatal_error/error404.rs
+++ b/pagetop/src/base/component/error404.rs
@@ -7,7 +7,7 @@ pub struct Error404;
 
 impl ComponentTrait for Error404 {
     fn new() -> Self {
-        Self
+        Error404
     }
 
     fn prepare_component(&self, _cx: &mut Context) -> PrepareMarkup {
diff --git a/pagetop/src/response/fatal_error.rs b/pagetop/src/response/fatal_error.rs
index 48f46fa0..819445ed 100644
--- a/pagetop/src/response/fatal_error.rs
+++ b/pagetop/src/response/fatal_error.rs
@@ -1,8 +1,4 @@
-mod error403;
-pub use error403::Error403;
-mod error404;
-pub use error404::Error404;
-
+use crate::base::component::{Error403, Error404};
 use crate::locale::L10n;
 use crate::response::{page::Page, ResponseError};
 use crate::service::http::{header::ContentType, StatusCode};
@@ -33,7 +29,7 @@ impl fmt::Display for FatalError {
                 let error_page = Page::new(request.clone());
                 if let Ok(page) = error_page
                     .with_title(L10n::n("Error FORBIDDEN"))
-                    .with_in("content", error403::Error403)
+                    .with_in("content", Error403)
                     .with_template("error")
                     .render()
                 {
@@ -47,7 +43,7 @@ impl fmt::Display for FatalError {
                 let error_page = Page::new(request.clone());
                 if let Ok(page) = error_page
                     .with_title(L10n::n("Error RESOURCE NOT FOUND"))
-                    .with_in("content", error404::Error404)
+                    .with_in("content", Error404)
                     .with_template("error")
                     .render()
                 {