diff --git a/Package.swift b/Package.swift
index 94905245..f856f706 100644
--- a/Package.swift
+++ b/Package.swift
@@ -29,13 +29,13 @@ let package = Package(
             ]
         ),
         .executableTarget(name: "HubCLI", dependencies: ["Hub", .product(name: "ArgumentParser", package: "swift-argument-parser")]),
+        .target(name: "Generation", dependencies: ["Tokenizers"]),
         .target(name: "Hub", resources: [.process("FallbackConfigs")], swiftSettings: swiftSettings),
+        .target(name: "Models", dependencies: ["Tokenizers", "Generation"]),
         .target(name: "Tokenizers", dependencies: ["Hub", .product(name: "Jinja", package: "Jinja")]),
-        .target(name: "TensorUtils"),
-        .target(name: "Generation", dependencies: ["Tokenizers", "TensorUtils"]),
-        .target(name: "Models", dependencies: ["Tokenizers", "Generation", "TensorUtils"]),
-        .testTarget(name: "TokenizersTests", dependencies: ["Tokenizers", "Models", "Hub"], resources: [.process("Resources"), .process("Vocabs")]),
+        .testTarget(name: "GenerationTests", dependencies: ["Generation"]),
         .testTarget(name: "HubTests", dependencies: ["Hub", .product(name: "Jinja", package: "Jinja")], swiftSettings: swiftSettings),
-        .testTarget(name: "TensorUtilsTests", dependencies: ["TensorUtils", "Models", "Hub"], resources: [.process("Resources")]),
+        .testTarget(name: "ModelsTests", dependencies: ["Models", "Hub"], resources: [.process("Resources")]),
+        .testTarget(name: "TokenizersTests", dependencies: ["Tokenizers", "Models", "Hub"], resources: [.process("Resources"), .process("Vocabs")]),
     ]
 )
diff --git a/Sources/Generation/Generation.swift b/Sources/Generation/Generation.swift
index fe6f87cf..bea08272 100644
--- a/Sources/Generation/Generation.swift
+++ b/Sources/Generation/Generation.swift
@@ -6,7 +6,6 @@
 //
 
 import CoreML
