diff --git a/.gitignore b/.gitignore
index 42bc5d9a..16ff804d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ unoplat-code-confluence-query-engine/dist
 unoplat-code-confluence-query-engine/unoplat_code_confluence_query_engine/__pycache__
 unoplat-code-confluence-query-engine/dspy/__pycache__
 experiments
+unoplat-code-confluence-commons/dist
diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py
index 094331bb..1c855edc 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py
@@ -9,5 +9,5 @@ class ConfluenceClass(BaseNode):
     class_objective_embedding = ArrayProperty(FloatProperty())
     class_implementation_summary_embedding = ArrayProperty(FloatProperty())
     # Class relationships
-    package = RelationshipFrom('ConfluencePackage', 'CONTAINS', model=ContainsRelationship, cardinality=One)
-    methods = RelationshipTo('ConfluenceMethod', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)
+    package = RelationshipFrom('.confluence_package.ConfluencePackage', 'CONTAINS', model=ContainsRelationship, cardinality=One)
+    methods = RelationshipTo('.confluence_method.ConfluenceMethod', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)
diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py
index 616f2a37..7e88dd3b 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py
@@ -17,7 +17,7 @@ class ConfluenceCodebase(BaseNode):
     codebase_objective_embedding = ArrayProperty(FloatProperty())
     codebase_implementation_embedding = ArrayProperty(FloatProperty())
     # One codebase can contain multiple packages
-    packages = RelationshipTo('ConfluencePackage', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)
+    packages = RelationshipTo('.confluence_package.ConfluencePackage', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)
 
 
 
diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py
index 3d607846..af12f993 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py
@@ -9,4 +9,4 @@ class ConfluenceMethod(BaseNode):
     function_objective_embedding = ArrayProperty(FloatProperty())
     function_summary_embedding = ArrayProperty(FloatProperty())
     # Method relationships
-    confluence_class = RelationshipFrom('ConfluenceClass', 'CONTAINS', model=ContainsRelationship, cardinality=One)
+    confluence_class = RelationshipFrom('.confluence_class.ConfluenceClass', 'CONTAINS', model=ContainsRelationship, cardinality=One)
diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py
index abd78310..5661de15 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py
@@ -5,9 +5,8 @@ class ConfluencePackage(BaseNode):
     """Represents a package in the codebase"""
     package_objective = StringProperty(required=True)
     package_implementation_summary = StringProperty(required=True)
-    
     package_objective_embedding = ArrayProperty(FloatProperty())
     package_implementation_summary_embedding = ArrayProperty(FloatProperty())
-    confluence_codebase = RelationshipFrom('ConfluenceCodebase', 'CONTAINS', model=ContainsRelationship, cardinality=One)
-    sub_packages = RelationshipTo('ConfluencePackage', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)
-    classes = RelationshipTo('ConfluenceClass', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)
+    confluence_codebase = RelationshipFrom('.confluence_codebase.ConfluenceCodebase', 'CONTAINS', model=ContainsRelationship, cardinality=One)
+    sub_packages = RelationshipTo('.confluence_package.ConfluencePackage', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)
+    classes = RelationshipTo('.confluence_class.ConfluenceClass', 'CONTAINS', model=ContainsRelationship, cardinality=ZeroOrMore)