diff --git a/packages/wyatt_type_utils/lib/src/either_base.dart b/packages/wyatt_type_utils/lib/src/either/either_base.dart
similarity index 100%
rename from packages/wyatt_type_utils/lib/src/either_base.dart
rename to packages/wyatt_type_utils/lib/src/either/either_base.dart
diff --git a/packages/wyatt_type_utils/lib/src/future_result.dart b/packages/wyatt_type_utils/lib/src/either/future_result.dart
similarity index 100%
rename from packages/wyatt_type_utils/lib/src/future_result.dart
rename to packages/wyatt_type_utils/lib/src/either/future_result.dart
diff --git a/packages/wyatt_type_utils/lib/src/option.dart b/packages/wyatt_type_utils/lib/src/either/option.dart
similarity index 100%
rename from packages/wyatt_type_utils/lib/src/option.dart
rename to packages/wyatt_type_utils/lib/src/either/option.dart
diff --git a/packages/wyatt_type_utils/lib/src/result.dart b/packages/wyatt_type_utils/lib/src/either/result.dart
similarity index 100%
rename from packages/wyatt_type_utils/lib/src/result.dart
rename to packages/wyatt_type_utils/lib/src/either/result.dart
diff --git a/packages/wyatt_type_utils/pubspec.yaml b/packages/wyatt_type_utils/pubspec.yaml
index 38539757..cffd63af 100644
--- a/packages/wyatt_type_utils/pubspec.yaml
+++ b/packages/wyatt_type_utils/pubspec.yaml
@@ -3,13 +3,14 @@ description: Either, Option and other useful types.
 repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_type_utils
 version: 0.0.2
 
+publish_to: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub
+
 environment:
   sdk: '>=2.17.0 <3.0.0'
 
 dev_dependencies:
-  test: ^1.21.4
+  test: ^1.22.0
+  
   wyatt_analysis:
-    git:
-      url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages
-      ref: wyatt_analysis-v2.2.2
-      path: packages/wyatt_analysis
\ No newline at end of file
+    hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub
+    version: ^2.2.2
\ No newline at end of file
diff --git a/packages/wyatt_type_utils/test/option_test.dart b/packages/wyatt_type_utils/test/option_test.dart
index 6e11031d..e451ce6d 100644
--- a/packages/wyatt_type_utils/test/option_test.dart
+++ b/packages/wyatt_type_utils/test/option_test.dart
@@ -15,7 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:test/test.dart';
-import 'package:wyatt_type_utils/src/either_base.dart';
+import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 void main() {
   group('Option<T>', () {
diff --git a/packages/wyatt_type_utils/test/result_test.dart b/packages/wyatt_type_utils/test/result_test.dart
index 5bdc8b0f..eababedf 100644
--- a/packages/wyatt_type_utils/test/result_test.dart
+++ b/packages/wyatt_type_utils/test/result_test.dart
@@ -15,7 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:test/test.dart';
-import 'package:wyatt_type_utils/src/either_base.dart';
+import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 void main() {
   group('Result<T,E>', () {