-import TensorUtils
 import Tokenizers
 
 public enum GenerationMode {
diff --git a/Sources/TensorUtils/LogitsWarper/LogitsProcessor.swift b/Sources/Generation/LogitsWarper/LogitsProcessor.swift
similarity index 100%
rename from Sources/TensorUtils/LogitsWarper/LogitsProcessor.swift
rename to Sources/Generation/LogitsWarper/LogitsProcessor.swift
diff --git a/Sources/TensorUtils/LogitsWarper/LogitsWarper.swift b/Sources/Generation/LogitsWarper/LogitsWarper.swift
similarity index 100%
rename from Sources/TensorUtils/LogitsWarper/LogitsWarper.swift
rename to Sources/Generation/LogitsWarper/LogitsWarper.swift
diff --git a/Sources/TensorUtils/LogitsWarper/RepetitionPenaltyWarper.swift b/Sources/Generation/LogitsWarper/RepetitionPenaltyWarper.swift
similarity index 100%
rename from Sources/TensorUtils/LogitsWarper/RepetitionPenaltyWarper.swift
rename to Sources/Generation/LogitsWarper/RepetitionPenaltyWarper.swift
diff --git a/Sources/TensorUtils/LogitsWarper/TemperatureLogitsWarper.swift b/Sources/Generation/LogitsWarper/TemperatureLogitsWarper.swift
similarity index 100%
rename from Sources/TensorUtils/LogitsWarper/TemperatureLogitsWarper.swift
rename to Sources/Generation/LogitsWarper/TemperatureLogitsWarper.swift
diff --git a/Sources/TensorUtils/LogitsWarper/TopKLogitsWarper.swift b/Sources/Generation/LogitsWarper/TopKLogitsWarper.swift
similarity index 100%
rename from Sources/TensorUtils/LogitsWarper/TopKLogitsWarper.swift
rename to Sources/Generation/LogitsWarper/TopKLogitsWarper.swift
diff --git a/Sources/TensorUtils/LogitsWarper/TopPLogitsWarper.swift b/Sources/Generation/LogitsWarper/TopPLogitsWarper.swift
similarity index 100%
rename from Sources/TensorUtils/LogitsWarper/TopPLogitsWarper.swift
rename to Sources/Generation/LogitsWarper/TopPLogitsWarper.swift
diff --git a/Sources/TensorUtils/MLMultiArray+Utils.swift b/Sources/Generation/MLMultiArray+Utils.swift
similarity index 100%
rename from Sources/TensorUtils/MLMultiArray+Utils.swift
rename to Sources/Generation/MLMultiArray+Utils.swift
diff --git a/Sources/TensorUtils/MLShapedArray+Utils.swift b/Sources/Generation/MLShapedArray+Utils.swift
similarity index 100%
rename from Sources/TensorUtils/MLShapedArray+Utils.swift
rename to Sources/Generation/MLShapedArray+Utils.swift
diff --git a/Sources/TensorUtils/Math.swift b/Sources/Generation/Math.swift
similarity index 100%
rename from Sources/TensorUtils/Math.swift
rename to Sources/Generation/Math.swift
diff --git a/Sources/TensorUtils/Weights.swift b/Sources/Models/Weights.swift
similarity index 100%
rename from Sources/TensorUtils/Weights.swift
rename to Sources/Models/Weights.swift
diff --git a/Tests/TensorUtilsTests/LogitsWarperTests.swift b/Tests/GenerationTests/LogitsWarperTests.swift
similarity index 99%
rename from Tests/TensorUtilsTests/LogitsWarperTests.swift
rename to Tests/GenerationTests/LogitsWarperTests.swift
index 321cbd4a..20a77d24 100644
--- a/Tests/TensorUtilsTests/LogitsWarperTests.swift
+++ b/Tests/GenerationTests/LogitsWarperTests.swift
@@ -5,7 +5,7 @@
 //
 
 import CoreML
-@testable import TensorUtils
+@testable import Generation
 import XCTest
 
 final class LogitsWarperTests: XCTestCase {
diff --git a/Tests/TensorUtilsTests/TensorUtilsTests.swift b/Tests/GenerationTests/MathTests.swift
similarity index 94%
rename from Tests/TensorUtilsTests/TensorUtilsTests.swift
rename to Tests/GenerationTests/MathTests.swift
index 86f8bee1..9d1ae4d0 100644
--- a/Tests/TensorUtilsTests/TensorUtilsTests.swift
+++ b/Tests/GenerationTests/MathTests.swift
@@ -1,14 +1,14 @@
 //
-//  TensorUtilsTests.swift
+//  MathTests.swift
 //
 //  Created by Jan Krukowski on 25/11/2023.
 //
 
 import CoreML
-@testable import TensorUtils
+@testable import Generation
 import XCTest
 
-final class TensorUtilsTests: XCTestCase {
+final class MathTests: XCTestCase {
     private let accuracy: Float = 0.00001
 
     func testCumsum() {
diff --git a/Tests/TensorUtilsTests/TestUtils.swift b/Tests/GenerationTests/TestUtils.swift
similarity index 100%
rename from Tests/TensorUtilsTests/TestUtils.swift
rename to Tests/GenerationTests/TestUtils.swift
diff --git a/Tests/TensorUtilsTests/Resources/tensor-1d-int32.safetensors b/Tests/ModelsTests/Resources/tensor-1d-int32.safetensors
similarity index 100%
rename from Tests/TensorUtilsTests/Resources/tensor-1d-int32.safetensors
rename to Tests/ModelsTests/Resources/tensor-1d-int32.safetensors
diff --git a/Tests/TensorUtilsTests/Resources/tensor-2d-float64.safetensors b/Tests/ModelsTests/Resources/tensor-2d-float64.safetensors
similarity index 100%
rename from Tests/TensorUtilsTests/Resources/tensor-2d-float64.safetensors
rename to Tests/ModelsTests/Resources/tensor-2d-float64.safetensors
diff --git a/Tests/TensorUtilsTests/Resources/tensor-3d-float32.safetensors b/Tests/ModelsTests/Resources/tensor-3d-float32.safetensors
similarity index 100%
rename from Tests/TensorUtilsTests/Resources/tensor-3d-float32.safetensors
rename to Tests/ModelsTests/Resources/tensor-3d-float32.safetensors
diff --git a/Tests/TensorUtilsTests/Resources/tensor-4d-float32.safetensors b/Tests/ModelsTests/Resources/tensor-4d-float32.safetensors
similarity index 100%
rename from Tests/TensorUtilsTests/Resources/tensor-4d-float32.safetensors
rename to Tests/ModelsTests/Resources/tensor-4d-float32.safetensors
diff --git a/Tests/TensorUtilsTests/WeightsTests.swift b/Tests/ModelsTests/WeightsTests.swift
similarity index 99%
rename from Tests/TensorUtilsTests/WeightsTests.swift
rename to Tests/ModelsTests/WeightsTests.swift
index 8a4eccc2..ac21b7a5 100644
--- a/Tests/TensorUtilsTests/WeightsTests.swift
+++ b/Tests/ModelsTests/WeightsTests.swift
@@ -1,5 +1,5 @@
 @testable import Hub
-@testable import TensorUtils
+@testable import Models
 import XCTest
 
 class WeightsTests: XCTestCase {