diff --git a/elements/adversary-groups.json b/clusters/adversary-groups.json
similarity index 100%
rename from elements/adversary-groups.json
rename to clusters/adversary-groups.json
diff --git a/elements/threat-actor-tools.json b/clusters/tools.json
similarity index 100%
rename from elements/threat-actor-tools.json
rename to clusters/tools.json
diff --git a/cluster/threat-actor.json b/galaxies/threat-actor.json
similarity index 100%
rename from cluster/threat-actor.json
rename to galaxies/threat-actor.json
diff --git a/elements/certainty-level.json b/vocabularies/common/certainty-level.json
similarity index 100%
rename from elements/certainty-level.json
rename to vocabularies/common/certainty-level.json
diff --git a/elements/threat-actor-intended-effect-vocabulary.json b/vocabularies/threat-actor/intended-effect.json
similarity index 100%
rename from elements/threat-actor-intended-effect-vocabulary.json
rename to vocabularies/threat-actor/intended-effect.json
diff --git a/elements/threat-actor-motivation-vocabulary.json b/vocabularies/threat-actor/motivation.json
similarity index 100%
rename from elements/threat-actor-motivation-vocabulary.json
rename to vocabularies/threat-actor/motivation.json
diff --git a/elements/planning-and-operational-support-vocabulary.json b/vocabularies/threat-actor/planning-and-operational-support.json
similarity index 100%
rename from elements/planning-and-operational-support-vocabulary.json
rename to vocabularies/threat-actor/planning-and-operational-support.json
diff --git a/elements/threat-actor-sophistication-vocabulary.json b/vocabularies/threat-actor/sophistication.json
similarity index 100%
rename from elements/threat-actor-sophistication-vocabulary.json
rename to vocabularies/threat-actor/sophistication.json
diff --git a/elements/threat-actor-type-vocabulary.json b/vocabularies/threat-actor/type.json
similarity index 100%
rename from elements/threat-actor-type-vocabulary.json
rename to vocabularies/threat-actor/type.json