diff --git a/Sources/WhoopDIKit/Injectable.swift b/Sources/WhoopDIKit/Injectable/Injectable.swift
similarity index 100%
rename from Sources/WhoopDIKit/Injectable.swift
rename to Sources/WhoopDIKit/Injectable/Injectable.swift
diff --git a/Sources/WhoopDIKit/DependencyDefinition.swift b/Sources/WhoopDIKit/Module/DependencyDefinition.swift
similarity index 100%
rename from Sources/WhoopDIKit/DependencyDefinition.swift
rename to Sources/WhoopDIKit/Module/DependencyDefinition.swift
diff --git a/Sources/WhoopDIKit/DependencyError.swift b/Sources/WhoopDIKit/Module/DependencyError.swift
similarity index 100%
rename from Sources/WhoopDIKit/DependencyError.swift
rename to Sources/WhoopDIKit/Module/DependencyError.swift
diff --git a/Sources/WhoopDIKit/DependencyModule.swift b/Sources/WhoopDIKit/Module/DependencyModule.swift
similarity index 100%
rename from Sources/WhoopDIKit/DependencyModule.swift
rename to Sources/WhoopDIKit/Module/DependencyModule.swift
diff --git a/Sources/WhoopDIKit/ServiceDictionary.swift b/Sources/WhoopDIKit/Service/ServiceDictionary.swift
similarity index 100%
rename from Sources/WhoopDIKit/ServiceDictionary.swift
rename to Sources/WhoopDIKit/Service/ServiceDictionary.swift
diff --git a/Sources/WhoopDIKit/ServiceKey.swift b/Sources/WhoopDIKit/Service/ServiceKey.swift
similarity index 100%
rename from Sources/WhoopDIKit/ServiceKey.swift
rename to Sources/WhoopDIKit/Service/ServiceKey.swift
diff --git a/Sources/WhoopDIKit/WhoopDIValidator.swift b/Sources/WhoopDIKit/Validation/WhoopDIValidator.swift
similarity index 100%
rename from Sources/WhoopDIKit/WhoopDIValidator.swift
rename to Sources/WhoopDIKit/Validation/WhoopDIValidator.swift
diff --git a/Tests/WhoopDIKitTests/InjectableTests.swift b/Tests/WhoopDIKitTests/Injectable/InjectableTests.swift
similarity index 100%
rename from Tests/WhoopDIKitTests/InjectableTests.swift
rename to Tests/WhoopDIKitTests/Injectable/InjectableTests.swift
diff --git a/Tests/WhoopDIKitTests/DependencyDefinitionTests.swift b/Tests/WhoopDIKitTests/Module/DependencyDefinitionTests.swift
similarity index 100%
rename from Tests/WhoopDIKitTests/DependencyDefinitionTests.swift
rename to Tests/WhoopDIKitTests/Module/DependencyDefinitionTests.swift
diff --git a/Tests/WhoopDIKitTests/DependencyErrorTests.swift b/Tests/WhoopDIKitTests/Module/DependencyErrorTests.swift
similarity index 100%
rename from Tests/WhoopDIKitTests/DependencyErrorTests.swift
rename to Tests/WhoopDIKitTests/Module/DependencyErrorTests.swift
diff --git a/Tests/WhoopDIKitTests/DependencyModuleTests.swift b/Tests/WhoopDIKitTests/Module/DependencyModuleTests.swift
similarity index 100%
rename from Tests/WhoopDIKitTests/DependencyModuleTests.swift
rename to Tests/WhoopDIKitTests/Module/DependencyModuleTests.swift
diff --git a/Tests/WhoopDIKitTests/ServiceDictionaryTests.swift b/Tests/WhoopDIKitTests/Service/ServiceDictionaryTests.swift
similarity index 100%
rename from Tests/WhoopDIKitTests/ServiceDictionaryTests.swift
rename to Tests/WhoopDIKitTests/Service/ServiceDictionaryTests.swift
diff --git a/Tests/WhoopDIKitTests/ServiceKeyTests.swift b/Tests/WhoopDIKitTests/Service/ServiceKeyTests.swift
similarity index 100%
rename from Tests/WhoopDIKitTests/ServiceKeyTests.swift
rename to Tests/WhoopDIKitTests/Service/ServiceKeyTests.swift