diff --git a/.gitmodules b/.gitmodules
index ba49991..892507b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "sdkCommonGQL"]
-	path = sdkCommonGQL
+	path = src/sdkCommonGQL
 	url = https://github.com/NavAbility/SDKCommonGQL.git
diff --git a/MANIFEST.in b/MANIFEST.in
index 8c07ee4..b81bf57 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include sdkCommonGQL/*.toml
\ No newline at end of file
+include src/sdkCommonGQL/*.toml
\ No newline at end of file
diff --git a/sdkCommonGQL b/sdkCommonGQL
deleted file mode 160000
index ca17c91..0000000
--- a/sdkCommonGQL
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca17c919821da3259e645be822cb113fa6e44639
diff --git a/setup.py b/setup.py
index 4969870..a980874 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,8 @@ def run(self):
         sdist.run(self)
 
 
+# print("TO COPY", find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]))
+
 setup(
     cmdclass={
         'develop': gitcmd_develop,
@@ -75,10 +77,11 @@ def run(self):
     license="Apache-2.0",
     author="NavAbility",
     author_email="info@navability.io",
+    packages=find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     package_dir={"": "src"},
-    package_data={"navabilitysdk": ["sdkCommonGQL/*.toml",]},
+    package_data={"sdkCommonGQL": ["*.toml",],},
+    # data_files=[('sdkCommonGQL',['*.toml',]),],
     include_package_data=True,
-    packages=find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     # entry_points={"console_scripts": ["navability = navability.main:cli"]},
     python_requires=">=3.8",
     download_url=f"https://github.com/NavAbility/NavAbilitySDK.py/archive/refs/tags/v{_version}.tar.gz",  # noqa: E501, B950
diff --git a/src/navability/services/loader.py b/src/navability/services/loader.py
index f131ad5..16c3a15 100644
--- a/src/navability/services/loader.py
+++ b/src/navability/services/loader.py
@@ -161,5 +161,5 @@ def detect_cycle(
 
 
 # Load all GraphQL operations from the "sdkCommonGQL" folder and export them
-GQL_FRAGMENTS, GQL_OPERATIONS = get_operations(os.path.join(pathlib.Path(__file__).parent.parent.parent.parent,"sdkCommonGQL"))
+GQL_FRAGMENTS, GQL_OPERATIONS = get_operations(os.path.join(pathlib.Path(__file__).parent.parent.parent,"sdkCommonGQL"))
 #   (os.path.join(".", "sdkCommonGQL"))
diff --git a/src/sdkCommonGQL b/src/sdkCommonGQL
new file mode 160000
index 0000000..170610c
--- /dev/null
+++ b/src/sdkCommonGQL
@@ -0,0 +1 @@
+Subproject commit 170610cf80324ba8d508b4eb53d5221663982dbc