diff --git a/packages/wyatt_ui_components/models/class-models.puml b/packages/wyatt_ui_components/models/class-models.puml
new file mode 100644
index 00000000..8e9d4db7
--- /dev/null
+++ b/packages/wyatt_ui_components/models/class-models.puml
@@ -0,0 +1,48 @@
+@startuml
+set namespaceSeparator ::
+
+class "wyatt_ui_components::src::features::component_theme.dart::ComponentTheme" {
+  +Widget child
+  +ComponentThemeData componentThemeWidget
+  {static} +ComponentThemeData of()
+  +Widget build()
+}
+
+"wyatt_ui_components::src::features::component_theme.dart::ComponentTheme" o-- "flutter::src::widgets::framework.dart::Widget"
+"wyatt_ui_components::src::features::component_theme.dart::ComponentTheme" o-- "wyatt_ui_components::src::features::component_theme_data.dart::ComponentThemeData"
+"flutter::src::widgets::framework.dart::StatelessWidget" <|-- "wyatt_ui_components::src::features::component_theme.dart::ComponentTheme"
+
+class "wyatt_ui_components::src::features::component_theme.dart::_InheritedComponentTheme" {
+  +ComponentTheme themeWidget
+  +bool updateShouldNotify()
+}
+
+"wyatt_ui_components::src::features::component_theme.dart::_InheritedComponentTheme" o-- "wyatt_ui_components::src::features::component_theme.dart::ComponentTheme"
+"flutter::src::widgets::framework.dart::InheritedWidget" <|-- "wyatt_ui_components::src::features::component_theme.dart::_InheritedComponentTheme"
+
+class "wyatt_ui_components::src::features::component_theme_data.dart::ComponentThemeData" {
+  +AppBarComponent appBar
+  +BottomNavigationBarComponent bottomNavigationBar
+}
+
+"wyatt_ui_components::src::features::component_theme_data.dart::ComponentThemeData" o-- "wyatt_ui_components::src::domain::entities::components.dart::AppBarComponent"
+"wyatt_ui_components::src::features::component_theme_data.dart::ComponentThemeData" o-- "wyatt_ui_components::src::domain::entities::components.dart::BottomNavigationBarComponent"
+
+abstract class "wyatt_ui_components::src::domain::entities::components.dart::AppBarComponent" {
+  +String? title
+  +AppBarComponent configure()
+}
+
+"flutter::src::widgets::preferred_size.dart::PreferredSize" <|-- "wyatt_ui_components::src::domain::entities::components.dart::AppBarComponent"
+
+abstract class "wyatt_ui_components::src::domain::entities::components.dart::BottomNavigationBarComponent" {
+  +int currentIndex
+  +void Function(BuildContext, int)? onTap
+  +BottomNavigationBarComponent configure()
+}
+
+"wyatt_ui_components::src::domain::entities::components.dart::BottomNavigationBarComponent" o-- "null::void Function(BuildContext, int)"
+"flutter::src::widgets::framework.dart::StatelessWidget" <|-- "wyatt_ui_components::src::domain::entities::components.dart::BottomNavigationBarComponent"
+
+
+@enduml
\ No newline at end of file
diff --git a/packages/wyatt_ui_layout/example/lib/components/custom_app_bar.dart b/packages/wyatt_ui_layout/example/lib/components/custom_app_bar.dart
index 7da6d500..cb264c01 100644
--- a/packages/wyatt_ui_layout/example/lib/components/custom_app_bar.dart
+++ b/packages/wyatt_ui_layout/example/lib/components/custom_app_bar.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
+import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 
 class CustomAppBar extends AppBarComponent {
   const CustomAppBar({
diff --git a/packages/wyatt_ui_layout/example/lib/components/custom_bottom_navigation_bar.dart b/packages/wyatt_ui_layout/example/lib/components/custom_bottom_navigation_bar.dart
index 39c399d3..d3c13033 100644
--- a/packages/wyatt_ui_layout/example/lib/components/custom_bottom_navigation_bar.dart
+++ b/packages/wyatt_ui_layout/example/lib/components/custom_bottom_navigation_bar.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
+import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 
 class CustomBottomNavigationBar extends BottomNavigationBarComponent {
   const CustomBottomNavigationBar({
diff --git a/packages/wyatt_ui_layout/example/lib/core/app_theme_component.dart b/packages/wyatt_ui_layout/example/lib/core/app_theme_component.dart
index ca0ed3db..d2158707 100644
--- a/packages/wyatt_ui_layout/example/lib/core/app_theme_component.dart
+++ b/packages/wyatt_ui_layout/example/lib/core/app_theme_component.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 import 'package:wyatt_ui_layout_example/components/custom_app_bar.dart';
 import 'package:wyatt_ui_layout_example/components/custom_bottom_navigation_bar.dart';
 import 'package:wyatt_ui_layout_example/pages/bottom_navigation_bar_layout_page_1.dart';
 import 'package:wyatt_ui_layout_example/pages/bottom_navigation_bar_layout_page_2.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
 
 class AppThemeComponent {
   static ComponentThemeData get components => ComponentThemeData.raw(
diff --git a/packages/wyatt_ui_layout/example/lib/main.dart b/packages/wyatt_ui_layout/example/lib/main.dart
index e20c6fde..051445db 100644
--- a/packages/wyatt_ui_layout/example/lib/main.dart
+++ b/packages/wyatt_ui_layout/example/lib/main.dart
@@ -15,9 +15,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/material.dart';
+import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 import 'package:wyatt_ui_layout_example/core/app_theme_component.dart';
 import 'package:wyatt_ui_layout_example/pages/available_layouts.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
 
 void main() {
   runApp(const MyApp());
diff --git a/packages/wyatt_ui_layout/example/lib/pages/app_bar_layout_page.dart b/packages/wyatt_ui_layout/example/lib/pages/app_bar_layout_page.dart
index 5ed4c2f3..0c12ff08 100644
--- a/packages/wyatt_ui_layout/example/lib/pages/app_bar_layout_page.dart
+++ b/packages/wyatt_ui_layout/example/lib/pages/app_bar_layout_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
+import 'package:wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
 
 class AppBarLayoutPage extends StatelessWidget {
   const AppBarLayoutPage({super.key});
diff --git a/packages/wyatt_ui_layout/example/lib/pages/available_layouts.dart b/packages/wyatt_ui_layout/example/lib/pages/available_layouts.dart
index dcb6e32c..a4d73d28 100644
--- a/packages/wyatt_ui_layout/example/lib/pages/available_layouts.dart
+++ b/packages/wyatt_ui_layout/example/lib/pages/available_layouts.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
 import 'package:wyatt_ui_layout_example/pages/app_bar_layout_page.dart';
 import 'package:wyatt_ui_layout_example/pages/bottom_navigation_bar_layout_page_1.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
 
 class AvailabaleLayouts extends StatelessWidget {
   const AvailabaleLayouts({super.key});
diff --git a/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_1.dart b/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_1.dart
index 538eb60e..a76db448 100644
--- a/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_1.dart
+++ b/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_1.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
+import 'package:wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
 
 class BottomNavigationBarLayoutPage1 extends StatelessWidget {
   const BottomNavigationBarLayoutPage1({super.key});
diff --git a/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_2.dart b/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_2.dart
index a430ba08..261ce32c 100644
--- a/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_2.dart
+++ b/packages/wyatt_ui_layout/example/lib/pages/bottom_navigation_bar_layout_page_2.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
+import 'package:wyatt_ui_layout/wyatt_wyatt_ui_layout.dart';
 
 class BottomNavigationBarLayoutPage2 extends StatelessWidget {
   const BottomNavigationBarLayoutPage2({super.key});
diff --git a/packages/wyatt_ui_layout/example/pubspec.yaml b/packages/wyatt_ui_layout/example/pubspec.yaml
index 90a6c138..c72bf036 100644
--- a/packages/wyatt_ui_layout/example/pubspec.yaml
+++ b/packages/wyatt_ui_layout/example/pubspec.yaml
@@ -31,8 +31,13 @@ dependencies:
   flutter:
     sdk: flutter  
   
-  wyatt_wyatt_ui_layout:
+  wyatt_ui_layout:
     path: "../"
+  wyatt_ui_components:
+    git: 
+      url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages
+      path: packages/wyatt_ui_components
+
   go_router: ^5.0.1
 
 dev_dependencies:
diff --git a/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart b/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart
index 974dd19d..46d82bd8 100644
--- a/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart
+++ b/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart
@@ -16,7 +16,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
-import 'package:wyatt_wyatt_ui_layout/src/presentation/layouts/layout.dart';
+import 'package:wyatt_ui_layout/src/presentation/layouts/layout.dart';
 
 class AppBarLayout extends Layout {
   final String title;
diff --git a/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart b/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart
index 8545fb5f..5c214ef9 100644
--- a/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart
+++ b/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
-import 'package:wyatt_wyatt_ui_layout/src/presentation/layouts/layout.dart';
+import 'package:wyatt_ui_layout/src/presentation/layouts/layout.dart';
 
 class BottomNavigationBarLayout extends Layout {
   final Widget body;
diff --git a/packages/wyatt_ui_layout/lib/wyatt_wyatt_ui_layout.dart b/packages/wyatt_ui_layout/lib/wyatt_wyatt_ui_layout.dart
index 1f9f3470..5ab915d4 100644
--- a/packages/wyatt_ui_layout/lib/wyatt_wyatt_ui_layout.dart
+++ b/packages/wyatt_ui_layout/lib/wyatt_wyatt_ui_layout.dart
@@ -15,6 +15,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 /// Wyatt Ui Layout
-library wyatt_wyatt_ui_layout;
+library wyatt_ui_layout;
 
 export 'src/src.dart';
diff --git a/packages/wyatt_ui_layout/models/class-models.puml b/packages/wyatt_ui_layout/models/class-models.puml
index e9f0f7e7..8f2a5e98 100644
--- a/packages/wyatt_ui_layout/models/class-models.puml
+++ b/packages/wyatt_ui_layout/models/class-models.puml
@@ -1,71 +1,28 @@
 @startuml
 set namespaceSeparator ::
 
-class "wyatt_wyatt_ui_layout::src::features::component_theme.dart::ComponentTheme" {
-  +Widget child
-  +ComponentThemeData themDataWidget
-  {static} +ComponentThemeData of()
-  +Widget build()
+abstract class "wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout" {
 }
 
-"wyatt_wyatt_ui_layout::src::features::component_theme.dart::ComponentTheme" o-- "flutter::src::widgets::framework.dart::Widget"
-"wyatt_wyatt_ui_layout::src::features::component_theme.dart::ComponentTheme" o-- "wyatt_wyatt_ui_layout::src::features::component_theme_data.dart::ComponentThemeData"
-"flutter::src::widgets::framework.dart::StatelessWidget" <|-- "wyatt_wyatt_ui_layout::src::features::component_theme.dart::ComponentTheme"
+"flutter::src::widgets::framework.dart::StatelessWidget" <|-- "wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout"
 
-class "wyatt_wyatt_ui_layout::src::features::component_theme.dart::_InheritedComponentTheme" {
-  +ComponentTheme themeWidget
-  +bool updateShouldNotify()
-}
-
-"wyatt_wyatt_ui_layout::src::features::component_theme.dart::_InheritedComponentTheme" o-- "wyatt_wyatt_ui_layout::src::features::component_theme.dart::ComponentTheme"
-"flutter::src::widgets::framework.dart::InheritedWidget" <|-- "wyatt_wyatt_ui_layout::src::features::component_theme.dart::_InheritedComponentTheme"
-
-class "wyatt_wyatt_ui_layout::src::features::component_theme_data.dart::ComponentThemeData" {
-  +AppBarComponent appBar
-  +BottomNavigationBarComponent bottomNavigationBar
-}
-
-"wyatt_wyatt_ui_layout::src::features::component_theme_data.dart::ComponentThemeData" o-- "wyatt_wyatt_ui_layout::src::domain::entities::components.dart::AppBarComponent"
-"wyatt_wyatt_ui_layout::src::features::component_theme_data.dart::ComponentThemeData" o-- "wyatt_wyatt_ui_layout::src::domain::entities::components.dart::BottomNavigationBarComponent"
-
-abstract class "wyatt_wyatt_ui_layout::src::domain::entities::components.dart::AppBarComponent" {
-  +String? title
-  +AppBarComponent configure()
-}
-
-"flutter::src::widgets::preferred_size.dart::PreferredSize" <|-- "wyatt_wyatt_ui_layout::src::domain::entities::components.dart::AppBarComponent"
-
-abstract class "wyatt_wyatt_ui_layout::src::domain::entities::components.dart::BottomNavigationBarComponent" {
-  +int currentIndex
-  +void Function(BuildContext, int)? onTap
-  +BottomNavigationBarComponent configure()
-}
-
-"wyatt_wyatt_ui_layout::src::domain::entities::components.dart::BottomNavigationBarComponent" o-- "null::void Function(BuildContext, int)"
-"flutter::src::widgets::framework.dart::StatelessWidget" <|-- "wyatt_wyatt_ui_layout::src::domain::entities::components.dart::BottomNavigationBarComponent"
-
-abstract class "wyatt_wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout" {
-}
-
-"flutter::src::widgets::framework.dart::StatelessWidget" <|-- "wyatt_wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout"
-
-class "wyatt_wyatt_ui_layout::src::presentation::layouts::bottom_navigation_bar_layout.dart::BottomNavigationBarLayout" {
+class "wyatt_ui_layout::src::presentation::layouts::bottom_navigation_bar_layout.dart::BottomNavigationBarLayout" {
   +Widget body
   +int currentIndex
   +Widget build()
 }
 
-"wyatt_wyatt_ui_layout::src::presentation::layouts::bottom_navigation_bar_layout.dart::BottomNavigationBarLayout" o-- "flutter::src::widgets::framework.dart::Widget"
-"wyatt_wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout" <|-- "wyatt_wyatt_ui_layout::src::presentation::layouts::bottom_navigation_bar_layout.dart::BottomNavigationBarLayout"
+"wyatt_ui_layout::src::presentation::layouts::bottom_navigation_bar_layout.dart::BottomNavigationBarLayout" o-- "flutter::src::widgets::framework.dart::Widget"
+"wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout" <|-- "wyatt_ui_layout::src::presentation::layouts::bottom_navigation_bar_layout.dart::BottomNavigationBarLayout"
 
-class "wyatt_wyatt_ui_layout::src::presentation::layouts::app_bar_layout.dart::AppBarLayout" {
+class "wyatt_ui_layout::src::presentation::layouts::app_bar_layout.dart::AppBarLayout" {
   +String title
   +Widget body
   +Widget build()
 }
 
-"wyatt_wyatt_ui_layout::src::presentation::layouts::app_bar_layout.dart::AppBarLayout" o-- "flutter::src::widgets::framework.dart::Widget"
-"wyatt_wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout" <|-- "wyatt_wyatt_ui_layout::src::presentation::layouts::app_bar_layout.dart::AppBarLayout"
+"wyatt_ui_layout::src::presentation::layouts::app_bar_layout.dart::AppBarLayout" o-- "flutter::src::widgets::framework.dart::Widget"
+"wyatt_ui_layout::src::presentation::layouts::layout.dart::Layout" <|-- "wyatt_ui_layout::src::presentation::layouts::app_bar_layout.dart::AppBarLayout"
 
 
 @enduml
\ No newline at end of file
diff --git a/packages/wyatt_ui_layout/pubspec.yaml b/packages/wyatt_ui_layout/pubspec.yaml
index cae6a2c9..625daea9 100644
--- a/packages/wyatt_ui_layout/pubspec.yaml
+++ b/packages/wyatt_ui_layout/pubspec.yaml
@@ -1,6 +1,6 @@
-name: wyatt_wyatt_ui_layout
+name: wyatt_ui_layout
 description: Main layouts to help you build your application views.
-repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_wyatt_ui_layout
+repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_ui_layout
 version: 0.0.1
 
 environment: