diff --git a/cluster/threat-actor.json b/cluster/threat-actor.json deleted file mode 100644 index c944a04..0000000 --- a/cluster/threat-actor.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name" : "threat actor", - "description": "threat actor cluster", - "version": 1, - "uuid": "698774c7-8022-42c4-917f-8d6e4f06ada3", - "elementOneOf": ["adversary-groups", "threat-actor-intended-effect-vocabulary", "planning-and-operational-support-vocabulary", "threat-actor-motivation-vocabulary", "threat-actor-type-vocabulary", "threat-actor-sophistication-vocabulary", "certainty-level", "threat-actor-tools"] -} diff --git a/elements/adversary-groups.json b/clusters/threat-actors.json similarity index 99% rename from elements/adversary-groups.json rename to clusters/threat-actors.json index d82d587..11256c6 100644 --- a/elements/adversary-groups.json +++ b/clusters/threat-actors.json @@ -9,7 +9,7 @@ "Timo Steffens", "Various" ], - "type": "Adversary Groups", + "type": "threat-actors", "groups": [ "Operation C-Major", "Comment Crew", 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/galaxies/threat-actor.json b/galaxies/threat-actor.json new file mode 100644 index 0000000..454d41d --- /dev/null +++ b/galaxies/threat-actor.json @@ -0,0 +1,6 @@ +{ + "name" : "threat-actor", + "description": "Threat actors are characteristics of malicious actors (or adversaries) representing a cyber attack threat including presumed intent and historically observed behaviour.", + "version": 1, + "uuid": "698774c7-8022-42c4-917f-8d6e4f06ada3" +} 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