diff --git a/Package.swift b/Package.swift
index 4213c72..d53b7af 100644
--- a/Package.swift
+++ b/Package.swift
@@ -6,10 +6,17 @@ let package = Package(
 		name: "Uptech-iOS-Helpers",
 		platforms: [.iOS(.v11)],
 		products: [
-				.library(name: "Uptech-iOS-Helpers", targets: ["Uptech-iOS-Helpers"]),
+                .library(name: "FoundationHelper", targets: ["FoundationHelper"]),
+                .library(name: "UIKitHelper", targets: ["UIKitHelper"])
 		],
 		targets: [
-				.target(name: "Uptech-iOS-Helpers", dependencies: []),
-				.testTarget(name: "Uptech-iOS-Helpers-Tests", dependencies: ["Uptech-iOS-Helpers"]),
+				.target(name: "FoundationHelper", path: "Sources/Uptech-iOS-Helpers/FoundationHelper"),
+                .target(name: "UIKitHelper", path: "Sources/Uptech-iOS-Helpers/UIKitHelper"),
+                .testTarget(name: "FoundationHelper-Test",
+                            dependencies: ["FoundationHelper"],
+                            path: "Tests/Uptech-iOS-Helpers-Tests/FoundationHelper"),
+                .testTarget(name: "UIKitHelper-Test",
+                            dependencies: ["UIKitHelper"],
+                            path: "Tests/Uptech-iOS-Helpers-Tests/UIKitHelper")
 		]
 )
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/Foundation/Array+extensions.swift b/Sources/Uptech-iOS-Helpers/FoundationHelper/Array+extensions.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/Foundation/Array+extensions.swift
rename to Sources/Uptech-iOS-Helpers/FoundationHelper/Array+extensions.swift
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/UIKit/CACornerMask+extensions.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/CACornerMask+extensions.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/UIKit/CACornerMask+extensions.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/CACornerMask+extensions.swift
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/UIKit/Collection+indexPath.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/Collection+indexPath.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/UIKit/Collection+indexPath.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/Collection+indexPath.swift
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/UIKit/NSLayoutConstrain+extensions.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/NSLayoutConstrain+extensions.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/UIKit/NSLayoutConstrain+extensions.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/NSLayoutConstrain+extensions.swift
diff --git a/Sources/Uptech-iOS-Helpers/Protocols/NibInitializable.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/Protocols/NibInitializable.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Protocols/NibInitializable.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/Protocols/NibInitializable.swift
diff --git a/Sources/Uptech-iOS-Helpers/Protocols/ReusableCell.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/Protocols/ReusableCell.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Protocols/ReusableCell.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/Protocols/ReusableCell.swift
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/UIKit/UICollectionView+extensions.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/UICollectionView+extensions.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/UIKit/UICollectionView+extensions.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/UICollectionView+extensions.swift
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/UIKit/UILayoutPriority+extensions.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/UILayoutPriority+extensions.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/UIKit/UILayoutPriority+extensions.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/UILayoutPriority+extensions.swift
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/UIKit/UITableView+extensions.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/UITableView+extensions.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/UIKit/UITableView+extensions.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/UITableView+extensions.swift
diff --git a/Sources/Uptech-iOS-Helpers/Extensions/UIKit/UIView+extensions.swift b/Sources/Uptech-iOS-Helpers/UIKitHelper/UIView+extensions.swift
similarity index 100%
rename from Sources/Uptech-iOS-Helpers/Extensions/UIKit/UIView+extensions.swift
rename to Sources/Uptech-iOS-Helpers/UIKitHelper/UIView+extensions.swift
diff --git a/Tests/Uptech-iOS-Helpers-Tests/Foundation/Array+extensionsTests.swift b/Tests/Uptech-iOS-Helpers-Tests/FoundationHelper/Array+extensionsTests.swift
similarity index 98%
rename from Tests/Uptech-iOS-Helpers-Tests/Foundation/Array+extensionsTests.swift
rename to Tests/Uptech-iOS-Helpers-Tests/FoundationHelper/Array+extensionsTests.swift
index a3bd358..e5a1485 100644
--- a/Tests/Uptech-iOS-Helpers-Tests/Foundation/Array+extensionsTests.swift
+++ b/Tests/Uptech-iOS-Helpers-Tests/FoundationHelper/Array+extensionsTests.swift
@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Uptech_iOS_Helpers
+@testable import FoundationHelper
 
 final class ArrayExtensionsTests: XCTestCase {
 		private let sut = [0, 1, 2, 3, 4]
diff --git a/Tests/Uptech-iOS-Helpers-Tests/UIKit/Collection+indexPathTests.swift b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/Collection+indexPathTests.swift
similarity index 95%
rename from Tests/Uptech-iOS-Helpers-Tests/UIKit/Collection+indexPathTests.swift
rename to Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/Collection+indexPathTests.swift
index 8ae87da..1d8f52a 100644
--- a/Tests/Uptech-iOS-Helpers-Tests/UIKit/Collection+indexPathTests.swift
+++ b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/Collection+indexPathTests.swift
@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Uptech_iOS_Helpers
+@testable import UIKitHelper
 
 final class CollectionIndexPathTests: XCTestCase {
 		private let sut = [[0, 1, 2],
diff --git a/Tests/Uptech-iOS-Helpers-Tests/UIKit/NSLayoutConstraint+extensionsTests.swift b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/NSLayoutConstraint+extensionsTests.swift
similarity index 96%
rename from Tests/Uptech-iOS-Helpers-Tests/UIKit/NSLayoutConstraint+extensionsTests.swift
rename to Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/NSLayoutConstraint+extensionsTests.swift
index 9117f22..13a62fa 100644
--- a/Tests/Uptech-iOS-Helpers-Tests/UIKit/NSLayoutConstraint+extensionsTests.swift
+++ b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/NSLayoutConstraint+extensionsTests.swift
@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Uptech_iOS_Helpers
+@testable import UIKitHelper
 
 final class NSLayoutConstraintExtensionsTests: XCTestCase {
 		
diff --git a/Tests/Uptech-iOS-Helpers-Tests/UIKit/UICollectionView+extensionsTests.swift b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UICollectionView+extensionsTests.swift
similarity index 96%
rename from Tests/Uptech-iOS-Helpers-Tests/UIKit/UICollectionView+extensionsTests.swift
rename to Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UICollectionView+extensionsTests.swift
index 0448e72..21d46af 100644
--- a/Tests/Uptech-iOS-Helpers-Tests/UIKit/UICollectionView+extensionsTests.swift
+++ b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UICollectionView+extensionsTests.swift
@@ -7,7 +7,7 @@
 
 import XCTest
 import UIKit
-@testable import Uptech_iOS_Helpers
+@testable import UIKitHelper
 
 final class UICollectionViewExtensionsTests: XCTestCase {
 		private class TestCell: UICollectionViewCell, ReusableCell { }
diff --git a/Tests/Uptech-iOS-Helpers-Tests/UIKit/UITableView+extensionsTests.swift b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UITableView+extensionsTests.swift
similarity index 96%
rename from Tests/Uptech-iOS-Helpers-Tests/UIKit/UITableView+extensionsTests.swift
rename to Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UITableView+extensionsTests.swift
index 0517f81..fc62647 100644
--- a/Tests/Uptech-iOS-Helpers-Tests/UIKit/UITableView+extensionsTests.swift
+++ b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UITableView+extensionsTests.swift
@@ -7,7 +7,7 @@
 
 import XCTest
 import UIKit
-@testable import Uptech_iOS_Helpers
+@testable import UIKitHelper
 
 final class UITableViewExtensionsTests: XCTestCase {
 		private class TestCell: UITableViewCell, ReusableCell { }
diff --git a/Tests/Uptech-iOS-Helpers-Tests/UIKit/UIView+extensionsTests.swift b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UIView+extensionsTests.swift
similarity index 98%
rename from Tests/Uptech-iOS-Helpers-Tests/UIKit/UIView+extensionsTests.swift
rename to Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UIView+extensionsTests.swift
index 38de2a5..37ee737 100644
--- a/Tests/Uptech-iOS-Helpers-Tests/UIKit/UIView+extensionsTests.swift
+++ b/Tests/Uptech-iOS-Helpers-Tests/UIKitHelper/UIView+extensionsTests.swift
@@ -6,7 +6,7 @@
 //
 
 import XCTest
-@testable import Uptech_iOS_Helpers
+@testable import UIKitHelper
 
 final class UIViewExtensionsTests: XCTestCase {