diff --git a/README.md b/README.md
index a3a3aad..1cbaa6a 100644
--- a/README.md
+++ b/README.md
@@ -5,25 +5,23 @@ A collection of reusable logic to boost Apple platform apps development process.
 ## Contents
 
 ```
-├── Caffeine
-│   ├── Controllers
-│   │   └── StorageController.swift
-│   ├── Extensions
-│   │   ├── AdditiveArithmetic+Constants
-│   │   ├── Array+Operations.swift
-│   │   └── String+Constants.swift
-│   ├── Network
-│   │   ├── RemoteAPI.swift
-│   │   ├── RemoteEndpoint.swift
-│   │   ├── RemoteService.swift
-│   │   └── RequestCoordinator.swift
-│   ├── Protocols
-│   │   └── Storable.swift
-├── CaffeineUI
-│   ├── Extensions
-│   │   └── LazyGrids+ConvenienceInits.swift
+├── Controllers
+│   └── StorageController.swift
+├── Extensions
+│   ├── AdditiveArithmetic+Caffeine.swift
+│   ├── Array+Caffeine.swift
+│   ├── LazyGrids+Caffeine.swift
+│   └── String+Caffeine.swift
+├── Network
+│   ├── RemoteAPI.swift
+│   ├── RemoteEndpoint.swift
+│   ├── RemoteService.swift
+│   └── RequestCoordinator.swift
+├── Presentation
 │   ├── Modifiers
 │   │   └── AlertStateModifier.swift
 │   ├── SystemImage.swift
 │   └── ViewModel.swift
+├── Protocols
+│   └── Storable.swift
 ```
diff --git a/Sources/Caffeine/Extensions/AdditiveArithmetic+Constants b/Sources/Caffeine/Extensions/AdditiveArithmetic+Caffeine.swift
similarity index 89%
rename from Sources/Caffeine/Extensions/AdditiveArithmetic+Constants
rename to Sources/Caffeine/Extensions/AdditiveArithmetic+Caffeine.swift
index ff299d2..dc3648b 100644
--- a/Sources/Caffeine/Extensions/AdditiveArithmetic+Constants
+++ b/Sources/Caffeine/Extensions/AdditiveArithmetic+Caffeine.swift
@@ -1,5 +1,5 @@
 //
-//  AdditiveArithmetic+Constants.swift
+//  AdditiveArithmetic+Caffeine.swift
 //  Caffeine
 //
 //  Created by Jota Uribe on 14/07/23.
diff --git a/Sources/Caffeine/Extensions/Array+Operations.swift b/Sources/Caffeine/Extensions/Array+Caffeine.swift
similarity index 93%
rename from Sources/Caffeine/Extensions/Array+Operations.swift
rename to Sources/Caffeine/Extensions/Array+Caffeine.swift
index 7a0c4cb..4795e3a 100644
--- a/Sources/Caffeine/Extensions/Array+Operations.swift
+++ b/Sources/Caffeine/Extensions/Array+Caffeine.swift
@@ -1,5 +1,5 @@
 //
-//  Array+Operations.swift
+//  Array+Caffeine.swift
 //  Caffeine
 //
 //  Created by Jota Uribe on 14/07/23.
diff --git a/Sources/CaffeineUI/Extensions/LazyGrids+ConvenienceInits.swift b/Sources/Caffeine/Extensions/LazyGrids+Caffeine.swift
similarity index 97%
rename from Sources/CaffeineUI/Extensions/LazyGrids+ConvenienceInits.swift
rename to Sources/Caffeine/Extensions/LazyGrids+Caffeine.swift
index 06308a8..0455a4a 100644
--- a/Sources/CaffeineUI/Extensions/LazyGrids+ConvenienceInits.swift
+++ b/Sources/Caffeine/Extensions/LazyGrids+Caffeine.swift
@@ -1,5 +1,5 @@
 //
-//  LazyGrids+ConvenienceInits.swift
+//  LazyGrids+Caffeine.swift
 //  Caffeine
 //
 //  Created by Jota Uribe on 1/03/24.
diff --git a/Sources/Caffeine/Extensions/String+Constants.swift b/Sources/Caffeine/Extensions/String+Caffeine.swift
similarity index 83%
rename from Sources/Caffeine/Extensions/String+Constants.swift
rename to Sources/Caffeine/Extensions/String+Caffeine.swift
index d822d11..649dab2 100644
--- a/Sources/Caffeine/Extensions/String+Constants.swift
+++ b/Sources/Caffeine/Extensions/String+Caffeine.swift
@@ -1,5 +1,5 @@
 //
-//  String+Constants.swift
+//  String+Caffeine.swift
 //  Caffeine
 //
 //  Created by Jota Uribe on 14/07/23.
diff --git a/Sources/CaffeineUI/Modifiers/AlertStateModifier.swift b/Sources/Caffeine/Presentation/Modifiers/AlertStateModifier.swift
similarity index 100%
rename from Sources/CaffeineUI/Modifiers/AlertStateModifier.swift
rename to Sources/Caffeine/Presentation/Modifiers/AlertStateModifier.swift
diff --git a/Sources/CaffeineUI/SystemImage.swift b/Sources/Caffeine/Presentation/SystemImage.swift
similarity index 100%
rename from Sources/CaffeineUI/SystemImage.swift
rename to Sources/Caffeine/Presentation/SystemImage.swift
diff --git a/Sources/CaffeineUI/ViewModel.swift b/Sources/Caffeine/Presentation/ViewModel.swift
similarity index 100%
rename from Sources/CaffeineUI/ViewModel.swift
rename to Sources/Caffeine/Presentation/ViewModel.swift