diff --git a/packages/wyatt_ui_components/example/lib/main.dart b/packages/wyatt_ui_components/example/lib/main.dart
index 1401526b..840b81d6 100644
--- a/packages/wyatt_ui_components/example/lib/main.dart
+++ b/packages/wyatt_ui_components/example/lib/main.dart
@@ -14,12 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-
 import 'package:flutter/material.dart';
 
-import 'package:wyatt_wyatt_ui_components/wyatt_wyatt_ui_components.dart';
-
-
 void main() {
   runApp(const MyApp());
 }
@@ -39,9 +35,8 @@ class MyApp extends StatelessWidget {
         appBar: AppBar(
           title: const Text('Wyatt Ui Components Example'),
         ),
-        body: Center(child: Text(wyatt())),
+        body: const Center(child: Text('')),
       ),
     );
   }
 }
-
diff --git a/packages/wyatt_ui_components/example/pubspec.yaml b/packages/wyatt_ui_components/example/pubspec.yaml
index e6df9c6b..0288aaba 100644
--- a/packages/wyatt_ui_components/example/pubspec.yaml
+++ b/packages/wyatt_ui_components/example/pubspec.yaml
@@ -32,7 +32,7 @@ dependencies:
     sdk: flutter
   
   
-  wyatt_wyatt_ui_components:
+  wyatt_ui_components:
     path: "../"
 
 dev_dependencies:
