diff --git a/context-definitions/stix-2.1/stix2-1_context.json b/json-dl-contexts/stix-2.1/stix2-1_context.json
similarity index 100%
rename from context-definitions/stix-2.1/stix2-1_context.json
rename to json-dl-contexts/stix-2.1/stix2-1_context.json
diff --git a/open-concepts/mitre-custom-properties/x_mitre.owl b/open-concepts/mitre-custom-properties/x_mitre.owl
deleted file mode 100644
index df022c9..0000000
--- a/open-concepts/mitre-custom-properties/x_mitre.owl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE rdf:RDF [
-	<!ENTITY attack "http://attack.mitre.org/ns/attack#">
-	<!ENTITY owl "http://www.w3.org/2002/07/owl#">
-	<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-	<!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#">
-	<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-]>
-<rdf:RDF xml:base="http://attack.mitre.org/ns/attack"
-	xmlns="http://attack.mitre.org/ns/attack#"
-	xmlns:attack="http://attack.mitre.org/ns/attack#"
-	xmlns:owl="http://www.w3.org/2002/07/owl#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-	
-	<owl:Ontology rdf:about="http://attack.mitre.org/ns/attack">
-		<owl:imports rdf:resource="http://docs.oasis-open.org/cti/ns/stix"/>
-	</owl:Ontology>
-	
-	<owl:Class rdf:about="&attack;DataComponent">
-	</owl:Class>
-	
-	<owl:Class rdf:about="&attack;DataSource">
-	</owl:Class>
-	
-	<owl:Class rdf:about="&attack;Matrix">
-	</owl:Class>
-	
-	<owl:Class rdf:about="&attack;Tactic">
-	</owl:Class>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_attack_spec_version">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_collection_layers">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:ObjectProperty rdf:about="&attack;x_mitre_contents">
-		<rdfs:range rdf:resource="http://docs.oasis-open.org/cti/ns/stix#StixObject"/>
-	</owl:ObjectProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_contributors">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_data_sources">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_defense_bypassed">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_deprecated">
-		<rdfs:range rdf:resource="&xsd;boolean"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_detection">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_domains">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_effective_permissions">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_impact_type">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_is_subtechnique">
-		<rdfs:range rdf:resource="&xsd;boolean"/>
-	</owl:DatatypeProperty>
-	
-	<owl:ObjectProperty rdf:about="&attack;x_mitre_modified_by_ref">
-	</owl:ObjectProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_network_requirements">
-		<rdfs:range rdf:resource="&xsd;boolean"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_permissions_required">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_platforms">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_remote_support">
-		<rdfs:range rdf:resource="&xsd;boolean"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_shortname">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_system_requirements">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-	
-	<owl:DatatypeProperty rdf:about="&attack;x_mitre_version">
-		<rdfs:range rdf:resource="&xsd;string"/>
-	</owl:DatatypeProperty>
-
-</rdf:RDF>
\ No newline at end of file
diff --git a/open-concepts/open-concepts.owl b/open-concepts/open-concepts.owl
deleted file mode 100644
index 970b8fd..0000000
--- a/open-concepts/open-concepts.owl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE rdf:RDF [
-	<!ENTITY owl "http://www.w3.org/2002/07/owl#">
-	<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-	<!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#">
-	<!ENTITY stix "http://docs.oasis-open.org/cti/ns/stix#">
-	<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-]>
-<rdf:RDF xml:base="http://docs.oasis-open.org/cti/ns/open-concepts"
-	xmlns="http://docs.oasis-open.org/cti/ns/open-concepts#"
-	xmlns:owl="http://www.w3.org/2002/07/owl#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:stix="http://docs.oasis-open.org/cti/ns/stix#"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-	
-	<owl:Ontology rdf:about="http://docs.oasis-open.org/cti/ns/open-concepts">
-		<rdfs:comment xml:lang="en-us">Concepts that will be publicly available, meaning their inclusion in the official GitHub repository of the TAC ontology but have not been developed or encoded by the TAC TC, are called Open. The namespaces of concepts that follow the Open model are not incorporated into the main tac.owl file and thus are not part of the core ontology but users of the TAC ontology can do the imports manually.</rdfs:comment>
-	</owl:Ontology>
-
-</rdf:RDF>
\ No newline at end of file
diff --git a/open-concepts/security-playbook/.DS_Store b/open-concepts/security-playbook/.DS_Store
deleted file mode 100644
index 733d817..0000000
Binary files a/open-concepts/security-playbook/.DS_Store and /dev/null differ
diff --git a/open-concepts/security-playbook/security-playbook.owl b/security-playbook/security-playbook.owl
similarity index 100%
rename from open-concepts/security-playbook/security-playbook.owl
rename to security-playbook/security-playbook.owl
diff --git a/open-concepts/threat-agent-lib/catalog-v001.xml b/threat-agent-lib/catalog-v001.xml
similarity index 98%
rename from open-concepts/threat-agent-lib/catalog-v001.xml
rename to threat-agent-lib/catalog-v001.xml
index ea8627e..43ea2cd 100644
--- a/open-concepts/threat-agent-lib/catalog-v001.xml
+++ b/threat-agent-lib/catalog-v001.xml
@@ -57,7 +57,7 @@
     <uri id="User Entered Import Resolution" name="http://docs.oasis-open.org/cti/ns/data-marking" uri="file:/Users/mateusdz/Desktop/TAC/cyentific/tac-ontology/stix/meta-objects/data-marking/data-marking.owl"/>
     <uri id="User Entered Import Resolution" name="http://docs.oasis-open.org/cti/ns/stix" uri="file:/Users/mateusdz/Desktop/TAC/cyentific/tac-ontology/stix/stix.owl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
-        <uri id="Automatically generated entry, Timestamp=1672251883702" name="http://hohimer.net/tal-kb-example" uri="tal-kb-example.owl"/>
-        <uri id="Automatically generated entry, Timestamp=1672251883702" name="http://www.intel.com/ns/ta-library" uri="ta-library.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1672254302284" name="http://hohimer.net/tal-kb-example" uri="tal-kb-example.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1672254302284" name="http://www.intel.com/ns/ta-library" uri="ta-library.owl"/>
     </group>
 </catalog>
diff --git a/open-concepts/threat-agent-lib/ta-library.owl b/threat-agent-lib/ta-library.owl
similarity index 100%
rename from open-concepts/threat-agent-lib/ta-library.owl
rename to threat-agent-lib/ta-library.owl
diff --git a/open-concepts/threat-agent-lib/tal-kb-example.owl b/threat-agent-lib/tal-kb-example.owl
similarity index 100%
rename from open-concepts/threat-agent-lib/tal-kb-example.owl
rename to threat-agent-lib/tal-kb-example.owl
diff --git a/open-concepts/threat-agent-lib/tal-kb-example.properties b/threat-agent-lib/tal-kb-example.properties
similarity index 100%
rename from open-concepts/threat-agent-lib/tal-kb-example.properties
rename to threat-agent-lib/tal-kb-example.properties