diff --git a/pre-sub-techniques/20190319-RedCanary.yaml b/ threat-actor-data/pre-sub-techniques/20190319-RedCanary.yaml
similarity index 100%
rename from pre-sub-techniques/20190319-RedCanary.yaml
rename to  threat-actor-data/pre-sub-techniques/20190319-RedCanary.yaml
diff --git a/pre-sub-techniques/20190528-Rapid7.yaml b/ threat-actor-data/pre-sub-techniques/20190528-Rapid7.yaml
similarity index 100%
rename from pre-sub-techniques/20190528-Rapid7.yaml
rename to  threat-actor-data/pre-sub-techniques/20190528-Rapid7.yaml
diff --git a/pre-sub-techniques/20190829-Kaspersky.yaml b/ threat-actor-data/pre-sub-techniques/20190829-Kaspersky.yaml
similarity index 100%
rename from pre-sub-techniques/20190829-Kaspersky.yaml
rename to  threat-actor-data/pre-sub-techniques/20190829-Kaspersky.yaml
diff --git a/pre-sub-techniques/20190902-ATTACK-Techniques-and-trends-in-Windows-malware.yaml b/ threat-actor-data/pre-sub-techniques/20190902-ATTACK-Techniques-and-trends-in-Windows-malware.yaml
similarity index 100%
rename from pre-sub-techniques/20190902-ATTACK-Techniques-and-trends-in-Windows-malware.yaml
rename to  threat-actor-data/pre-sub-techniques/20190902-ATTACK-Techniques-and-trends-in-Windows-malware.yaml
diff --git a/pre-sub-techniques/20191001-CrowdStrike-software.md b/ threat-actor-data/pre-sub-techniques/20191001-CrowdStrike-software.md
similarity index 100%
rename from pre-sub-techniques/20191001-CrowdStrike-software.md
rename to  threat-actor-data/pre-sub-techniques/20191001-CrowdStrike-software.md
diff --git a/pre-sub-techniques/20191001-CrowdStrike.yaml b/ threat-actor-data/pre-sub-techniques/20191001-CrowdStrike.yaml
similarity index 100%
rename from pre-sub-techniques/20191001-CrowdStrike.yaml
rename to  threat-actor-data/pre-sub-techniques/20191001-CrowdStrike.yaml
diff --git a/pre-sub-techniques/20191126-RedCanary-retail-sector.yaml b/ threat-actor-data/pre-sub-techniques/20191126-RedCanary-retail-sector.yaml
similarity index 100%
rename from pre-sub-techniques/20191126-RedCanary-retail-sector.yaml
rename to  threat-actor-data/pre-sub-techniques/20191126-RedCanary-retail-sector.yaml
diff --git a/pre-sub-techniques/20200220-FireEye.yaml b/ threat-actor-data/pre-sub-techniques/20200220-FireEye.yaml
similarity index 100%
rename from pre-sub-techniques/20200220-FireEye.yaml
rename to  threat-actor-data/pre-sub-techniques/20200220-FireEye.yaml
diff --git a/pre-sub-techniques/20200306-CrowdStrike.yaml b/ threat-actor-data/pre-sub-techniques/20200306-CrowdStrike.yaml
similarity index 100%
rename from pre-sub-techniques/20200306-CrowdStrike.yaml
rename to  threat-actor-data/pre-sub-techniques/20200306-CrowdStrike.yaml
diff --git a/pre-sub-techniques/20200318-RedCanary.yaml b/ threat-actor-data/pre-sub-techniques/20200318-RedCanary.yaml
similarity index 100%
rename from pre-sub-techniques/20200318-RedCanary.yaml
rename to  threat-actor-data/pre-sub-techniques/20200318-RedCanary.yaml
diff --git a/pre-sub-techniques/20200331-RecordedFuture.yaml b/ threat-actor-data/pre-sub-techniques/20200331-RecordedFuture.yaml
similarity index 100%
rename from pre-sub-techniques/20200331-RecordedFuture.yaml
rename to  threat-actor-data/pre-sub-techniques/20200331-RecordedFuture.yaml
diff --git a/pre-sub-techniques/20200520-ACSC.yaml b/ threat-actor-data/pre-sub-techniques/20200520-ACSC.yaml
similarity index 100%
rename from pre-sub-techniques/20200520-ACSC.yaml
rename to  threat-actor-data/pre-sub-techniques/20200520-ACSC.yaml
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - communication.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - communication.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - communication.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - communication.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - education.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - education.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - education.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - education.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - energy.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - energy.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - energy.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - energy.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - financials.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - financials.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - financials.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - financials.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - government.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - government.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - government.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - government.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - health.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - health.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - health.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - health.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - hospitality.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - hospitality.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - hospitality.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - hospitality.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - industrial.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - industrial.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - industrial.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - industrial.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - media.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - media.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - media.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - media.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - nonprofit.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - nonprofit.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - nonprofit.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - nonprofit.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - overall.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - overall.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - overall.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - overall.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - pharmaceuticals.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - pharmaceuticals.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - pharmaceuticals.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - pharmaceuticals.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - retail.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - retail.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - retail.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - retail.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - services.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - services.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - services.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - services.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - technology.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - technology.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - technology.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - technology.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - transportation.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - transportation.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - transportation.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190319-RedCanary/attack_windows-linux-macos_Red Canary Threat Detection Report 2019 (1st edition) - transportation.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-enterprise.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-enterprise.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-enterprise.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-enterprise.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-mobile.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-mobile.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-mobile.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190528-Rapid7/Rapid7 Quarterly Threat Report Q1 2019-mobile.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190829-Kaspersky/Kaspersky Incident Response report 2018.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190829-Kaspersky/Kaspersky Incident Response report 2018.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190829-Kaspersky/Kaspersky Incident Response report 2018.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190829-Kaspersky/Kaspersky Incident Response report 2018.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20190902-ATTACK-Techniques-and-trends-in-Windows-malware/ATTACK-Techniques-and-Trends-in-Windows-malware.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190902-ATTACK-Techniques-and-trends-in-Windows-malware/ATTACK-Techniques-and-Trends-in-Windows-malware.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20190902-ATTACK-Techniques-and-trends-in-Windows-malware/ATTACK-Techniques-and-Trends-in-Windows-malware.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20190902-ATTACK-Techniques-and-trends-in-Windows-malware/ATTACK-Techniques-and-Trends-in-Windows-malware.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(heat-map-first-half-of-2019).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(heat-map-first-half-of-2019).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(heat-map-first-half-of-2019).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(heat-map-first-half-of-2019).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018-and-first-half-of-2019).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018-and-first-half-of-2019).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018-and-first-half-of-2019).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-2018-and-first-half-of-2019).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-first-half-of-2019).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-first-half-of-2019).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-first-half-of-2019).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191001-CrowdStrike/attack_windows-linux-macos_crowdstrike-overwatch-2019-mid-year-report-(seen-in-first-half-of-2019).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20191126-RedCanary/attack_windows_top-10-techniques-red-canary-detected-against-the-retail-sector-in-2019.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191126-RedCanary/attack_windows_top-10-techniques-red-canary-detected-against-the-retail-sector-in-2019.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20191126-RedCanary/attack_windows_top-10-techniques-red-canary-detected-against-the-retail-sector-in-2019.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20191126-RedCanary/attack_windows_top-10-techniques-red-canary-detected-against-the-retail-sector-in-2019.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200220-FireEye/attack_all_fireeye-m-trends-2020.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200220-FireEye/attack_all_fireeye-m-trends-2020.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200220-FireEye/attack_all_fireeye-m-trends-2020.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200220-FireEye/attack_all_fireeye-m-trends-2020.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200306-CrowdStrike/attack_windows-linux-macos_crowdstrike-global-threat-report-2020.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200306-CrowdStrike/attack_windows-linux-macos_crowdstrike-global-threat-report-2020.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200306-CrowdStrike/attack_windows-linux-macos_crowdstrike-global-threat-report-2020.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200306-CrowdStrike/attack_windows-linux-macos_crowdstrike-global-threat-report-2020.json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(education).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(education).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(education).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(education).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(energy).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(energy).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(energy).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(energy).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(finance).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(finance).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(finance).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(finance).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(healthcare).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(healthcare).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(healthcare).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(healthcare).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(manufacturing).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(manufacturing).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(manufacturing).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(manufacturing).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(overall).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(overall).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(overall).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(overall).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(retail).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(retail).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(retail).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(retail).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(services).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(services).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(services).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(services).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(technology).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(technology).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(technology).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(technology).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(transportation).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(transportation).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(transportation).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200318-RedCanary/attack_windows-linux-macos_red-canary-threat-detection-report-2020-(transportation).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200331-RecordedFuture/attack_windows-linux-macos_recorded-future-ttp-annual-report-2019-(top-10).json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200331-RecordedFuture/attack_windows-linux-macos_recorded-future-ttp-annual-report-2019-(top-10).json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200331-RecordedFuture/attack_windows-linux-macos_recorded-future-ttp-annual-report-2019-(top-10).json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200331-RecordedFuture/attack_windows-linux-macos_recorded-future-ttp-annual-report-2019-(top-10).json
diff --git a/pre-sub-techniques/ATT&CK-Navigator-layers/20200520-ACSC/attack_all_summary-of-tradecraft-trends-for-2019-2020-ttps-used-to-target-australian-networks.json b/ threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200520-ACSC/attack_all_summary-of-tradecraft-trends-for-2019-2020-ttps-used-to-target-australian-networks.json
similarity index 100%
rename from pre-sub-techniques/ATT&CK-Navigator-layers/20200520-ACSC/attack_all_summary-of-tradecraft-trends-for-2019-2020-ttps-used-to-target-australian-networks.json
rename to  threat-actor-data/pre-sub-techniques/ATT&CK-Navigator-layers/20200520-ACSC/attack_all_summary-of-tradecraft-trends-for-2019-2020-ttps-used-to-target-australian-networks.json