diff --git a/packages/wyatt_ui_layout/lib/src/core/core.dart b/packages/wyatt_ui_components/lib/src/core/core.dart
similarity index 100%
rename from packages/wyatt_ui_layout/lib/src/core/core.dart
rename to packages/wyatt_ui_components/lib/src/core/core.dart
diff --git a/packages/wyatt_ui_layout/lib/src/core/extensions/build_context_extensions.dart b/packages/wyatt_ui_components/lib/src/core/extensions/build_context_extensions.dart
similarity index 85%
rename from packages/wyatt_ui_layout/lib/src/core/extensions/build_context_extensions.dart
rename to packages/wyatt_ui_components/lib/src/core/extensions/build_context_extensions.dart
index abc44d1b..d22389c0 100644
--- a/packages/wyatt_ui_layout/lib/src/core/extensions/build_context_extensions.dart
+++ b/packages/wyatt_ui_components/lib/src/core/extensions/build_context_extensions.dart
@@ -15,8 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/src/features/component_theme.dart';
-import 'package:wyatt_wyatt_ui_layout/src/features/component_theme_data.dart';
+import 'package:wyatt_ui_components/src/features/features.dart';
 
 extension ThemeComponentBuildContext on BuildContext {
   ComponentThemeData get components => ComponentTheme.of(this);
diff --git a/packages/wyatt_ui_layout/lib/src/domain/domain.dart b/packages/wyatt_ui_components/lib/src/domain/domain.dart
similarity index 100%
rename from packages/wyatt_ui_layout/lib/src/domain/domain.dart
rename to packages/wyatt_ui_components/lib/src/domain/domain.dart
diff --git a/packages/wyatt_ui_layout/lib/src/domain/entities/components.dart b/packages/wyatt_ui_components/lib/src/domain/entities/components.dart
similarity index 100%
rename from packages/wyatt_ui_layout/lib/src/domain/entities/components.dart
rename to packages/wyatt_ui_components/lib/src/domain/entities/components.dart
diff --git a/packages/wyatt_ui_layout/lib/src/features/component_theme.dart b/packages/wyatt_ui_components/lib/src/features/component_theme.dart
similarity index 95%
rename from packages/wyatt_ui_layout/lib/src/features/component_theme.dart
rename to packages/wyatt_ui_components/lib/src/features/component_theme.dart
index 6161f269..612b71a2 100644
--- a/packages/wyatt_ui_layout/lib/src/features/component_theme.dart
+++ b/packages/wyatt_ui_components/lib/src/features/component_theme.dart
@@ -15,7 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/src/features/component_theme_data.dart';
+import 'package:wyatt_ui_components/src/features/features.dart';
 
 class ComponentTheme extends StatelessWidget {
   final Widget child;
diff --git a/packages/wyatt_ui_layout/lib/src/features/component_theme_data.dart b/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart
similarity index 92%
rename from packages/wyatt_ui_layout/lib/src/features/component_theme_data.dart
rename to packages/wyatt_ui_components/lib/src/features/component_theme_data.dart
index a4ab8570..0e6ddf34 100644
--- a/packages/wyatt_ui_layout/lib/src/features/component_theme_data.dart
+++ b/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:wyatt_wyatt_ui_layout/src/domain/entities/components.dart';
+import 'package:wyatt_ui_components/src/domain/entities/components.dart';
 
 class ComponentThemeData {
   final AppBarComponent appBar;
diff --git a/packages/wyatt_ui_layout/lib/src/features/features.dart b/packages/wyatt_ui_components/lib/src/features/features.dart
similarity index 100%
rename from packages/wyatt_ui_layout/lib/src/features/features.dart
rename to packages/wyatt_ui_components/lib/src/features/features.dart
diff --git a/packages/wyatt_ui_components/lib/src/package.dart b/packages/wyatt_ui_components/lib/src/package.dart
deleted file mode 100644
index 97d1f180..00000000
--- a/packages/wyatt_ui_components/lib/src/package.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (C) 2022 WYATT GROUP
-// Please see the AUTHORS file for details.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-String wyatt() => "wyatt_wyatt_ui_components";
\ No newline at end of file
diff --git a/packages/wyatt_ui_components/lib/src/src.dart b/packages/wyatt_ui_components/lib/src/src.dart
index 72924ab1..9bd7701f 100644
--- a/packages/wyatt_ui_components/lib/src/src.dart
+++ b/packages/wyatt_ui_components/lib/src/src.dart
@@ -14,4 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-export 'package.dart';
\ No newline at end of file
+export 'core/core.dart';
+export 'core/core.dart';
+export 'domain/domain.dart';
+export 'features/features.dart';
diff --git a/packages/wyatt_ui_components/lib/wyatt_wyatt_ui_components.dart b/packages/wyatt_ui_components/lib/wyatt_wyatt_ui_components.dart
index 68a14d8c..3d5154e2 100644
--- a/packages/wyatt_ui_components/lib/wyatt_wyatt_ui_components.dart
+++ b/packages/wyatt_ui_components/lib/wyatt_wyatt_ui_components.dart
@@ -15,6 +15,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 /// Wyatt Ui Components
-library wyatt_wyatt_ui_components;
+library wyatt_ui_components;
 
 export 'src/src.dart';
diff --git a/packages/wyatt_ui_components/pubspec.yaml b/packages/wyatt_ui_components/pubspec.yaml
index a76324d1..f2cb2329 100644
--- a/packages/wyatt_ui_components/pubspec.yaml
+++ b/packages/wyatt_ui_components/pubspec.yaml
@@ -1,6 +1,6 @@
-name: wyatt_wyatt_ui_components
+name: wyatt_ui_components
 description: Primary ui components
-repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_wyatt_ui_components
+repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_ui_components
 version: 0.0.1
 
 environment:
@@ -10,8 +10,6 @@ dependencies:
   
   flutter:
     sdk: flutter
-  
-  http: ^0.13.4
 
 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 30ff3b67..974dd19d 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
@@ -15,7 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/src/core/extensions/build_context_extensions.dart';
+import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 import 'package:wyatt_wyatt_ui_layout/src/presentation/layouts/layout.dart';
 
 class AppBarLayout extends Layout {
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 c25b548c..8545fb5f 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,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:wyatt_wyatt_ui_layout/src/core/core.dart';
+import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 import 'package:wyatt_wyatt_ui_layout/src/presentation/layouts/layout.dart';
 
 class BottomNavigationBarLayout extends Layout {
diff --git a/packages/wyatt_ui_layout/lib/src/src.dart b/packages/wyatt_ui_layout/lib/src/src.dart
index 43a04e00..6890de4f 100644
--- a/packages/wyatt_ui_layout/lib/src/src.dart
+++ b/packages/wyatt_ui_layout/lib/src/src.dart
@@ -14,7 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-export 'core/core.dart';
-export 'domain/domain.dart';
-export 'features/features.dart';
 export 'presentation/presentation.dart';
diff --git a/packages/wyatt_ui_layout/pubspec.yaml b/packages/wyatt_ui_layout/pubspec.yaml
index 9bba60f6..cae6a2c9 100644
--- a/packages/wyatt_ui_layout/pubspec.yaml
+++ b/packages/wyatt_ui_layout/pubspec.yaml
@@ -10,11 +10,18 @@ dependencies:
   
   flutter:
     sdk: flutter
+  
+  wyatt_ui_components:
+    git:
+      url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages
+      path: packages/wyatt_ui_components
 
 dev_dependencies:
   
   flutter_test:
     sdk: flutter
+
+
   
   
   wyatt_analysis: