diff --git a/src/Framework/resource/layout/footer.php b/src/Framework/resource/layout/footer.php
index 648323b..bb18586 100644
--- a/src/Framework/resource/layout/footer.php
+++ b/src/Framework/resource/layout/footer.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-use PHPForge\Html\A;
 use PHPForge\Html\Group\Div;
-use PHPForge\Html\Layout\Footer;
-use PHPForge\Html\Span;
+use PHPForge\Html\Semantic\Footer;
+use PHPForge\Html\Textual\A;
+use PHPForge\Html\Textual\Span;
 use sjaakp\icon\Icon;
 use yii\web\View;
 
diff --git a/src/Framework/resource/layout/head.php b/src/Framework/resource/layout/head.php
index 39264c3..0e25ee4 100644
--- a/src/Framework/resource/layout/head.php
+++ b/src/Framework/resource/layout/head.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use PHPForge\Html\Layout\Head;
+use PHPForge\Html\Document\Head;
 use PHPForge\Html\Metadata\Meta;
 use PHPForge\Html\Metadata\Title;
 use yii\helpers\Html;
diff --git a/src/Framework/resource/layout/main.php b/src/Framework/resource/layout/main.php
index d3ec0ab..cc924a1 100644
--- a/src/Framework/resource/layout/main.php
+++ b/src/Framework/resource/layout/main.php
@@ -3,10 +3,10 @@
 declare(strict_types=1);
 
 use App\Framework\Asset\AppAsset;
+use PHPForge\Html\Document\Body;
+use PHPForge\Html\Document\Html;
 use PHPForge\Html\Group\Div;
-use PHPForge\Html\Layout\Body;
-use PHPForge\Html\Layout\Header;
-use PHPForge\Html\Layout\Html;
+use PHPForge\Html\Semantic\Header;
 use sjaakp\icon\Icon;
 use yii\bootstrap5\Breadcrumbs;
 use yii\web\View;
diff --git a/src/UseCase/Contact/view/index.php b/src/UseCase/Contact/view/index.php
index 247d052..97b6848 100644
--- a/src/UseCase/Contact/view/index.php
+++ b/src/UseCase/Contact/view/index.php
@@ -6,8 +6,8 @@
 use PHPForge\Html\FormControl\Input\Submit;
 use PHPForge\Html\Group\Div;
 use PHPForge\Html\Group\P;
-use PHPForge\Html\H;
 use PHPForge\Html\Helper\Encode;
+use PHPForge\Html\Semantic\H;
 use PHPForge\Html\Tag;
 use yii\bootstrap5\ActiveForm;
 use yii\captcha\Captcha;
diff --git a/src/UseCase/Site/view/404.php b/src/UseCase/Site/view/404.php
index 5bc8564..44266de 100644
--- a/src/UseCase/Site/view/404.php
+++ b/src/UseCase/Site/view/404.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 use PHPForge\Html\Group\Div;
-use PHPForge\Html\H;
 use PHPForge\Html\Helper\Encode;
 use PHPForge\Html\Img;
+use PHPForge\Html\Semantic\H;
 use yii\web\View;
 
 /**
diff --git a/src/UseCase/Site/view/about.php b/src/UseCase/Site/view/about.php
index f6b9a6a..3501d1b 100644
--- a/src/UseCase/Site/view/about.php
+++ b/src/UseCase/Site/view/about.php
@@ -4,8 +4,8 @@
 
 use PHPForge\Html\Group\Div;
 use PHPForge\Html\Group\P;
-use PHPForge\Html\H;
 use PHPForge\Html\Helper\Encode;
+use PHPForge\Html\Semantic\H;
 use PHPForge\Html\Tag;
 use yii\web\View;
 
diff --git a/src/UseCase/Site/view/index.php b/src/UseCase/Site/view/index.php
index d819abf..97958a7 100644
--- a/src/UseCase/Site/view/index.php
+++ b/src/UseCase/Site/view/index.php
@@ -4,8 +4,8 @@
 
 use PHPForge\Html\Group\Div;
 use PHPForge\Html\Group\P;
-use PHPForge\Html\H;
 use PHPForge\Html\Helper\Encode;
+use PHPForge\Html\Semantic\H;
 use yii\web\View;
 
 /**