diff --git a/dependencies/catalog-v001.xml b/dependencies/catalog-v001.xml
index 5197d81..b5645fe 100644
--- a/dependencies/catalog-v001.xml
+++ b/dependencies/catalog-v001.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
-    <uri id="User Entered Import Resolution" uri="BFO.ttl" name="http://purl.obolibrary.org/obo/bfo.owl"/>
+    <uri id="User Entered Import Resolution" uri="CDO-Shapes-BFO/dependencies/BFO.ttl" name="http://purl.obolibrary.org/obo/bfo.owl"/>
 </catalog>
diff --git a/ontology/catalog-v001.xml b/ontology/catalog-v001.xml
index b8a7d12..f6f80c9 100644
--- a/ontology/catalog-v001.xml
+++ b/ontology/catalog-v001.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
-    <uri id="User Entered Import Resolution" uri="../dependencies/BFO.ttl" name="http://purl.obolibrary.org/obo/bfo/2014-05-03/bfo.owl"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/owl/owl.ttl" name="https://ontology.unifiedcyberontology.org/owl/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/analysis/analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/configuration/configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/identity/identity.ttl" name="https://ontology.unifiedcyberontology.org/uco/identity/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/marking/marking.ttl" name="https://ontology.unifiedcyberontology.org/uco/marking/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/master/uco.ttl" name="https://ontology.unifiedcyberontology.org/uco/uco/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/observable/observable.ttl" name="https://ontology.unifiedcyberontology.org/uco/observable/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/time/time.ttl" name="https://ontology.unifiedcyberontology.org/uco/time/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/tool/tool.ttl" name="https://ontology.unifiedcyberontology.org/uco/tool/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/victim/victim.ttl" name="https://ontology.unifiedcyberontology.org/uco/victim/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/BFO.ttl" name="http://purl.obolibrary.org/obo/bfo/2014-05-03/bfo.owl"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/owl/owl.ttl" name="https://ontology.unifiedcyberontology.org/owl/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/analysis/analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/configuration/configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/identity/identity.ttl" name="https://ontology.unifiedcyberontology.org/uco/identity/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/marking/marking.ttl" name="https://ontology.unifiedcyberontology.org/uco/marking/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/master/uco.ttl" name="https://ontology.unifiedcyberontology.org/uco/uco/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/observable/observable.ttl" name="https://ontology.unifiedcyberontology.org/uco/observable/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/time/time.ttl" name="https://ontology.unifiedcyberontology.org/uco/time/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/tool/tool.ttl" name="https://ontology.unifiedcyberontology.org/uco/tool/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/victim/victim.ttl" name="https://ontology.unifiedcyberontology.org/uco/victim/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../dependencies/CDO-Shapes-BFO/dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
     <uri id="User Entered Import Resolution" uri="uco-bfo.ttl" name="http://example.org/ontology/uco-bfo"/>
 </catalog>