diff --git a/pagetop-admin/src/lib.rs b/pagetop-admin/src/lib.rs
index 987eeb5a..8495bed3 100644
--- a/pagetop-admin/src/lib.rs
+++ b/pagetop-admin/src/lib.rs
@@ -30,7 +30,7 @@ impl ModuleTrait for Admin {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![action!(action::page::ActionBeforePreparePage => before_prepare_page)]
+        vec![action!(ActionBeforePreparePage => before_prepare_page)]
     }
 
     fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
diff --git a/pagetop-jquery/src/lib.rs b/pagetop-jquery/src/lib.rs
index e406de16..28c7d293 100644
--- a/pagetop-jquery/src/lib.rs
+++ b/pagetop-jquery/src/lib.rs
@@ -24,7 +24,7 @@ impl ModuleTrait for JQuery {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![action!(action::page::ActionBeforeRenderPage => before_render_page)]
+        vec![action!(ActionBeforeRenderPage => before_render_page)]
     }
 
     fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
diff --git a/pagetop-node/src/lib.rs b/pagetop-node/src/lib.rs
index cbff5942..c6f6d073 100644
--- a/pagetop-node/src/lib.rs
+++ b/pagetop-node/src/lib.rs
@@ -27,7 +27,7 @@ impl ModuleTrait for Node {
     }
 
     fn actions(&self) -> Vec<Action> {
-        vec![action!(action::page::ActionBeforePreparePage => before_prepare_page, -1)]
+        vec![action!(ActionBeforePreparePage => before_prepare_page, -1)]
     }
 
     fn migrations(&self) -> Vec<MigrationItem> {
diff --git a/pagetop/src/base/action.rs b/pagetop/src/base/action.rs
index 250e093c..8e4ec0ed 100644
--- a/pagetop/src/base/action.rs
+++ b/pagetop/src/base/action.rs
@@ -1,5 +1,3 @@
-pub mod page;
-
 pub mod block {
     crate::actions_for_component!(Block);
 }
diff --git a/pagetop/src/base/component/block.rs b/pagetop/src/base/component/block.rs
index b0c78907..a1423dca 100644
--- a/pagetop/src/base/component/block.rs
+++ b/pagetop/src/base/component/block.rs
@@ -44,9 +44,9 @@ impl ComponentTrait for Block {
         PrepareMarkup::With(html! {
             div id=(id) class=[self.classes().get()] {
                 @if let Some(title) = self.title().get() {
-                    h2 class="block-title" { (title) }
+                    h2 class="block__title" { (title) }
                 }
-                div class="block-body" {
+                div class="block__body" {
                     (self.components().prepare(cx))
                 }
             }
diff --git a/pagetop/src/response/page.rs b/pagetop/src/response/page.rs
index 6136d2e4..630d8348 100644
--- a/pagetop/src/response/page.rs
+++ b/pagetop/src/response/page.rs
@@ -1,4 +1,6 @@
-use crate::base::action;
+mod action;
+pub use action::*;
+
 use crate::base::component::L10n;
 use crate::core::component::{ComponentTrait, Context, ContextOp, OneComponent};
 use crate::core::theme::ComponentsRegions;
@@ -136,7 +138,7 @@ impl Page {
 
     pub fn render(&mut self) -> ResultPage<Markup, FatalError> {
         // Module actions before preparing the page.
-        action::page::run_actions_before_prepare_page(self);
+        run_actions_before_prepare_page(self);
 
         // Theme actions before preparing the page.
         self.context.theme().before_prepare_page(self);
@@ -145,7 +147,7 @@ impl Page {
         let body = self.context.theme().prepare_page_body(self);
 
         // Module actions before rendering the page.
-        action::page::run_actions_before_render_page(self);
+        run_actions_before_render_page(self);
 
         // Theme actions before rendering the page.
         self.context.theme().before_render_page(self);
diff --git a/pagetop/src/base/action/page.rs b/pagetop/src/response/page/action.rs
similarity index 82%
rename from pagetop/src/base/action/page.rs
rename to pagetop/src/response/page/action.rs
index eb8791e3..9a53300d 100644
--- a/pagetop/src/base/action/page.rs
+++ b/pagetop/src/response/page/action.rs
@@ -1,4 +1,4 @@
-use crate::response::page::Page;
+use super::Page;
 
 pub type ActionPage = fn(page: &mut Page);
 
diff --git a/pagetop/src/base/action/page/before_prepare_page.rs b/pagetop/src/response/page/action/before_prepare_page.rs
similarity index 88%
rename from pagetop/src/base/action/page/before_prepare_page.rs
rename to pagetop/src/response/page/action/before_prepare_page.rs
index aa9ecf61..64290ef8 100644
--- a/pagetop/src/base/action/page/before_prepare_page.rs
+++ b/pagetop/src/response/page/action/before_prepare_page.rs
@@ -1,6 +1,7 @@
-use crate::prelude::*;
-
 use super::ActionPage;
+use crate::core::action::{action_ref, run_actions, ActionTrait, AnyAction};
+use crate::response::page::Page;
+use crate::{use_handle, Handle};
 
 use_handle!(ACTION_BEFORE_PREPARE_PAGE for Action);
 
diff --git a/pagetop/src/base/action/page/before_render_page.rs b/pagetop/src/response/page/action/before_render_page.rs
similarity index 88%
rename from pagetop/src/base/action/page/before_render_page.rs
rename to pagetop/src/response/page/action/before_render_page.rs
index 733eb7e5..c949e217 100644
--- a/pagetop/src/base/action/page/before_render_page.rs
+++ b/pagetop/src/response/page/action/before_render_page.rs
@@ -1,6 +1,7 @@
-use crate::prelude::*;
-
 use super::ActionPage;
+use crate::core::action::{action_ref, run_actions, ActionTrait, AnyAction};
+use crate::response::page::Page;
+use crate::{use_handle, Handle};
 
 use_handle!(ACTION_BEFORE_RENDER_PAGE for Action);