diff --git a/data/v2-pre/battlesuit-catalog.yaml b/data/v2/battlesuit-catalog.yaml
similarity index 100%
rename from data/v2-pre/battlesuit-catalog.yaml
rename to data/v2/battlesuit-catalog.yaml
diff --git a/data/v2-pre/battlesuits/101.yaml b/data/v2/battlesuits/101.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/101.yaml
rename to data/v2/battlesuits/101.yaml
diff --git a/data/v2-pre/battlesuits/102.yaml b/data/v2/battlesuits/102.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/102.yaml
rename to data/v2/battlesuits/102.yaml
diff --git a/data/v2-pre/battlesuits/103.yaml b/data/v2/battlesuits/103.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/103.yaml
rename to data/v2/battlesuits/103.yaml
diff --git a/data/v2-pre/battlesuits/104.yaml b/data/v2/battlesuits/104.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/104.yaml
rename to data/v2/battlesuits/104.yaml
diff --git a/data/v2-pre/battlesuits/105.yaml b/data/v2/battlesuits/105.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/105.yaml
rename to data/v2/battlesuits/105.yaml
diff --git a/data/v2-pre/battlesuits/106.yaml b/data/v2/battlesuits/106.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/106.yaml
rename to data/v2/battlesuits/106.yaml
diff --git a/data/v2-pre/battlesuits/111.yaml b/data/v2/battlesuits/111.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/111.yaml
rename to data/v2/battlesuits/111.yaml
diff --git a/data/v2-pre/battlesuits/112.yaml b/data/v2/battlesuits/112.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/112.yaml
rename to data/v2/battlesuits/112.yaml
diff --git a/data/v2-pre/battlesuits/113.yaml b/data/v2/battlesuits/113.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/113.yaml
rename to data/v2/battlesuits/113.yaml
diff --git a/data/v2-pre/battlesuits/114.yaml b/data/v2/battlesuits/114.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/114.yaml
rename to data/v2/battlesuits/114.yaml
diff --git a/data/v2-pre/battlesuits/1203.yaml b/data/v2/battlesuits/1203.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/1203.yaml
rename to data/v2/battlesuits/1203.yaml
diff --git a/data/v2-pre/battlesuits/1304.yaml b/data/v2/battlesuits/1304.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/1304.yaml
rename to data/v2/battlesuits/1304.yaml
diff --git a/data/v2-pre/battlesuits/1411.yaml b/data/v2/battlesuits/1411.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/1411.yaml
rename to data/v2/battlesuits/1411.yaml
diff --git a/data/v2-pre/battlesuits/2001.yaml b/data/v2/battlesuits/2001.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2001.yaml
rename to data/v2/battlesuits/2001.yaml
diff --git a/data/v2-pre/battlesuits/201.yaml b/data/v2/battlesuits/201.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/201.yaml
rename to data/v2/battlesuits/201.yaml
diff --git a/data/v2-pre/battlesuits/202.yaml b/data/v2/battlesuits/202.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/202.yaml
rename to data/v2/battlesuits/202.yaml
diff --git a/data/v2-pre/battlesuits/203.yaml b/data/v2/battlesuits/203.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/203.yaml
rename to data/v2/battlesuits/203.yaml
diff --git a/data/v2-pre/battlesuits/204.yaml b/data/v2/battlesuits/204.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/204.yaml
rename to data/v2/battlesuits/204.yaml
diff --git a/data/v2-pre/battlesuits/205.yaml b/data/v2/battlesuits/205.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/205.yaml
rename to data/v2/battlesuits/205.yaml
diff --git a/data/v2-pre/battlesuits/206.yaml b/data/v2/battlesuits/206.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/206.yaml
rename to data/v2/battlesuits/206.yaml
diff --git a/data/v2-pre/battlesuits/2101.yaml b/data/v2/battlesuits/2101.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2101.yaml
rename to data/v2/battlesuits/2101.yaml
diff --git a/data/v2-pre/battlesuits/211.yaml b/data/v2/battlesuits/211.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/211.yaml
rename to data/v2/battlesuits/211.yaml
diff --git a/data/v2-pre/battlesuits/212.yaml b/data/v2/battlesuits/212.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/212.yaml
rename to data/v2/battlesuits/212.yaml
diff --git a/data/v2-pre/battlesuits/213.yaml b/data/v2/battlesuits/213.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/213.yaml
rename to data/v2/battlesuits/213.yaml
diff --git a/data/v2-pre/battlesuits/214.yaml b/data/v2/battlesuits/214.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/214.yaml
rename to data/v2/battlesuits/214.yaml
diff --git a/data/v2-pre/battlesuits/2201.yaml b/data/v2/battlesuits/2201.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2201.yaml
rename to data/v2/battlesuits/2201.yaml
diff --git a/data/v2-pre/battlesuits/2202.yaml b/data/v2/battlesuits/2202.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2202.yaml
rename to data/v2/battlesuits/2202.yaml
diff --git a/data/v2-pre/battlesuits/2301.yaml b/data/v2/battlesuits/2301.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2301.yaml
rename to data/v2/battlesuits/2301.yaml
diff --git a/data/v2-pre/battlesuits/2401.yaml b/data/v2/battlesuits/2401.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2401.yaml
rename to data/v2/battlesuits/2401.yaml
diff --git a/data/v2-pre/battlesuits/2501.yaml b/data/v2/battlesuits/2501.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2501.yaml
rename to data/v2/battlesuits/2501.yaml
diff --git a/data/v2-pre/battlesuits/2601.yaml b/data/v2/battlesuits/2601.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2601.yaml
rename to data/v2/battlesuits/2601.yaml
diff --git a/data/v2-pre/battlesuits/2701.yaml b/data/v2/battlesuits/2701.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2701.yaml
rename to data/v2/battlesuits/2701.yaml
diff --git a/data/v2-pre/battlesuits/2801.yaml b/data/v2/battlesuits/2801.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2801.yaml
rename to data/v2/battlesuits/2801.yaml
diff --git a/data/v2-pre/battlesuits/2901.yaml b/data/v2/battlesuits/2901.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/2901.yaml
rename to data/v2/battlesuits/2901.yaml
diff --git a/data/v2-pre/battlesuits/3001.yaml b/data/v2/battlesuits/3001.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/3001.yaml
rename to data/v2/battlesuits/3001.yaml
diff --git a/data/v2-pre/battlesuits/301.yaml b/data/v2/battlesuits/301.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/301.yaml
rename to data/v2/battlesuits/301.yaml
diff --git a/data/v2-pre/battlesuits/302.yaml b/data/v2/battlesuits/302.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/302.yaml
rename to data/v2/battlesuits/302.yaml
diff --git a/data/v2-pre/battlesuits/303.yaml b/data/v2/battlesuits/303.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/303.yaml
rename to data/v2/battlesuits/303.yaml
diff --git a/data/v2-pre/battlesuits/304.yaml b/data/v2/battlesuits/304.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/304.yaml
rename to data/v2/battlesuits/304.yaml
diff --git a/data/v2-pre/battlesuits/3101.yaml b/data/v2/battlesuits/3101.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/3101.yaml
rename to data/v2/battlesuits/3101.yaml
diff --git a/data/v2-pre/battlesuits/311.yaml b/data/v2/battlesuits/311.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/311.yaml
rename to data/v2/battlesuits/311.yaml
diff --git a/data/v2-pre/battlesuits/312.yaml b/data/v2/battlesuits/312.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/312.yaml
rename to data/v2/battlesuits/312.yaml
diff --git a/data/v2-pre/battlesuits/313.yaml b/data/v2/battlesuits/313.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/313.yaml
rename to data/v2/battlesuits/313.yaml
diff --git a/data/v2-pre/battlesuits/314.yaml b/data/v2/battlesuits/314.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/314.yaml
rename to data/v2/battlesuits/314.yaml
diff --git a/data/v2-pre/battlesuits/315.yaml b/data/v2/battlesuits/315.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/315.yaml
rename to data/v2/battlesuits/315.yaml
diff --git a/data/v2-pre/battlesuits/316.yaml b/data/v2/battlesuits/316.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/316.yaml
rename to data/v2/battlesuits/316.yaml
diff --git a/data/v2-pre/battlesuits/317.yaml b/data/v2/battlesuits/317.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/317.yaml
rename to data/v2/battlesuits/317.yaml
diff --git a/data/v2-pre/battlesuits/3201.yaml b/data/v2/battlesuits/3201.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/3201.yaml
rename to data/v2/battlesuits/3201.yaml
diff --git a/data/v2-pre/battlesuits/3301.yaml b/data/v2/battlesuits/3301.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/3301.yaml
rename to data/v2/battlesuits/3301.yaml
diff --git a/data/v2-pre/battlesuits/3401.yaml b/data/v2/battlesuits/3401.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/3401.yaml
rename to data/v2/battlesuits/3401.yaml
diff --git a/data/v2-pre/battlesuits/3501.yaml b/data/v2/battlesuits/3501.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/3501.yaml
rename to data/v2/battlesuits/3501.yaml
diff --git a/data/v2-pre/battlesuits/3601.yaml b/data/v2/battlesuits/3601.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/3601.yaml
rename to data/v2/battlesuits/3601.yaml
diff --git a/data/v2-pre/battlesuits/401.yaml b/data/v2/battlesuits/401.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/401.yaml
rename to data/v2/battlesuits/401.yaml
diff --git a/data/v2-pre/battlesuits/402.yaml b/data/v2/battlesuits/402.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/402.yaml
rename to data/v2/battlesuits/402.yaml
diff --git a/data/v2-pre/battlesuits/403.yaml b/data/v2/battlesuits/403.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/403.yaml
rename to data/v2/battlesuits/403.yaml
diff --git a/data/v2-pre/battlesuits/404.yaml b/data/v2/battlesuits/404.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/404.yaml
rename to data/v2/battlesuits/404.yaml
diff --git a/data/v2-pre/battlesuits/411.yaml b/data/v2/battlesuits/411.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/411.yaml
rename to data/v2/battlesuits/411.yaml
diff --git a/data/v2-pre/battlesuits/412.yaml b/data/v2/battlesuits/412.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/412.yaml
rename to data/v2/battlesuits/412.yaml
diff --git a/data/v2-pre/battlesuits/421.yaml b/data/v2/battlesuits/421.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/421.yaml
rename to data/v2/battlesuits/421.yaml
diff --git a/data/v2-pre/battlesuits/422.yaml b/data/v2/battlesuits/422.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/422.yaml
rename to data/v2/battlesuits/422.yaml
diff --git a/data/v2-pre/battlesuits/501.yaml b/data/v2/battlesuits/501.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/501.yaml
rename to data/v2/battlesuits/501.yaml
diff --git a/data/v2-pre/battlesuits/502.yaml b/data/v2/battlesuits/502.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/502.yaml
rename to data/v2/battlesuits/502.yaml
diff --git a/data/v2-pre/battlesuits/503.yaml b/data/v2/battlesuits/503.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/503.yaml
rename to data/v2/battlesuits/503.yaml
diff --git a/data/v2-pre/battlesuits/504.yaml b/data/v2/battlesuits/504.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/504.yaml
rename to data/v2/battlesuits/504.yaml
diff --git a/data/v2-pre/battlesuits/506.yaml b/data/v2/battlesuits/506.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/506.yaml
rename to data/v2/battlesuits/506.yaml
diff --git a/data/v2-pre/battlesuits/511.yaml b/data/v2/battlesuits/511.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/511.yaml
rename to data/v2/battlesuits/511.yaml
diff --git a/data/v2-pre/battlesuits/601.yaml b/data/v2/battlesuits/601.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/601.yaml
rename to data/v2/battlesuits/601.yaml
diff --git a/data/v2-pre/battlesuits/602.yaml b/data/v2/battlesuits/602.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/602.yaml
rename to data/v2/battlesuits/602.yaml
diff --git a/data/v2-pre/battlesuits/603.yaml b/data/v2/battlesuits/603.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/603.yaml
rename to data/v2/battlesuits/603.yaml
diff --git a/data/v2-pre/battlesuits/604.yaml b/data/v2/battlesuits/604.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/604.yaml
rename to data/v2/battlesuits/604.yaml
diff --git a/data/v2-pre/battlesuits/611.yaml b/data/v2/battlesuits/611.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/611.yaml
rename to data/v2/battlesuits/611.yaml
diff --git a/data/v2-pre/battlesuits/612.yaml b/data/v2/battlesuits/612.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/612.yaml
rename to data/v2/battlesuits/612.yaml
diff --git a/data/v2-pre/battlesuits/702.yaml b/data/v2/battlesuits/702.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/702.yaml
rename to data/v2/battlesuits/702.yaml
diff --git a/data/v2-pre/battlesuits/703.yaml b/data/v2/battlesuits/703.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/703.yaml
rename to data/v2/battlesuits/703.yaml
diff --git a/data/v2-pre/battlesuits/704.yaml b/data/v2/battlesuits/704.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/704.yaml
rename to data/v2/battlesuits/704.yaml
diff --git a/data/v2-pre/battlesuits/705.yaml b/data/v2/battlesuits/705.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/705.yaml
rename to data/v2/battlesuits/705.yaml
diff --git a/data/v2-pre/battlesuits/706.yaml b/data/v2/battlesuits/706.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/706.yaml
rename to data/v2/battlesuits/706.yaml
diff --git a/data/v2-pre/battlesuits/711.yaml b/data/v2/battlesuits/711.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/711.yaml
rename to data/v2/battlesuits/711.yaml
diff --git a/data/v2-pre/battlesuits/712.yaml b/data/v2/battlesuits/712.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/712.yaml
rename to data/v2/battlesuits/712.yaml
diff --git a/data/v2-pre/battlesuits/713.yaml b/data/v2/battlesuits/713.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/713.yaml
rename to data/v2/battlesuits/713.yaml
diff --git a/data/v2-pre/battlesuits/801.yaml b/data/v2/battlesuits/801.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/801.yaml
rename to data/v2/battlesuits/801.yaml
diff --git a/data/v2-pre/battlesuits/802.yaml b/data/v2/battlesuits/802.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/802.yaml
rename to data/v2/battlesuits/802.yaml
diff --git a/data/v2-pre/battlesuits/803.yaml b/data/v2/battlesuits/803.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/803.yaml
rename to data/v2/battlesuits/803.yaml
diff --git a/data/v2-pre/battlesuits/804.yaml b/data/v2/battlesuits/804.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/804.yaml
rename to data/v2/battlesuits/804.yaml
diff --git a/data/v2-pre/battlesuits/805.yaml b/data/v2/battlesuits/805.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/805.yaml
rename to data/v2/battlesuits/805.yaml
diff --git a/data/v2-pre/battlesuits/901.yaml b/data/v2/battlesuits/901.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/901.yaml
rename to data/v2/battlesuits/901.yaml
diff --git a/data/v2-pre/battlesuits/9011.yaml b/data/v2/battlesuits/9011.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/9011.yaml
rename to data/v2/battlesuits/9011.yaml
diff --git a/data/v2-pre/battlesuits/9021.yaml b/data/v2/battlesuits/9021.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/9021.yaml
rename to data/v2/battlesuits/9021.yaml
diff --git a/data/v2-pre/battlesuits/9031.yaml b/data/v2/battlesuits/9031.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/9031.yaml
rename to data/v2/battlesuits/9031.yaml
diff --git a/data/v2-pre/battlesuits/9041.yaml b/data/v2/battlesuits/9041.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/9041.yaml
rename to data/v2/battlesuits/9041.yaml
diff --git a/data/v2-pre/battlesuits/9051.yaml b/data/v2/battlesuits/9051.yaml
similarity index 100%
rename from data/v2-pre/battlesuits/9051.yaml
rename to data/v2/battlesuits/9051.yaml
diff --git a/data/v2-pre/elf-catalog.yaml b/data/v2/elf-catalog.yaml
similarity index 100%
rename from data/v2-pre/elf-catalog.yaml
rename to data/v2/elf-catalog.yaml
diff --git a/data/v2-pre/elfs/101.yaml b/data/v2/elfs/101.yaml
similarity index 100%
rename from data/v2-pre/elfs/101.yaml
rename to data/v2/elfs/101.yaml
diff --git a/data/v2-pre/elfs/102.yaml b/data/v2/elfs/102.yaml
similarity index 100%
rename from data/v2-pre/elfs/102.yaml
rename to data/v2/elfs/102.yaml
diff --git a/data/v2-pre/elfs/103.yaml b/data/v2/elfs/103.yaml
similarity index 100%
rename from data/v2-pre/elfs/103.yaml
rename to data/v2/elfs/103.yaml
diff --git a/data/v2-pre/elfs/106.yaml b/data/v2/elfs/106.yaml
similarity index 100%
rename from data/v2-pre/elfs/106.yaml
rename to data/v2/elfs/106.yaml
diff --git a/data/v2-pre/elfs/108.yaml b/data/v2/elfs/108.yaml
similarity index 100%
rename from data/v2-pre/elfs/108.yaml
rename to data/v2/elfs/108.yaml
diff --git a/data/v2-pre/elfs/109.yaml b/data/v2/elfs/109.yaml
similarity index 100%
rename from data/v2-pre/elfs/109.yaml
rename to data/v2/elfs/109.yaml
diff --git a/data/v2-pre/elfs/110.yaml b/data/v2/elfs/110.yaml
similarity index 100%
rename from data/v2-pre/elfs/110.yaml
rename to data/v2/elfs/110.yaml
diff --git a/data/v2-pre/elfs/111.yaml b/data/v2/elfs/111.yaml
similarity index 100%
rename from data/v2-pre/elfs/111.yaml
rename to data/v2/elfs/111.yaml
diff --git a/data/v2-pre/elfs/112.yaml b/data/v2/elfs/112.yaml
similarity index 100%
rename from data/v2-pre/elfs/112.yaml
rename to data/v2/elfs/112.yaml
diff --git a/data/v2-pre/elfs/113.yaml b/data/v2/elfs/113.yaml
similarity index 100%
rename from data/v2-pre/elfs/113.yaml
rename to data/v2/elfs/113.yaml
diff --git a/data/v2-pre/elfs/114.yaml b/data/v2/elfs/114.yaml
similarity index 100%
rename from data/v2-pre/elfs/114.yaml
rename to data/v2/elfs/114.yaml
diff --git a/data/v2-pre/elfs/115.yaml b/data/v2/elfs/115.yaml
similarity index 100%
rename from data/v2-pre/elfs/115.yaml
rename to data/v2/elfs/115.yaml
diff --git a/data/v2-pre/er-battlesuits-catalog.yaml b/data/v2/er-battlesuits-catalog.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits-catalog.yaml
rename to data/v2/er-battlesuits-catalog.yaml
diff --git a/data/v2-pre/er-battlesuits/105.yaml b/data/v2/er-battlesuits/105.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/105.yaml
rename to data/v2/er-battlesuits/105.yaml
diff --git a/data/v2-pre/er-battlesuits/106.yaml b/data/v2/er-battlesuits/106.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/106.yaml
rename to data/v2/er-battlesuits/106.yaml
diff --git a/data/v2-pre/er-battlesuits/111.yaml b/data/v2/er-battlesuits/111.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/111.yaml
rename to data/v2/er-battlesuits/111.yaml
diff --git a/data/v2-pre/er-battlesuits/112.yaml b/data/v2/er-battlesuits/112.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/112.yaml
rename to data/v2/er-battlesuits/112.yaml
diff --git a/data/v2-pre/er-battlesuits/113.yaml b/data/v2/er-battlesuits/113.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/113.yaml
rename to data/v2/er-battlesuits/113.yaml
diff --git a/data/v2-pre/er-battlesuits/203.yaml b/data/v2/er-battlesuits/203.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/203.yaml
rename to data/v2/er-battlesuits/203.yaml
diff --git a/data/v2-pre/er-battlesuits/205.yaml b/data/v2/er-battlesuits/205.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/205.yaml
rename to data/v2/er-battlesuits/205.yaml
diff --git a/data/v2-pre/er-battlesuits/206.yaml b/data/v2/er-battlesuits/206.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/206.yaml
rename to data/v2/er-battlesuits/206.yaml
diff --git a/data/v2-pre/er-battlesuits/2101.yaml b/data/v2/er-battlesuits/2101.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2101.yaml
rename to data/v2/er-battlesuits/2101.yaml
diff --git a/data/v2-pre/er-battlesuits/212.yaml b/data/v2/er-battlesuits/212.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/212.yaml
rename to data/v2/er-battlesuits/212.yaml
diff --git a/data/v2-pre/er-battlesuits/2201.yaml b/data/v2/er-battlesuits/2201.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2201.yaml
rename to data/v2/er-battlesuits/2201.yaml
diff --git a/data/v2-pre/er-battlesuits/2202.yaml b/data/v2/er-battlesuits/2202.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2202.yaml
rename to data/v2/er-battlesuits/2202.yaml
diff --git a/data/v2-pre/er-battlesuits/2301.yaml b/data/v2/er-battlesuits/2301.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2301.yaml
rename to data/v2/er-battlesuits/2301.yaml
diff --git a/data/v2-pre/er-battlesuits/2401.yaml b/data/v2/er-battlesuits/2401.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2401.yaml
rename to data/v2/er-battlesuits/2401.yaml
diff --git a/data/v2-pre/er-battlesuits/2501.yaml b/data/v2/er-battlesuits/2501.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2501.yaml
rename to data/v2/er-battlesuits/2501.yaml
diff --git a/data/v2-pre/er-battlesuits/2601.yaml b/data/v2/er-battlesuits/2601.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2601.yaml
rename to data/v2/er-battlesuits/2601.yaml
diff --git a/data/v2-pre/er-battlesuits/2701.yaml b/data/v2/er-battlesuits/2701.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2701.yaml
rename to data/v2/er-battlesuits/2701.yaml
diff --git a/data/v2-pre/er-battlesuits/2801.yaml b/data/v2/er-battlesuits/2801.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2801.yaml
rename to data/v2/er-battlesuits/2801.yaml
diff --git a/data/v2-pre/er-battlesuits/2901.yaml b/data/v2/er-battlesuits/2901.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/2901.yaml
rename to data/v2/er-battlesuits/2901.yaml
diff --git a/data/v2-pre/er-battlesuits/3001.yaml b/data/v2/er-battlesuits/3001.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/3001.yaml
rename to data/v2/er-battlesuits/3001.yaml
diff --git a/data/v2-pre/er-battlesuits/3101.yaml b/data/v2/er-battlesuits/3101.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/3101.yaml
rename to data/v2/er-battlesuits/3101.yaml
diff --git a/data/v2-pre/er-battlesuits/313.yaml b/data/v2/er-battlesuits/313.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/313.yaml
rename to data/v2/er-battlesuits/313.yaml
diff --git a/data/v2-pre/er-battlesuits/315.yaml b/data/v2/er-battlesuits/315.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/315.yaml
rename to data/v2/er-battlesuits/315.yaml
diff --git a/data/v2-pre/er-battlesuits/317.yaml b/data/v2/er-battlesuits/317.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/317.yaml
rename to data/v2/er-battlesuits/317.yaml
diff --git a/data/v2-pre/er-battlesuits/3201.yaml b/data/v2/er-battlesuits/3201.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/3201.yaml
rename to data/v2/er-battlesuits/3201.yaml
diff --git a/data/v2-pre/er-battlesuits/3301.yaml b/data/v2/er-battlesuits/3301.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/3301.yaml
rename to data/v2/er-battlesuits/3301.yaml
diff --git a/data/v2-pre/er-battlesuits/3401.yaml b/data/v2/er-battlesuits/3401.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/3401.yaml
rename to data/v2/er-battlesuits/3401.yaml
diff --git a/data/v2-pre/er-battlesuits/3501.yaml b/data/v2/er-battlesuits/3501.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/3501.yaml
rename to data/v2/er-battlesuits/3501.yaml
diff --git a/data/v2-pre/er-battlesuits/3601.yaml b/data/v2/er-battlesuits/3601.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/3601.yaml
rename to data/v2/er-battlesuits/3601.yaml
diff --git a/data/v2-pre/er-battlesuits/412.yaml b/data/v2/er-battlesuits/412.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/412.yaml
rename to data/v2/er-battlesuits/412.yaml
diff --git a/data/v2-pre/er-battlesuits/422.yaml b/data/v2/er-battlesuits/422.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/422.yaml
rename to data/v2/er-battlesuits/422.yaml
diff --git a/data/v2-pre/er-battlesuits/502.yaml b/data/v2/er-battlesuits/502.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/502.yaml
rename to data/v2/er-battlesuits/502.yaml
diff --git a/data/v2-pre/er-battlesuits/511.yaml b/data/v2/er-battlesuits/511.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/511.yaml
rename to data/v2/er-battlesuits/511.yaml
diff --git a/data/v2-pre/er-battlesuits/602.yaml b/data/v2/er-battlesuits/602.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/602.yaml
rename to data/v2/er-battlesuits/602.yaml
diff --git a/data/v2-pre/er-battlesuits/612.yaml b/data/v2/er-battlesuits/612.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/612.yaml
rename to data/v2/er-battlesuits/612.yaml
diff --git a/data/v2-pre/er-battlesuits/704.yaml b/data/v2/er-battlesuits/704.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/704.yaml
rename to data/v2/er-battlesuits/704.yaml
diff --git a/data/v2-pre/er-battlesuits/705.yaml b/data/v2/er-battlesuits/705.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/705.yaml
rename to data/v2/er-battlesuits/705.yaml
diff --git a/data/v2-pre/er-battlesuits/706.yaml b/data/v2/er-battlesuits/706.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/706.yaml
rename to data/v2/er-battlesuits/706.yaml
diff --git a/data/v2-pre/er-battlesuits/712.yaml b/data/v2/er-battlesuits/712.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/712.yaml
rename to data/v2/er-battlesuits/712.yaml
diff --git a/data/v2-pre/er-battlesuits/713.yaml b/data/v2/er-battlesuits/713.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/713.yaml
rename to data/v2/er-battlesuits/713.yaml
diff --git a/data/v2-pre/er-battlesuits/801.yaml b/data/v2/er-battlesuits/801.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/801.yaml
rename to data/v2/er-battlesuits/801.yaml
diff --git a/data/v2-pre/er-battlesuits/802.yaml b/data/v2/er-battlesuits/802.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/802.yaml
rename to data/v2/er-battlesuits/802.yaml
diff --git a/data/v2-pre/er-battlesuits/803.yaml b/data/v2/er-battlesuits/803.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/803.yaml
rename to data/v2/er-battlesuits/803.yaml
diff --git a/data/v2-pre/er-battlesuits/804.yaml b/data/v2/er-battlesuits/804.yaml
similarity index 100%
rename from data/v2-pre/er-battlesuits/804.yaml
rename to data/v2/er-battlesuits/804.yaml
diff --git a/data/v2-pre/er-sigils.yaml b/data/v2/er-sigils.yaml
similarity index 100%
rename from data/v2-pre/er-sigils.yaml
rename to data/v2/er-sigils.yaml
diff --git a/data/v2-pre/er-signets/1.yaml b/data/v2/er-signets/1.yaml
similarity index 100%
rename from data/v2-pre/er-signets/1.yaml
rename to data/v2/er-signets/1.yaml
diff --git a/data/v2-pre/er-signets/10.yaml b/data/v2/er-signets/10.yaml
similarity index 100%
rename from data/v2-pre/er-signets/10.yaml
rename to data/v2/er-signets/10.yaml
diff --git a/data/v2-pre/er-signets/11.yaml b/data/v2/er-signets/11.yaml
similarity index 100%
rename from data/v2-pre/er-signets/11.yaml
rename to data/v2/er-signets/11.yaml
diff --git a/data/v2-pre/er-signets/12.yaml b/data/v2/er-signets/12.yaml
similarity index 100%
rename from data/v2-pre/er-signets/12.yaml
rename to data/v2/er-signets/12.yaml
diff --git a/data/v2-pre/er-signets/13.yaml b/data/v2/er-signets/13.yaml
similarity index 100%
rename from data/v2-pre/er-signets/13.yaml
rename to data/v2/er-signets/13.yaml
diff --git a/data/v2-pre/er-signets/14.yaml b/data/v2/er-signets/14.yaml
similarity index 100%
rename from data/v2-pre/er-signets/14.yaml
rename to data/v2/er-signets/14.yaml
diff --git a/data/v2-pre/er-signets/2.yaml b/data/v2/er-signets/2.yaml
similarity index 100%
rename from data/v2-pre/er-signets/2.yaml
rename to data/v2/er-signets/2.yaml
diff --git a/data/v2-pre/er-signets/3.yaml b/data/v2/er-signets/3.yaml
similarity index 100%
rename from data/v2-pre/er-signets/3.yaml
rename to data/v2/er-signets/3.yaml
diff --git a/data/v2-pre/er-signets/4.yaml b/data/v2/er-signets/4.yaml
similarity index 100%
rename from data/v2-pre/er-signets/4.yaml
rename to data/v2/er-signets/4.yaml
diff --git a/data/v2-pre/er-signets/5.yaml b/data/v2/er-signets/5.yaml
similarity index 100%
rename from data/v2-pre/er-signets/5.yaml
rename to data/v2/er-signets/5.yaml
diff --git a/data/v2-pre/er-signets/6.yaml b/data/v2/er-signets/6.yaml
similarity index 100%
rename from data/v2-pre/er-signets/6.yaml
rename to data/v2/er-signets/6.yaml
diff --git a/data/v2-pre/er-signets/7.yaml b/data/v2/er-signets/7.yaml
similarity index 100%
rename from data/v2-pre/er-signets/7.yaml
rename to data/v2/er-signets/7.yaml
diff --git a/data/v2-pre/er-supports.yaml b/data/v2/er-supports.yaml
similarity index 100%
rename from data/v2-pre/er-supports.yaml
rename to data/v2/er-supports.yaml
diff --git a/data/v2-pre/stigmata-catalog.yaml b/data/v2/stigmata-catalog.yaml
similarity index 100%
rename from data/v2-pre/stigmata-catalog.yaml
rename to data/v2/stigmata-catalog.yaml
diff --git a/data/v2-pre/stigmata-set-catalog.yaml b/data/v2/stigmata-set-catalog.yaml
similarity index 100%
rename from data/v2-pre/stigmata-set-catalog.yaml
rename to data/v2/stigmata-set-catalog.yaml
diff --git a/data/v2-pre/stigmata-sets/1.yaml b/data/v2/stigmata-sets/1.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/1.yaml
rename to data/v2/stigmata-sets/1.yaml
diff --git a/data/v2-pre/stigmata-sets/10.yaml b/data/v2/stigmata-sets/10.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/10.yaml
rename to data/v2/stigmata-sets/10.yaml
diff --git a/data/v2-pre/stigmata-sets/100.yaml b/data/v2/stigmata-sets/100.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/100.yaml
rename to data/v2/stigmata-sets/100.yaml
diff --git a/data/v2-pre/stigmata-sets/101.yaml b/data/v2/stigmata-sets/101.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/101.yaml
rename to data/v2/stigmata-sets/101.yaml
diff --git a/data/v2-pre/stigmata-sets/102.yaml b/data/v2/stigmata-sets/102.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/102.yaml
rename to data/v2/stigmata-sets/102.yaml
diff --git a/data/v2-pre/stigmata-sets/103.yaml b/data/v2/stigmata-sets/103.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/103.yaml
rename to data/v2/stigmata-sets/103.yaml
diff --git a/data/v2-pre/stigmata-sets/104.yaml b/data/v2/stigmata-sets/104.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/104.yaml
rename to data/v2/stigmata-sets/104.yaml
diff --git a/data/v2-pre/stigmata-sets/105.yaml b/data/v2/stigmata-sets/105.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/105.yaml
rename to data/v2/stigmata-sets/105.yaml
diff --git a/data/v2-pre/stigmata-sets/106.yaml b/data/v2/stigmata-sets/106.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/106.yaml
rename to data/v2/stigmata-sets/106.yaml
diff --git a/data/v2-pre/stigmata-sets/107.yaml b/data/v2/stigmata-sets/107.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/107.yaml
rename to data/v2/stigmata-sets/107.yaml
diff --git a/data/v2-pre/stigmata-sets/108.yaml b/data/v2/stigmata-sets/108.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/108.yaml
rename to data/v2/stigmata-sets/108.yaml
diff --git a/data/v2-pre/stigmata-sets/109.yaml b/data/v2/stigmata-sets/109.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/109.yaml
rename to data/v2/stigmata-sets/109.yaml
diff --git a/data/v2-pre/stigmata-sets/11.yaml b/data/v2/stigmata-sets/11.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/11.yaml
rename to data/v2/stigmata-sets/11.yaml
diff --git a/data/v2-pre/stigmata-sets/110.yaml b/data/v2/stigmata-sets/110.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/110.yaml
rename to data/v2/stigmata-sets/110.yaml
diff --git a/data/v2-pre/stigmata-sets/111.yaml b/data/v2/stigmata-sets/111.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/111.yaml
rename to data/v2/stigmata-sets/111.yaml
diff --git a/data/v2-pre/stigmata-sets/112.yaml b/data/v2/stigmata-sets/112.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/112.yaml
rename to data/v2/stigmata-sets/112.yaml
diff --git a/data/v2-pre/stigmata-sets/113.yaml b/data/v2/stigmata-sets/113.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/113.yaml
rename to data/v2/stigmata-sets/113.yaml
diff --git a/data/v2-pre/stigmata-sets/114.yaml b/data/v2/stigmata-sets/114.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/114.yaml
rename to data/v2/stigmata-sets/114.yaml
diff --git a/data/v2-pre/stigmata-sets/115.yaml b/data/v2/stigmata-sets/115.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/115.yaml
rename to data/v2/stigmata-sets/115.yaml
diff --git a/data/v2-pre/stigmata-sets/116.yaml b/data/v2/stigmata-sets/116.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/116.yaml
rename to data/v2/stigmata-sets/116.yaml
diff --git a/data/v2-pre/stigmata-sets/119.yaml b/data/v2/stigmata-sets/119.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/119.yaml
rename to data/v2/stigmata-sets/119.yaml
diff --git a/data/v2-pre/stigmata-sets/12.yaml b/data/v2/stigmata-sets/12.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/12.yaml
rename to data/v2/stigmata-sets/12.yaml
diff --git a/data/v2-pre/stigmata-sets/120.yaml b/data/v2/stigmata-sets/120.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/120.yaml
rename to data/v2/stigmata-sets/120.yaml
diff --git a/data/v2-pre/stigmata-sets/123.yaml b/data/v2/stigmata-sets/123.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/123.yaml
rename to data/v2/stigmata-sets/123.yaml
diff --git a/data/v2-pre/stigmata-sets/124.yaml b/data/v2/stigmata-sets/124.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/124.yaml
rename to data/v2/stigmata-sets/124.yaml
diff --git a/data/v2-pre/stigmata-sets/125.yaml b/data/v2/stigmata-sets/125.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/125.yaml
rename to data/v2/stigmata-sets/125.yaml
diff --git a/data/v2-pre/stigmata-sets/126.yaml b/data/v2/stigmata-sets/126.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/126.yaml
rename to data/v2/stigmata-sets/126.yaml
diff --git a/data/v2-pre/stigmata-sets/127.yaml b/data/v2/stigmata-sets/127.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/127.yaml
rename to data/v2/stigmata-sets/127.yaml
diff --git a/data/v2-pre/stigmata-sets/128.yaml b/data/v2/stigmata-sets/128.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/128.yaml
rename to data/v2/stigmata-sets/128.yaml
diff --git a/data/v2-pre/stigmata-sets/129.yaml b/data/v2/stigmata-sets/129.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/129.yaml
rename to data/v2/stigmata-sets/129.yaml
diff --git a/data/v2-pre/stigmata-sets/1290.yaml b/data/v2/stigmata-sets/1290.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/1290.yaml
rename to data/v2/stigmata-sets/1290.yaml
diff --git a/data/v2-pre/stigmata-sets/13.yaml b/data/v2/stigmata-sets/13.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/13.yaml
rename to data/v2/stigmata-sets/13.yaml
diff --git a/data/v2-pre/stigmata-sets/130.yaml b/data/v2/stigmata-sets/130.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/130.yaml
rename to data/v2/stigmata-sets/130.yaml
diff --git a/data/v2-pre/stigmata-sets/131.yaml b/data/v2/stigmata-sets/131.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/131.yaml
rename to data/v2/stigmata-sets/131.yaml
diff --git a/data/v2-pre/stigmata-sets/132.yaml b/data/v2/stigmata-sets/132.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/132.yaml
rename to data/v2/stigmata-sets/132.yaml
diff --git a/data/v2-pre/stigmata-sets/133.yaml b/data/v2/stigmata-sets/133.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/133.yaml
rename to data/v2/stigmata-sets/133.yaml
diff --git a/data/v2-pre/stigmata-sets/134.yaml b/data/v2/stigmata-sets/134.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/134.yaml
rename to data/v2/stigmata-sets/134.yaml
diff --git a/data/v2-pre/stigmata-sets/135.yaml b/data/v2/stigmata-sets/135.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/135.yaml
rename to data/v2/stigmata-sets/135.yaml
diff --git a/data/v2-pre/stigmata-sets/136.yaml b/data/v2/stigmata-sets/136.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/136.yaml
rename to data/v2/stigmata-sets/136.yaml
diff --git a/data/v2-pre/stigmata-sets/137.yaml b/data/v2/stigmata-sets/137.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/137.yaml
rename to data/v2/stigmata-sets/137.yaml
diff --git a/data/v2-pre/stigmata-sets/138.yaml b/data/v2/stigmata-sets/138.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/138.yaml
rename to data/v2/stigmata-sets/138.yaml
diff --git a/data/v2-pre/stigmata-sets/139.yaml b/data/v2/stigmata-sets/139.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/139.yaml
rename to data/v2/stigmata-sets/139.yaml
diff --git a/data/v2-pre/stigmata-sets/14.yaml b/data/v2/stigmata-sets/14.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/14.yaml
rename to data/v2/stigmata-sets/14.yaml
diff --git a/data/v2-pre/stigmata-sets/140.yaml b/data/v2/stigmata-sets/140.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/140.yaml
rename to data/v2/stigmata-sets/140.yaml
diff --git a/data/v2-pre/stigmata-sets/141.yaml b/data/v2/stigmata-sets/141.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/141.yaml
rename to data/v2/stigmata-sets/141.yaml
diff --git a/data/v2-pre/stigmata-sets/142.yaml b/data/v2/stigmata-sets/142.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/142.yaml
rename to data/v2/stigmata-sets/142.yaml
diff --git a/data/v2-pre/stigmata-sets/143.yaml b/data/v2/stigmata-sets/143.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/143.yaml
rename to data/v2/stigmata-sets/143.yaml
diff --git a/data/v2-pre/stigmata-sets/144.yaml b/data/v2/stigmata-sets/144.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/144.yaml
rename to data/v2/stigmata-sets/144.yaml
diff --git a/data/v2-pre/stigmata-sets/145.yaml b/data/v2/stigmata-sets/145.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/145.yaml
rename to data/v2/stigmata-sets/145.yaml
diff --git a/data/v2-pre/stigmata-sets/146.yaml b/data/v2/stigmata-sets/146.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/146.yaml
rename to data/v2/stigmata-sets/146.yaml
diff --git a/data/v2-pre/stigmata-sets/147.yaml b/data/v2/stigmata-sets/147.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/147.yaml
rename to data/v2/stigmata-sets/147.yaml
diff --git a/data/v2-pre/stigmata-sets/148.yaml b/data/v2/stigmata-sets/148.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/148.yaml
rename to data/v2/stigmata-sets/148.yaml
diff --git a/data/v2-pre/stigmata-sets/149.yaml b/data/v2/stigmata-sets/149.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/149.yaml
rename to data/v2/stigmata-sets/149.yaml
diff --git a/data/v2-pre/stigmata-sets/15.yaml b/data/v2/stigmata-sets/15.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/15.yaml
rename to data/v2/stigmata-sets/15.yaml
diff --git a/data/v2-pre/stigmata-sets/150.yaml b/data/v2/stigmata-sets/150.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/150.yaml
rename to data/v2/stigmata-sets/150.yaml
diff --git a/data/v2-pre/stigmata-sets/151.yaml b/data/v2/stigmata-sets/151.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/151.yaml
rename to data/v2/stigmata-sets/151.yaml
diff --git a/data/v2-pre/stigmata-sets/152.yaml b/data/v2/stigmata-sets/152.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/152.yaml
rename to data/v2/stigmata-sets/152.yaml
diff --git a/data/v2-pre/stigmata-sets/153.yaml b/data/v2/stigmata-sets/153.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/153.yaml
rename to data/v2/stigmata-sets/153.yaml
diff --git a/data/v2-pre/stigmata-sets/154.yaml b/data/v2/stigmata-sets/154.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/154.yaml
rename to data/v2/stigmata-sets/154.yaml
diff --git a/data/v2-pre/stigmata-sets/155.yaml b/data/v2/stigmata-sets/155.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/155.yaml
rename to data/v2/stigmata-sets/155.yaml
diff --git a/data/v2-pre/stigmata-sets/156.yaml b/data/v2/stigmata-sets/156.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/156.yaml
rename to data/v2/stigmata-sets/156.yaml
diff --git a/data/v2-pre/stigmata-sets/157.yaml b/data/v2/stigmata-sets/157.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/157.yaml
rename to data/v2/stigmata-sets/157.yaml
diff --git a/data/v2-pre/stigmata-sets/158.yaml b/data/v2/stigmata-sets/158.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/158.yaml
rename to data/v2/stigmata-sets/158.yaml
diff --git a/data/v2-pre/stigmata-sets/159.yaml b/data/v2/stigmata-sets/159.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/159.yaml
rename to data/v2/stigmata-sets/159.yaml
diff --git a/data/v2-pre/stigmata-sets/16.yaml b/data/v2/stigmata-sets/16.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/16.yaml
rename to data/v2/stigmata-sets/16.yaml
diff --git a/data/v2-pre/stigmata-sets/160.yaml b/data/v2/stigmata-sets/160.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/160.yaml
rename to data/v2/stigmata-sets/160.yaml
diff --git a/data/v2-pre/stigmata-sets/161.yaml b/data/v2/stigmata-sets/161.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/161.yaml
rename to data/v2/stigmata-sets/161.yaml
diff --git a/data/v2-pre/stigmata-sets/162.yaml b/data/v2/stigmata-sets/162.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/162.yaml
rename to data/v2/stigmata-sets/162.yaml
diff --git a/data/v2-pre/stigmata-sets/163.yaml b/data/v2/stigmata-sets/163.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/163.yaml
rename to data/v2/stigmata-sets/163.yaml
diff --git a/data/v2-pre/stigmata-sets/17.yaml b/data/v2/stigmata-sets/17.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/17.yaml
rename to data/v2/stigmata-sets/17.yaml
diff --git a/data/v2-pre/stigmata-sets/18.yaml b/data/v2/stigmata-sets/18.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/18.yaml
rename to data/v2/stigmata-sets/18.yaml
diff --git a/data/v2-pre/stigmata-sets/19.yaml b/data/v2/stigmata-sets/19.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/19.yaml
rename to data/v2/stigmata-sets/19.yaml
diff --git a/data/v2-pre/stigmata-sets/2.yaml b/data/v2/stigmata-sets/2.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/2.yaml
rename to data/v2/stigmata-sets/2.yaml
diff --git a/data/v2-pre/stigmata-sets/20.yaml b/data/v2/stigmata-sets/20.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/20.yaml
rename to data/v2/stigmata-sets/20.yaml
diff --git a/data/v2-pre/stigmata-sets/21.yaml b/data/v2/stigmata-sets/21.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/21.yaml
rename to data/v2/stigmata-sets/21.yaml
diff --git a/data/v2-pre/stigmata-sets/22.yaml b/data/v2/stigmata-sets/22.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/22.yaml
rename to data/v2/stigmata-sets/22.yaml
diff --git a/data/v2-pre/stigmata-sets/23.yaml b/data/v2/stigmata-sets/23.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/23.yaml
rename to data/v2/stigmata-sets/23.yaml
diff --git a/data/v2-pre/stigmata-sets/24.yaml b/data/v2/stigmata-sets/24.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/24.yaml
rename to data/v2/stigmata-sets/24.yaml
diff --git a/data/v2-pre/stigmata-sets/25.yaml b/data/v2/stigmata-sets/25.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/25.yaml
rename to data/v2/stigmata-sets/25.yaml
diff --git a/data/v2-pre/stigmata-sets/26.yaml b/data/v2/stigmata-sets/26.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/26.yaml
rename to data/v2/stigmata-sets/26.yaml
diff --git a/data/v2-pre/stigmata-sets/27.yaml b/data/v2/stigmata-sets/27.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/27.yaml
rename to data/v2/stigmata-sets/27.yaml
diff --git a/data/v2-pre/stigmata-sets/28.yaml b/data/v2/stigmata-sets/28.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/28.yaml
rename to data/v2/stigmata-sets/28.yaml
diff --git a/data/v2-pre/stigmata-sets/29.yaml b/data/v2/stigmata-sets/29.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/29.yaml
rename to data/v2/stigmata-sets/29.yaml
diff --git a/data/v2-pre/stigmata-sets/3.yaml b/data/v2/stigmata-sets/3.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/3.yaml
rename to data/v2/stigmata-sets/3.yaml
diff --git a/data/v2-pre/stigmata-sets/30.yaml b/data/v2/stigmata-sets/30.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/30.yaml
rename to data/v2/stigmata-sets/30.yaml
diff --git a/data/v2-pre/stigmata-sets/31.yaml b/data/v2/stigmata-sets/31.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/31.yaml
rename to data/v2/stigmata-sets/31.yaml
diff --git a/data/v2-pre/stigmata-sets/32.yaml b/data/v2/stigmata-sets/32.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/32.yaml
rename to data/v2/stigmata-sets/32.yaml
diff --git a/data/v2-pre/stigmata-sets/33.yaml b/data/v2/stigmata-sets/33.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/33.yaml
rename to data/v2/stigmata-sets/33.yaml
diff --git a/data/v2-pre/stigmata-sets/34.yaml b/data/v2/stigmata-sets/34.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/34.yaml
rename to data/v2/stigmata-sets/34.yaml
diff --git a/data/v2-pre/stigmata-sets/35.yaml b/data/v2/stigmata-sets/35.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/35.yaml
rename to data/v2/stigmata-sets/35.yaml
diff --git a/data/v2-pre/stigmata-sets/36.yaml b/data/v2/stigmata-sets/36.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/36.yaml
rename to data/v2/stigmata-sets/36.yaml
diff --git a/data/v2-pre/stigmata-sets/37.yaml b/data/v2/stigmata-sets/37.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/37.yaml
rename to data/v2/stigmata-sets/37.yaml
diff --git a/data/v2-pre/stigmata-sets/38.yaml b/data/v2/stigmata-sets/38.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/38.yaml
rename to data/v2/stigmata-sets/38.yaml
diff --git a/data/v2-pre/stigmata-sets/39.yaml b/data/v2/stigmata-sets/39.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/39.yaml
rename to data/v2/stigmata-sets/39.yaml
diff --git a/data/v2-pre/stigmata-sets/4.yaml b/data/v2/stigmata-sets/4.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/4.yaml
rename to data/v2/stigmata-sets/4.yaml
diff --git a/data/v2-pre/stigmata-sets/40.yaml b/data/v2/stigmata-sets/40.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/40.yaml
rename to data/v2/stigmata-sets/40.yaml
diff --git a/data/v2-pre/stigmata-sets/41.yaml b/data/v2/stigmata-sets/41.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/41.yaml
rename to data/v2/stigmata-sets/41.yaml
diff --git a/data/v2-pre/stigmata-sets/42.yaml b/data/v2/stigmata-sets/42.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/42.yaml
rename to data/v2/stigmata-sets/42.yaml
diff --git a/data/v2-pre/stigmata-sets/43.yaml b/data/v2/stigmata-sets/43.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/43.yaml
rename to data/v2/stigmata-sets/43.yaml
diff --git a/data/v2-pre/stigmata-sets/44.yaml b/data/v2/stigmata-sets/44.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/44.yaml
rename to data/v2/stigmata-sets/44.yaml
diff --git a/data/v2-pre/stigmata-sets/45.yaml b/data/v2/stigmata-sets/45.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/45.yaml
rename to data/v2/stigmata-sets/45.yaml
diff --git a/data/v2-pre/stigmata-sets/46.yaml b/data/v2/stigmata-sets/46.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/46.yaml
rename to data/v2/stigmata-sets/46.yaml
diff --git a/data/v2-pre/stigmata-sets/47.yaml b/data/v2/stigmata-sets/47.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/47.yaml
rename to data/v2/stigmata-sets/47.yaml
diff --git a/data/v2-pre/stigmata-sets/48.yaml b/data/v2/stigmata-sets/48.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/48.yaml
rename to data/v2/stigmata-sets/48.yaml
diff --git a/data/v2-pre/stigmata-sets/49.yaml b/data/v2/stigmata-sets/49.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/49.yaml
rename to data/v2/stigmata-sets/49.yaml
diff --git a/data/v2-pre/stigmata-sets/5.yaml b/data/v2/stigmata-sets/5.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/5.yaml
rename to data/v2/stigmata-sets/5.yaml
diff --git a/data/v2-pre/stigmata-sets/50.yaml b/data/v2/stigmata-sets/50.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/50.yaml
rename to data/v2/stigmata-sets/50.yaml
diff --git a/data/v2-pre/stigmata-sets/51.yaml b/data/v2/stigmata-sets/51.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/51.yaml
rename to data/v2/stigmata-sets/51.yaml
diff --git a/data/v2-pre/stigmata-sets/52.yaml b/data/v2/stigmata-sets/52.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/52.yaml
rename to data/v2/stigmata-sets/52.yaml
diff --git a/data/v2-pre/stigmata-sets/53.yaml b/data/v2/stigmata-sets/53.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/53.yaml
rename to data/v2/stigmata-sets/53.yaml
diff --git a/data/v2-pre/stigmata-sets/54.yaml b/data/v2/stigmata-sets/54.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/54.yaml
rename to data/v2/stigmata-sets/54.yaml
diff --git a/data/v2-pre/stigmata-sets/55.yaml b/data/v2/stigmata-sets/55.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/55.yaml
rename to data/v2/stigmata-sets/55.yaml
diff --git a/data/v2-pre/stigmata-sets/56.yaml b/data/v2/stigmata-sets/56.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/56.yaml
rename to data/v2/stigmata-sets/56.yaml
diff --git a/data/v2-pre/stigmata-sets/57.yaml b/data/v2/stigmata-sets/57.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/57.yaml
rename to data/v2/stigmata-sets/57.yaml
diff --git a/data/v2-pre/stigmata-sets/58.yaml b/data/v2/stigmata-sets/58.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/58.yaml
rename to data/v2/stigmata-sets/58.yaml
diff --git a/data/v2-pre/stigmata-sets/59.yaml b/data/v2/stigmata-sets/59.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/59.yaml
rename to data/v2/stigmata-sets/59.yaml
diff --git a/data/v2-pre/stigmata-sets/6.yaml b/data/v2/stigmata-sets/6.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/6.yaml
rename to data/v2/stigmata-sets/6.yaml
diff --git a/data/v2-pre/stigmata-sets/60.yaml b/data/v2/stigmata-sets/60.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/60.yaml
rename to data/v2/stigmata-sets/60.yaml
diff --git a/data/v2-pre/stigmata-sets/61.yaml b/data/v2/stigmata-sets/61.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/61.yaml
rename to data/v2/stigmata-sets/61.yaml
diff --git a/data/v2-pre/stigmata-sets/62.yaml b/data/v2/stigmata-sets/62.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/62.yaml
rename to data/v2/stigmata-sets/62.yaml
diff --git a/data/v2-pre/stigmata-sets/63.yaml b/data/v2/stigmata-sets/63.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/63.yaml
rename to data/v2/stigmata-sets/63.yaml
diff --git a/data/v2-pre/stigmata-sets/64.yaml b/data/v2/stigmata-sets/64.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/64.yaml
rename to data/v2/stigmata-sets/64.yaml
diff --git a/data/v2-pre/stigmata-sets/65.yaml b/data/v2/stigmata-sets/65.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/65.yaml
rename to data/v2/stigmata-sets/65.yaml
diff --git a/data/v2-pre/stigmata-sets/66.yaml b/data/v2/stigmata-sets/66.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/66.yaml
rename to data/v2/stigmata-sets/66.yaml
diff --git a/data/v2-pre/stigmata-sets/67.yaml b/data/v2/stigmata-sets/67.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/67.yaml
rename to data/v2/stigmata-sets/67.yaml
diff --git a/data/v2-pre/stigmata-sets/68.yaml b/data/v2/stigmata-sets/68.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/68.yaml
rename to data/v2/stigmata-sets/68.yaml
diff --git a/data/v2-pre/stigmata-sets/69.yaml b/data/v2/stigmata-sets/69.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/69.yaml
rename to data/v2/stigmata-sets/69.yaml
diff --git a/data/v2-pre/stigmata-sets/7.yaml b/data/v2/stigmata-sets/7.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/7.yaml
rename to data/v2/stigmata-sets/7.yaml
diff --git a/data/v2-pre/stigmata-sets/70.yaml b/data/v2/stigmata-sets/70.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/70.yaml
rename to data/v2/stigmata-sets/70.yaml
diff --git a/data/v2-pre/stigmata-sets/71.yaml b/data/v2/stigmata-sets/71.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/71.yaml
rename to data/v2/stigmata-sets/71.yaml
diff --git a/data/v2-pre/stigmata-sets/72.yaml b/data/v2/stigmata-sets/72.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/72.yaml
rename to data/v2/stigmata-sets/72.yaml
diff --git a/data/v2-pre/stigmata-sets/73.yaml b/data/v2/stigmata-sets/73.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/73.yaml
rename to data/v2/stigmata-sets/73.yaml
diff --git a/data/v2-pre/stigmata-sets/74.yaml b/data/v2/stigmata-sets/74.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/74.yaml
rename to data/v2/stigmata-sets/74.yaml
diff --git a/data/v2-pre/stigmata-sets/75.yaml b/data/v2/stigmata-sets/75.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/75.yaml
rename to data/v2/stigmata-sets/75.yaml
diff --git a/data/v2-pre/stigmata-sets/76.yaml b/data/v2/stigmata-sets/76.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/76.yaml
rename to data/v2/stigmata-sets/76.yaml
diff --git a/data/v2-pre/stigmata-sets/77.yaml b/data/v2/stigmata-sets/77.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/77.yaml
rename to data/v2/stigmata-sets/77.yaml
diff --git a/data/v2-pre/stigmata-sets/78.yaml b/data/v2/stigmata-sets/78.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/78.yaml
rename to data/v2/stigmata-sets/78.yaml
diff --git a/data/v2-pre/stigmata-sets/79.yaml b/data/v2/stigmata-sets/79.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/79.yaml
rename to data/v2/stigmata-sets/79.yaml
diff --git a/data/v2-pre/stigmata-sets/8.yaml b/data/v2/stigmata-sets/8.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/8.yaml
rename to data/v2/stigmata-sets/8.yaml
diff --git a/data/v2-pre/stigmata-sets/80.yaml b/data/v2/stigmata-sets/80.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/80.yaml
rename to data/v2/stigmata-sets/80.yaml
diff --git a/data/v2-pre/stigmata-sets/81.yaml b/data/v2/stigmata-sets/81.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/81.yaml
rename to data/v2/stigmata-sets/81.yaml
diff --git a/data/v2-pre/stigmata-sets/82.yaml b/data/v2/stigmata-sets/82.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/82.yaml
rename to data/v2/stigmata-sets/82.yaml
diff --git a/data/v2-pre/stigmata-sets/83.yaml b/data/v2/stigmata-sets/83.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/83.yaml
rename to data/v2/stigmata-sets/83.yaml
diff --git a/data/v2-pre/stigmata-sets/84.yaml b/data/v2/stigmata-sets/84.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/84.yaml
rename to data/v2/stigmata-sets/84.yaml
diff --git a/data/v2-pre/stigmata-sets/85.yaml b/data/v2/stigmata-sets/85.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/85.yaml
rename to data/v2/stigmata-sets/85.yaml
diff --git a/data/v2-pre/stigmata-sets/86.yaml b/data/v2/stigmata-sets/86.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/86.yaml
rename to data/v2/stigmata-sets/86.yaml
diff --git a/data/v2-pre/stigmata-sets/87.yaml b/data/v2/stigmata-sets/87.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/87.yaml
rename to data/v2/stigmata-sets/87.yaml
diff --git a/data/v2-pre/stigmata-sets/88.yaml b/data/v2/stigmata-sets/88.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/88.yaml
rename to data/v2/stigmata-sets/88.yaml
diff --git a/data/v2-pre/stigmata-sets/89.yaml b/data/v2/stigmata-sets/89.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/89.yaml
rename to data/v2/stigmata-sets/89.yaml
diff --git a/data/v2-pre/stigmata-sets/9.yaml b/data/v2/stigmata-sets/9.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/9.yaml
rename to data/v2/stigmata-sets/9.yaml
diff --git a/data/v2-pre/stigmata-sets/90.yaml b/data/v2/stigmata-sets/90.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/90.yaml
rename to data/v2/stigmata-sets/90.yaml
diff --git a/data/v2-pre/stigmata-sets/91.yaml b/data/v2/stigmata-sets/91.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/91.yaml
rename to data/v2/stigmata-sets/91.yaml
diff --git a/data/v2-pre/stigmata-sets/92.yaml b/data/v2/stigmata-sets/92.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/92.yaml
rename to data/v2/stigmata-sets/92.yaml
diff --git a/data/v2-pre/stigmata-sets/93.yaml b/data/v2/stigmata-sets/93.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/93.yaml
rename to data/v2/stigmata-sets/93.yaml
diff --git a/data/v2-pre/stigmata-sets/94.yaml b/data/v2/stigmata-sets/94.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/94.yaml
rename to data/v2/stigmata-sets/94.yaml
diff --git a/data/v2-pre/stigmata-sets/95.yaml b/data/v2/stigmata-sets/95.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/95.yaml
rename to data/v2/stigmata-sets/95.yaml
diff --git a/data/v2-pre/stigmata-sets/96.yaml b/data/v2/stigmata-sets/96.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/96.yaml
rename to data/v2/stigmata-sets/96.yaml
diff --git a/data/v2-pre/stigmata-sets/97.yaml b/data/v2/stigmata-sets/97.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/97.yaml
rename to data/v2/stigmata-sets/97.yaml
diff --git a/data/v2-pre/stigmata-sets/98.yaml b/data/v2/stigmata-sets/98.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/98.yaml
rename to data/v2/stigmata-sets/98.yaml
diff --git a/data/v2-pre/stigmata-sets/99.yaml b/data/v2/stigmata-sets/99.yaml
similarity index 100%
rename from data/v2-pre/stigmata-sets/99.yaml
rename to data/v2/stigmata-sets/99.yaml
diff --git a/data/v2-pre/stigmata/0.yaml b/data/v2/stigmata/0.yaml
similarity index 100%
rename from data/v2-pre/stigmata/0.yaml
rename to data/v2/stigmata/0.yaml
diff --git a/data/v2-pre/stigmata/110011.yaml b/data/v2/stigmata/110011.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110011.yaml
rename to data/v2/stigmata/110011.yaml
diff --git a/data/v2-pre/stigmata/110012.yaml b/data/v2/stigmata/110012.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110012.yaml
rename to data/v2/stigmata/110012.yaml
diff --git a/data/v2-pre/stigmata/110013.yaml b/data/v2/stigmata/110013.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110013.yaml
rename to data/v2/stigmata/110013.yaml
diff --git a/data/v2-pre/stigmata/110021.yaml b/data/v2/stigmata/110021.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110021.yaml
rename to data/v2/stigmata/110021.yaml
diff --git a/data/v2-pre/stigmata/110022.yaml b/data/v2/stigmata/110022.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110022.yaml
rename to data/v2/stigmata/110022.yaml
diff --git a/data/v2-pre/stigmata/110023.yaml b/data/v2/stigmata/110023.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110023.yaml
rename to data/v2/stigmata/110023.yaml
diff --git a/data/v2-pre/stigmata/110031.yaml b/data/v2/stigmata/110031.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110031.yaml
rename to data/v2/stigmata/110031.yaml
diff --git a/data/v2-pre/stigmata/110032.yaml b/data/v2/stigmata/110032.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110032.yaml
rename to data/v2/stigmata/110032.yaml
diff --git a/data/v2-pre/stigmata/110033.yaml b/data/v2/stigmata/110033.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110033.yaml
rename to data/v2/stigmata/110033.yaml
diff --git a/data/v2-pre/stigmata/110041.yaml b/data/v2/stigmata/110041.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110041.yaml
rename to data/v2/stigmata/110041.yaml
diff --git a/data/v2-pre/stigmata/110042.yaml b/data/v2/stigmata/110042.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110042.yaml
rename to data/v2/stigmata/110042.yaml
diff --git a/data/v2-pre/stigmata/110043.yaml b/data/v2/stigmata/110043.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110043.yaml
rename to data/v2/stigmata/110043.yaml
diff --git a/data/v2-pre/stigmata/110051.yaml b/data/v2/stigmata/110051.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110051.yaml
rename to data/v2/stigmata/110051.yaml
diff --git a/data/v2-pre/stigmata/110052.yaml b/data/v2/stigmata/110052.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110052.yaml
rename to data/v2/stigmata/110052.yaml
diff --git a/data/v2-pre/stigmata/110053.yaml b/data/v2/stigmata/110053.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110053.yaml
rename to data/v2/stigmata/110053.yaml
diff --git a/data/v2-pre/stigmata/110061.yaml b/data/v2/stigmata/110061.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110061.yaml
rename to data/v2/stigmata/110061.yaml
diff --git a/data/v2-pre/stigmata/110062.yaml b/data/v2/stigmata/110062.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110062.yaml
rename to data/v2/stigmata/110062.yaml
diff --git a/data/v2-pre/stigmata/110063.yaml b/data/v2/stigmata/110063.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110063.yaml
rename to data/v2/stigmata/110063.yaml
diff --git a/data/v2-pre/stigmata/110071.yaml b/data/v2/stigmata/110071.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110071.yaml
rename to data/v2/stigmata/110071.yaml
diff --git a/data/v2-pre/stigmata/110072.yaml b/data/v2/stigmata/110072.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110072.yaml
rename to data/v2/stigmata/110072.yaml
diff --git a/data/v2-pre/stigmata/110073.yaml b/data/v2/stigmata/110073.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110073.yaml
rename to data/v2/stigmata/110073.yaml
diff --git a/data/v2-pre/stigmata/110081.yaml b/data/v2/stigmata/110081.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110081.yaml
rename to data/v2/stigmata/110081.yaml
diff --git a/data/v2-pre/stigmata/110082.yaml b/data/v2/stigmata/110082.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110082.yaml
rename to data/v2/stigmata/110082.yaml
diff --git a/data/v2-pre/stigmata/110083.yaml b/data/v2/stigmata/110083.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110083.yaml
rename to data/v2/stigmata/110083.yaml
diff --git a/data/v2-pre/stigmata/110091.yaml b/data/v2/stigmata/110091.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110091.yaml
rename to data/v2/stigmata/110091.yaml
diff --git a/data/v2-pre/stigmata/110092.yaml b/data/v2/stigmata/110092.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110092.yaml
rename to data/v2/stigmata/110092.yaml
diff --git a/data/v2-pre/stigmata/110093.yaml b/data/v2/stigmata/110093.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110093.yaml
rename to data/v2/stigmata/110093.yaml
diff --git a/data/v2-pre/stigmata/110101.yaml b/data/v2/stigmata/110101.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110101.yaml
rename to data/v2/stigmata/110101.yaml
diff --git a/data/v2-pre/stigmata/110102.yaml b/data/v2/stigmata/110102.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110102.yaml
rename to data/v2/stigmata/110102.yaml
diff --git a/data/v2-pre/stigmata/110103.yaml b/data/v2/stigmata/110103.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110103.yaml
rename to data/v2/stigmata/110103.yaml
diff --git a/data/v2-pre/stigmata/110111.yaml b/data/v2/stigmata/110111.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110111.yaml
rename to data/v2/stigmata/110111.yaml
diff --git a/data/v2-pre/stigmata/110112.yaml b/data/v2/stigmata/110112.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110112.yaml
rename to data/v2/stigmata/110112.yaml
diff --git a/data/v2-pre/stigmata/110113.yaml b/data/v2/stigmata/110113.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110113.yaml
rename to data/v2/stigmata/110113.yaml
diff --git a/data/v2-pre/stigmata/110121.yaml b/data/v2/stigmata/110121.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110121.yaml
rename to data/v2/stigmata/110121.yaml
diff --git a/data/v2-pre/stigmata/110122.yaml b/data/v2/stigmata/110122.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110122.yaml
rename to data/v2/stigmata/110122.yaml
diff --git a/data/v2-pre/stigmata/110123.yaml b/data/v2/stigmata/110123.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110123.yaml
rename to data/v2/stigmata/110123.yaml
diff --git a/data/v2-pre/stigmata/110131.yaml b/data/v2/stigmata/110131.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110131.yaml
rename to data/v2/stigmata/110131.yaml
diff --git a/data/v2-pre/stigmata/110132.yaml b/data/v2/stigmata/110132.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110132.yaml
rename to data/v2/stigmata/110132.yaml
diff --git a/data/v2-pre/stigmata/110133.yaml b/data/v2/stigmata/110133.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110133.yaml
rename to data/v2/stigmata/110133.yaml
diff --git a/data/v2-pre/stigmata/110141.yaml b/data/v2/stigmata/110141.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110141.yaml
rename to data/v2/stigmata/110141.yaml
diff --git a/data/v2-pre/stigmata/110142.yaml b/data/v2/stigmata/110142.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110142.yaml
rename to data/v2/stigmata/110142.yaml
diff --git a/data/v2-pre/stigmata/110143.yaml b/data/v2/stigmata/110143.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110143.yaml
rename to data/v2/stigmata/110143.yaml
diff --git a/data/v2-pre/stigmata/110151.yaml b/data/v2/stigmata/110151.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110151.yaml
rename to data/v2/stigmata/110151.yaml
diff --git a/data/v2-pre/stigmata/110152.yaml b/data/v2/stigmata/110152.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110152.yaml
rename to data/v2/stigmata/110152.yaml
diff --git a/data/v2-pre/stigmata/110153.yaml b/data/v2/stigmata/110153.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110153.yaml
rename to data/v2/stigmata/110153.yaml
diff --git a/data/v2-pre/stigmata/110161.yaml b/data/v2/stigmata/110161.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110161.yaml
rename to data/v2/stigmata/110161.yaml
diff --git a/data/v2-pre/stigmata/110162.yaml b/data/v2/stigmata/110162.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110162.yaml
rename to data/v2/stigmata/110162.yaml
diff --git a/data/v2-pre/stigmata/110163.yaml b/data/v2/stigmata/110163.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110163.yaml
rename to data/v2/stigmata/110163.yaml
diff --git a/data/v2-pre/stigmata/110171.yaml b/data/v2/stigmata/110171.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110171.yaml
rename to data/v2/stigmata/110171.yaml
diff --git a/data/v2-pre/stigmata/110172.yaml b/data/v2/stigmata/110172.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110172.yaml
rename to data/v2/stigmata/110172.yaml
diff --git a/data/v2-pre/stigmata/110173.yaml b/data/v2/stigmata/110173.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110173.yaml
rename to data/v2/stigmata/110173.yaml
diff --git a/data/v2-pre/stigmata/110181.yaml b/data/v2/stigmata/110181.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110181.yaml
rename to data/v2/stigmata/110181.yaml
diff --git a/data/v2-pre/stigmata/110182.yaml b/data/v2/stigmata/110182.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110182.yaml
rename to data/v2/stigmata/110182.yaml
diff --git a/data/v2-pre/stigmata/110183.yaml b/data/v2/stigmata/110183.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110183.yaml
rename to data/v2/stigmata/110183.yaml
diff --git a/data/v2-pre/stigmata/110191.yaml b/data/v2/stigmata/110191.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110191.yaml
rename to data/v2/stigmata/110191.yaml
diff --git a/data/v2-pre/stigmata/110192.yaml b/data/v2/stigmata/110192.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110192.yaml
rename to data/v2/stigmata/110192.yaml
diff --git a/data/v2-pre/stigmata/110193.yaml b/data/v2/stigmata/110193.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110193.yaml
rename to data/v2/stigmata/110193.yaml
diff --git a/data/v2-pre/stigmata/110201.yaml b/data/v2/stigmata/110201.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110201.yaml
rename to data/v2/stigmata/110201.yaml
diff --git a/data/v2-pre/stigmata/110202.yaml b/data/v2/stigmata/110202.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110202.yaml
rename to data/v2/stigmata/110202.yaml
diff --git a/data/v2-pre/stigmata/110203.yaml b/data/v2/stigmata/110203.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110203.yaml
rename to data/v2/stigmata/110203.yaml
diff --git a/data/v2-pre/stigmata/110211.yaml b/data/v2/stigmata/110211.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110211.yaml
rename to data/v2/stigmata/110211.yaml
diff --git a/data/v2-pre/stigmata/110212.yaml b/data/v2/stigmata/110212.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110212.yaml
rename to data/v2/stigmata/110212.yaml
diff --git a/data/v2-pre/stigmata/110213.yaml b/data/v2/stigmata/110213.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110213.yaml
rename to data/v2/stigmata/110213.yaml
diff --git a/data/v2-pre/stigmata/110221.yaml b/data/v2/stigmata/110221.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110221.yaml
rename to data/v2/stigmata/110221.yaml
diff --git a/data/v2-pre/stigmata/110222.yaml b/data/v2/stigmata/110222.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110222.yaml
rename to data/v2/stigmata/110222.yaml
diff --git a/data/v2-pre/stigmata/110223.yaml b/data/v2/stigmata/110223.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110223.yaml
rename to data/v2/stigmata/110223.yaml
diff --git a/data/v2-pre/stigmata/110231.yaml b/data/v2/stigmata/110231.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110231.yaml
rename to data/v2/stigmata/110231.yaml
diff --git a/data/v2-pre/stigmata/110232.yaml b/data/v2/stigmata/110232.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110232.yaml
rename to data/v2/stigmata/110232.yaml
diff --git a/data/v2-pre/stigmata/110233.yaml b/data/v2/stigmata/110233.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110233.yaml
rename to data/v2/stigmata/110233.yaml
diff --git a/data/v2-pre/stigmata/110241.yaml b/data/v2/stigmata/110241.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110241.yaml
rename to data/v2/stigmata/110241.yaml
diff --git a/data/v2-pre/stigmata/110242.yaml b/data/v2/stigmata/110242.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110242.yaml
rename to data/v2/stigmata/110242.yaml
diff --git a/data/v2-pre/stigmata/110243.yaml b/data/v2/stigmata/110243.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110243.yaml
rename to data/v2/stigmata/110243.yaml
diff --git a/data/v2-pre/stigmata/110251.yaml b/data/v2/stigmata/110251.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110251.yaml
rename to data/v2/stigmata/110251.yaml
diff --git a/data/v2-pre/stigmata/110252.yaml b/data/v2/stigmata/110252.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110252.yaml
rename to data/v2/stigmata/110252.yaml
diff --git a/data/v2-pre/stigmata/110253.yaml b/data/v2/stigmata/110253.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110253.yaml
rename to data/v2/stigmata/110253.yaml
diff --git a/data/v2-pre/stigmata/110261.yaml b/data/v2/stigmata/110261.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110261.yaml
rename to data/v2/stigmata/110261.yaml
diff --git a/data/v2-pre/stigmata/110262.yaml b/data/v2/stigmata/110262.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110262.yaml
rename to data/v2/stigmata/110262.yaml
diff --git a/data/v2-pre/stigmata/110263.yaml b/data/v2/stigmata/110263.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110263.yaml
rename to data/v2/stigmata/110263.yaml
diff --git a/data/v2-pre/stigmata/110271.yaml b/data/v2/stigmata/110271.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110271.yaml
rename to data/v2/stigmata/110271.yaml
diff --git a/data/v2-pre/stigmata/110272.yaml b/data/v2/stigmata/110272.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110272.yaml
rename to data/v2/stigmata/110272.yaml
diff --git a/data/v2-pre/stigmata/110273.yaml b/data/v2/stigmata/110273.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110273.yaml
rename to data/v2/stigmata/110273.yaml
diff --git a/data/v2-pre/stigmata/110281.yaml b/data/v2/stigmata/110281.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110281.yaml
rename to data/v2/stigmata/110281.yaml
diff --git a/data/v2-pre/stigmata/110282.yaml b/data/v2/stigmata/110282.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110282.yaml
rename to data/v2/stigmata/110282.yaml
diff --git a/data/v2-pre/stigmata/110283.yaml b/data/v2/stigmata/110283.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110283.yaml
rename to data/v2/stigmata/110283.yaml
diff --git a/data/v2-pre/stigmata/110291.yaml b/data/v2/stigmata/110291.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110291.yaml
rename to data/v2/stigmata/110291.yaml
diff --git a/data/v2-pre/stigmata/110292.yaml b/data/v2/stigmata/110292.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110292.yaml
rename to data/v2/stigmata/110292.yaml
diff --git a/data/v2-pre/stigmata/110293.yaml b/data/v2/stigmata/110293.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110293.yaml
rename to data/v2/stigmata/110293.yaml
diff --git a/data/v2-pre/stigmata/110301.yaml b/data/v2/stigmata/110301.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110301.yaml
rename to data/v2/stigmata/110301.yaml
diff --git a/data/v2-pre/stigmata/110302.yaml b/data/v2/stigmata/110302.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110302.yaml
rename to data/v2/stigmata/110302.yaml
diff --git a/data/v2-pre/stigmata/110303.yaml b/data/v2/stigmata/110303.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110303.yaml
rename to data/v2/stigmata/110303.yaml
diff --git a/data/v2-pre/stigmata/110311.yaml b/data/v2/stigmata/110311.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110311.yaml
rename to data/v2/stigmata/110311.yaml
diff --git a/data/v2-pre/stigmata/110312.yaml b/data/v2/stigmata/110312.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110312.yaml
rename to data/v2/stigmata/110312.yaml
diff --git a/data/v2-pre/stigmata/110313.yaml b/data/v2/stigmata/110313.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110313.yaml
rename to data/v2/stigmata/110313.yaml
diff --git a/data/v2-pre/stigmata/110321.yaml b/data/v2/stigmata/110321.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110321.yaml
rename to data/v2/stigmata/110321.yaml
diff --git a/data/v2-pre/stigmata/110322.yaml b/data/v2/stigmata/110322.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110322.yaml
rename to data/v2/stigmata/110322.yaml
diff --git a/data/v2-pre/stigmata/110323.yaml b/data/v2/stigmata/110323.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110323.yaml
rename to data/v2/stigmata/110323.yaml
diff --git a/data/v2-pre/stigmata/110331.yaml b/data/v2/stigmata/110331.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110331.yaml
rename to data/v2/stigmata/110331.yaml
diff --git a/data/v2-pre/stigmata/110332.yaml b/data/v2/stigmata/110332.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110332.yaml
rename to data/v2/stigmata/110332.yaml
diff --git a/data/v2-pre/stigmata/110333.yaml b/data/v2/stigmata/110333.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110333.yaml
rename to data/v2/stigmata/110333.yaml
diff --git a/data/v2-pre/stigmata/110341.yaml b/data/v2/stigmata/110341.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110341.yaml
rename to data/v2/stigmata/110341.yaml
diff --git a/data/v2-pre/stigmata/110342.yaml b/data/v2/stigmata/110342.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110342.yaml
rename to data/v2/stigmata/110342.yaml
diff --git a/data/v2-pre/stigmata/110343.yaml b/data/v2/stigmata/110343.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110343.yaml
rename to data/v2/stigmata/110343.yaml
diff --git a/data/v2-pre/stigmata/110351.yaml b/data/v2/stigmata/110351.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110351.yaml
rename to data/v2/stigmata/110351.yaml
diff --git a/data/v2-pre/stigmata/110352.yaml b/data/v2/stigmata/110352.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110352.yaml
rename to data/v2/stigmata/110352.yaml
diff --git a/data/v2-pre/stigmata/110353.yaml b/data/v2/stigmata/110353.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110353.yaml
rename to data/v2/stigmata/110353.yaml
diff --git a/data/v2-pre/stigmata/110361.yaml b/data/v2/stigmata/110361.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110361.yaml
rename to data/v2/stigmata/110361.yaml
diff --git a/data/v2-pre/stigmata/110362.yaml b/data/v2/stigmata/110362.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110362.yaml
rename to data/v2/stigmata/110362.yaml
diff --git a/data/v2-pre/stigmata/110363.yaml b/data/v2/stigmata/110363.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110363.yaml
rename to data/v2/stigmata/110363.yaml
diff --git a/data/v2-pre/stigmata/110371.yaml b/data/v2/stigmata/110371.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110371.yaml
rename to data/v2/stigmata/110371.yaml
diff --git a/data/v2-pre/stigmata/110372.yaml b/data/v2/stigmata/110372.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110372.yaml
rename to data/v2/stigmata/110372.yaml
diff --git a/data/v2-pre/stigmata/110373.yaml b/data/v2/stigmata/110373.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110373.yaml
rename to data/v2/stigmata/110373.yaml
diff --git a/data/v2-pre/stigmata/110381.yaml b/data/v2/stigmata/110381.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110381.yaml
rename to data/v2/stigmata/110381.yaml
diff --git a/data/v2-pre/stigmata/110382.yaml b/data/v2/stigmata/110382.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110382.yaml
rename to data/v2/stigmata/110382.yaml
diff --git a/data/v2-pre/stigmata/110383.yaml b/data/v2/stigmata/110383.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110383.yaml
rename to data/v2/stigmata/110383.yaml
diff --git a/data/v2-pre/stigmata/110391.yaml b/data/v2/stigmata/110391.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110391.yaml
rename to data/v2/stigmata/110391.yaml
diff --git a/data/v2-pre/stigmata/110392.yaml b/data/v2/stigmata/110392.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110392.yaml
rename to data/v2/stigmata/110392.yaml
diff --git a/data/v2-pre/stigmata/110393.yaml b/data/v2/stigmata/110393.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110393.yaml
rename to data/v2/stigmata/110393.yaml
diff --git a/data/v2-pre/stigmata/110401.yaml b/data/v2/stigmata/110401.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110401.yaml
rename to data/v2/stigmata/110401.yaml
diff --git a/data/v2-pre/stigmata/110402.yaml b/data/v2/stigmata/110402.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110402.yaml
rename to data/v2/stigmata/110402.yaml
diff --git a/data/v2-pre/stigmata/110403.yaml b/data/v2/stigmata/110403.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110403.yaml
rename to data/v2/stigmata/110403.yaml
diff --git a/data/v2-pre/stigmata/110411.yaml b/data/v2/stigmata/110411.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110411.yaml
rename to data/v2/stigmata/110411.yaml
diff --git a/data/v2-pre/stigmata/110412.yaml b/data/v2/stigmata/110412.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110412.yaml
rename to data/v2/stigmata/110412.yaml
diff --git a/data/v2-pre/stigmata/110413.yaml b/data/v2/stigmata/110413.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110413.yaml
rename to data/v2/stigmata/110413.yaml
diff --git a/data/v2-pre/stigmata/110421.yaml b/data/v2/stigmata/110421.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110421.yaml
rename to data/v2/stigmata/110421.yaml
diff --git a/data/v2-pre/stigmata/110422.yaml b/data/v2/stigmata/110422.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110422.yaml
rename to data/v2/stigmata/110422.yaml
diff --git a/data/v2-pre/stigmata/110423.yaml b/data/v2/stigmata/110423.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110423.yaml
rename to data/v2/stigmata/110423.yaml
diff --git a/data/v2-pre/stigmata/110431.yaml b/data/v2/stigmata/110431.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110431.yaml
rename to data/v2/stigmata/110431.yaml
diff --git a/data/v2-pre/stigmata/110432.yaml b/data/v2/stigmata/110432.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110432.yaml
rename to data/v2/stigmata/110432.yaml
diff --git a/data/v2-pre/stigmata/110433.yaml b/data/v2/stigmata/110433.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110433.yaml
rename to data/v2/stigmata/110433.yaml
diff --git a/data/v2-pre/stigmata/110441.yaml b/data/v2/stigmata/110441.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110441.yaml
rename to data/v2/stigmata/110441.yaml
diff --git a/data/v2-pre/stigmata/110442.yaml b/data/v2/stigmata/110442.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110442.yaml
rename to data/v2/stigmata/110442.yaml
diff --git a/data/v2-pre/stigmata/110443.yaml b/data/v2/stigmata/110443.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110443.yaml
rename to data/v2/stigmata/110443.yaml
diff --git a/data/v2-pre/stigmata/110451.yaml b/data/v2/stigmata/110451.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110451.yaml
rename to data/v2/stigmata/110451.yaml
diff --git a/data/v2-pre/stigmata/110452.yaml b/data/v2/stigmata/110452.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110452.yaml
rename to data/v2/stigmata/110452.yaml
diff --git a/data/v2-pre/stigmata/110453.yaml b/data/v2/stigmata/110453.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110453.yaml
rename to data/v2/stigmata/110453.yaml
diff --git a/data/v2-pre/stigmata/110461.yaml b/data/v2/stigmata/110461.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110461.yaml
rename to data/v2/stigmata/110461.yaml
diff --git a/data/v2-pre/stigmata/110462.yaml b/data/v2/stigmata/110462.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110462.yaml
rename to data/v2/stigmata/110462.yaml
diff --git a/data/v2-pre/stigmata/110463.yaml b/data/v2/stigmata/110463.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110463.yaml
rename to data/v2/stigmata/110463.yaml
diff --git a/data/v2-pre/stigmata/110471.yaml b/data/v2/stigmata/110471.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110471.yaml
rename to data/v2/stigmata/110471.yaml
diff --git a/data/v2-pre/stigmata/110472.yaml b/data/v2/stigmata/110472.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110472.yaml
rename to data/v2/stigmata/110472.yaml
diff --git a/data/v2-pre/stigmata/110473.yaml b/data/v2/stigmata/110473.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110473.yaml
rename to data/v2/stigmata/110473.yaml
diff --git a/data/v2-pre/stigmata/110481.yaml b/data/v2/stigmata/110481.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110481.yaml
rename to data/v2/stigmata/110481.yaml
diff --git a/data/v2-pre/stigmata/110482.yaml b/data/v2/stigmata/110482.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110482.yaml
rename to data/v2/stigmata/110482.yaml
diff --git a/data/v2-pre/stigmata/110483.yaml b/data/v2/stigmata/110483.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110483.yaml
rename to data/v2/stigmata/110483.yaml
diff --git a/data/v2-pre/stigmata/110491.yaml b/data/v2/stigmata/110491.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110491.yaml
rename to data/v2/stigmata/110491.yaml
diff --git a/data/v2-pre/stigmata/110492.yaml b/data/v2/stigmata/110492.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110492.yaml
rename to data/v2/stigmata/110492.yaml
diff --git a/data/v2-pre/stigmata/110493.yaml b/data/v2/stigmata/110493.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110493.yaml
rename to data/v2/stigmata/110493.yaml
diff --git a/data/v2-pre/stigmata/110501.yaml b/data/v2/stigmata/110501.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110501.yaml
rename to data/v2/stigmata/110501.yaml
diff --git a/data/v2-pre/stigmata/110502.yaml b/data/v2/stigmata/110502.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110502.yaml
rename to data/v2/stigmata/110502.yaml
diff --git a/data/v2-pre/stigmata/110503.yaml b/data/v2/stigmata/110503.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110503.yaml
rename to data/v2/stigmata/110503.yaml
diff --git a/data/v2-pre/stigmata/110511.yaml b/data/v2/stigmata/110511.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110511.yaml
rename to data/v2/stigmata/110511.yaml
diff --git a/data/v2-pre/stigmata/110512.yaml b/data/v2/stigmata/110512.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110512.yaml
rename to data/v2/stigmata/110512.yaml
diff --git a/data/v2-pre/stigmata/110513.yaml b/data/v2/stigmata/110513.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110513.yaml
rename to data/v2/stigmata/110513.yaml
diff --git a/data/v2-pre/stigmata/110521.yaml b/data/v2/stigmata/110521.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110521.yaml
rename to data/v2/stigmata/110521.yaml
diff --git a/data/v2-pre/stigmata/110522.yaml b/data/v2/stigmata/110522.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110522.yaml
rename to data/v2/stigmata/110522.yaml
diff --git a/data/v2-pre/stigmata/110523.yaml b/data/v2/stigmata/110523.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110523.yaml
rename to data/v2/stigmata/110523.yaml
diff --git a/data/v2-pre/stigmata/110531.yaml b/data/v2/stigmata/110531.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110531.yaml
rename to data/v2/stigmata/110531.yaml
diff --git a/data/v2-pre/stigmata/110532.yaml b/data/v2/stigmata/110532.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110532.yaml
rename to data/v2/stigmata/110532.yaml
diff --git a/data/v2-pre/stigmata/110533.yaml b/data/v2/stigmata/110533.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110533.yaml
rename to data/v2/stigmata/110533.yaml
diff --git a/data/v2-pre/stigmata/110541.yaml b/data/v2/stigmata/110541.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110541.yaml
rename to data/v2/stigmata/110541.yaml
diff --git a/data/v2-pre/stigmata/110542.yaml b/data/v2/stigmata/110542.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110542.yaml
rename to data/v2/stigmata/110542.yaml
diff --git a/data/v2-pre/stigmata/110543.yaml b/data/v2/stigmata/110543.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110543.yaml
rename to data/v2/stigmata/110543.yaml
diff --git a/data/v2-pre/stigmata/110551.yaml b/data/v2/stigmata/110551.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110551.yaml
rename to data/v2/stigmata/110551.yaml
diff --git a/data/v2-pre/stigmata/110552.yaml b/data/v2/stigmata/110552.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110552.yaml
rename to data/v2/stigmata/110552.yaml
diff --git a/data/v2-pre/stigmata/110553.yaml b/data/v2/stigmata/110553.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110553.yaml
rename to data/v2/stigmata/110553.yaml
diff --git a/data/v2-pre/stigmata/110561.yaml b/data/v2/stigmata/110561.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110561.yaml
rename to data/v2/stigmata/110561.yaml
diff --git a/data/v2-pre/stigmata/110562.yaml b/data/v2/stigmata/110562.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110562.yaml
rename to data/v2/stigmata/110562.yaml
diff --git a/data/v2-pre/stigmata/110563.yaml b/data/v2/stigmata/110563.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110563.yaml
rename to data/v2/stigmata/110563.yaml
diff --git a/data/v2-pre/stigmata/110571.yaml b/data/v2/stigmata/110571.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110571.yaml
rename to data/v2/stigmata/110571.yaml
diff --git a/data/v2-pre/stigmata/110572.yaml b/data/v2/stigmata/110572.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110572.yaml
rename to data/v2/stigmata/110572.yaml
diff --git a/data/v2-pre/stigmata/110573.yaml b/data/v2/stigmata/110573.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110573.yaml
rename to data/v2/stigmata/110573.yaml
diff --git a/data/v2-pre/stigmata/110581.yaml b/data/v2/stigmata/110581.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110581.yaml
rename to data/v2/stigmata/110581.yaml
diff --git a/data/v2-pre/stigmata/110582.yaml b/data/v2/stigmata/110582.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110582.yaml
rename to data/v2/stigmata/110582.yaml
diff --git a/data/v2-pre/stigmata/110583.yaml b/data/v2/stigmata/110583.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110583.yaml
rename to data/v2/stigmata/110583.yaml
diff --git a/data/v2-pre/stigmata/110591.yaml b/data/v2/stigmata/110591.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110591.yaml
rename to data/v2/stigmata/110591.yaml
diff --git a/data/v2-pre/stigmata/110592.yaml b/data/v2/stigmata/110592.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110592.yaml
rename to data/v2/stigmata/110592.yaml
diff --git a/data/v2-pre/stigmata/110593.yaml b/data/v2/stigmata/110593.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110593.yaml
rename to data/v2/stigmata/110593.yaml
diff --git a/data/v2-pre/stigmata/110601.yaml b/data/v2/stigmata/110601.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110601.yaml
rename to data/v2/stigmata/110601.yaml
diff --git a/data/v2-pre/stigmata/110602.yaml b/data/v2/stigmata/110602.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110602.yaml
rename to data/v2/stigmata/110602.yaml
diff --git a/data/v2-pre/stigmata/110603.yaml b/data/v2/stigmata/110603.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110603.yaml
rename to data/v2/stigmata/110603.yaml
diff --git a/data/v2-pre/stigmata/110611.yaml b/data/v2/stigmata/110611.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110611.yaml
rename to data/v2/stigmata/110611.yaml
diff --git a/data/v2-pre/stigmata/110612.yaml b/data/v2/stigmata/110612.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110612.yaml
rename to data/v2/stigmata/110612.yaml
diff --git a/data/v2-pre/stigmata/110613.yaml b/data/v2/stigmata/110613.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110613.yaml
rename to data/v2/stigmata/110613.yaml
diff --git a/data/v2-pre/stigmata/110621.yaml b/data/v2/stigmata/110621.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110621.yaml
rename to data/v2/stigmata/110621.yaml
diff --git a/data/v2-pre/stigmata/110622.yaml b/data/v2/stigmata/110622.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110622.yaml
rename to data/v2/stigmata/110622.yaml
diff --git a/data/v2-pre/stigmata/110623.yaml b/data/v2/stigmata/110623.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110623.yaml
rename to data/v2/stigmata/110623.yaml
diff --git a/data/v2-pre/stigmata/110631.yaml b/data/v2/stigmata/110631.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110631.yaml
rename to data/v2/stigmata/110631.yaml
diff --git a/data/v2-pre/stigmata/110632.yaml b/data/v2/stigmata/110632.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110632.yaml
rename to data/v2/stigmata/110632.yaml
diff --git a/data/v2-pre/stigmata/110633.yaml b/data/v2/stigmata/110633.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110633.yaml
rename to data/v2/stigmata/110633.yaml
diff --git a/data/v2-pre/stigmata/110641.yaml b/data/v2/stigmata/110641.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110641.yaml
rename to data/v2/stigmata/110641.yaml
diff --git a/data/v2-pre/stigmata/110642.yaml b/data/v2/stigmata/110642.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110642.yaml
rename to data/v2/stigmata/110642.yaml
diff --git a/data/v2-pre/stigmata/110643.yaml b/data/v2/stigmata/110643.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110643.yaml
rename to data/v2/stigmata/110643.yaml
diff --git a/data/v2-pre/stigmata/110651.yaml b/data/v2/stigmata/110651.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110651.yaml
rename to data/v2/stigmata/110651.yaml
diff --git a/data/v2-pre/stigmata/110652.yaml b/data/v2/stigmata/110652.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110652.yaml
rename to data/v2/stigmata/110652.yaml
diff --git a/data/v2-pre/stigmata/110653.yaml b/data/v2/stigmata/110653.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110653.yaml
rename to data/v2/stigmata/110653.yaml
diff --git a/data/v2-pre/stigmata/110661.yaml b/data/v2/stigmata/110661.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110661.yaml
rename to data/v2/stigmata/110661.yaml
diff --git a/data/v2-pre/stigmata/110662.yaml b/data/v2/stigmata/110662.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110662.yaml
rename to data/v2/stigmata/110662.yaml
diff --git a/data/v2-pre/stigmata/110663.yaml b/data/v2/stigmata/110663.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110663.yaml
rename to data/v2/stigmata/110663.yaml
diff --git a/data/v2-pre/stigmata/110671.yaml b/data/v2/stigmata/110671.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110671.yaml
rename to data/v2/stigmata/110671.yaml
diff --git a/data/v2-pre/stigmata/110672.yaml b/data/v2/stigmata/110672.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110672.yaml
rename to data/v2/stigmata/110672.yaml
diff --git a/data/v2-pre/stigmata/110673.yaml b/data/v2/stigmata/110673.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110673.yaml
rename to data/v2/stigmata/110673.yaml
diff --git a/data/v2-pre/stigmata/110681.yaml b/data/v2/stigmata/110681.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110681.yaml
rename to data/v2/stigmata/110681.yaml
diff --git a/data/v2-pre/stigmata/110682.yaml b/data/v2/stigmata/110682.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110682.yaml
rename to data/v2/stigmata/110682.yaml
diff --git a/data/v2-pre/stigmata/110683.yaml b/data/v2/stigmata/110683.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110683.yaml
rename to data/v2/stigmata/110683.yaml
diff --git a/data/v2-pre/stigmata/110691.yaml b/data/v2/stigmata/110691.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110691.yaml
rename to data/v2/stigmata/110691.yaml
diff --git a/data/v2-pre/stigmata/110692.yaml b/data/v2/stigmata/110692.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110692.yaml
rename to data/v2/stigmata/110692.yaml
diff --git a/data/v2-pre/stigmata/110693.yaml b/data/v2/stigmata/110693.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110693.yaml
rename to data/v2/stigmata/110693.yaml
diff --git a/data/v2-pre/stigmata/110701.yaml b/data/v2/stigmata/110701.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110701.yaml
rename to data/v2/stigmata/110701.yaml
diff --git a/data/v2-pre/stigmata/110702.yaml b/data/v2/stigmata/110702.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110702.yaml
rename to data/v2/stigmata/110702.yaml
diff --git a/data/v2-pre/stigmata/110703.yaml b/data/v2/stigmata/110703.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110703.yaml
rename to data/v2/stigmata/110703.yaml
diff --git a/data/v2-pre/stigmata/110711.yaml b/data/v2/stigmata/110711.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110711.yaml
rename to data/v2/stigmata/110711.yaml
diff --git a/data/v2-pre/stigmata/110712.yaml b/data/v2/stigmata/110712.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110712.yaml
rename to data/v2/stigmata/110712.yaml
diff --git a/data/v2-pre/stigmata/110713.yaml b/data/v2/stigmata/110713.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110713.yaml
rename to data/v2/stigmata/110713.yaml
diff --git a/data/v2-pre/stigmata/110721.yaml b/data/v2/stigmata/110721.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110721.yaml
rename to data/v2/stigmata/110721.yaml
diff --git a/data/v2-pre/stigmata/110722.yaml b/data/v2/stigmata/110722.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110722.yaml
rename to data/v2/stigmata/110722.yaml
diff --git a/data/v2-pre/stigmata/110723.yaml b/data/v2/stigmata/110723.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110723.yaml
rename to data/v2/stigmata/110723.yaml
diff --git a/data/v2-pre/stigmata/110731.yaml b/data/v2/stigmata/110731.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110731.yaml
rename to data/v2/stigmata/110731.yaml
diff --git a/data/v2-pre/stigmata/110732.yaml b/data/v2/stigmata/110732.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110732.yaml
rename to data/v2/stigmata/110732.yaml
diff --git a/data/v2-pre/stigmata/110733.yaml b/data/v2/stigmata/110733.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110733.yaml
rename to data/v2/stigmata/110733.yaml
diff --git a/data/v2-pre/stigmata/110741.yaml b/data/v2/stigmata/110741.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110741.yaml
rename to data/v2/stigmata/110741.yaml
diff --git a/data/v2-pre/stigmata/110742.yaml b/data/v2/stigmata/110742.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110742.yaml
rename to data/v2/stigmata/110742.yaml
diff --git a/data/v2-pre/stigmata/110743.yaml b/data/v2/stigmata/110743.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110743.yaml
rename to data/v2/stigmata/110743.yaml
diff --git a/data/v2-pre/stigmata/110751.yaml b/data/v2/stigmata/110751.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110751.yaml
rename to data/v2/stigmata/110751.yaml
diff --git a/data/v2-pre/stigmata/110752.yaml b/data/v2/stigmata/110752.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110752.yaml
rename to data/v2/stigmata/110752.yaml
diff --git a/data/v2-pre/stigmata/110753.yaml b/data/v2/stigmata/110753.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110753.yaml
rename to data/v2/stigmata/110753.yaml
diff --git a/data/v2-pre/stigmata/110761.yaml b/data/v2/stigmata/110761.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110761.yaml
rename to data/v2/stigmata/110761.yaml
diff --git a/data/v2-pre/stigmata/110762.yaml b/data/v2/stigmata/110762.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110762.yaml
rename to data/v2/stigmata/110762.yaml
diff --git a/data/v2-pre/stigmata/110763.yaml b/data/v2/stigmata/110763.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110763.yaml
rename to data/v2/stigmata/110763.yaml
diff --git a/data/v2-pre/stigmata/110771.yaml b/data/v2/stigmata/110771.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110771.yaml
rename to data/v2/stigmata/110771.yaml
diff --git a/data/v2-pre/stigmata/110772.yaml b/data/v2/stigmata/110772.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110772.yaml
rename to data/v2/stigmata/110772.yaml
diff --git a/data/v2-pre/stigmata/110773.yaml b/data/v2/stigmata/110773.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110773.yaml
rename to data/v2/stigmata/110773.yaml
diff --git a/data/v2-pre/stigmata/110781.yaml b/data/v2/stigmata/110781.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110781.yaml
rename to data/v2/stigmata/110781.yaml
diff --git a/data/v2-pre/stigmata/110782.yaml b/data/v2/stigmata/110782.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110782.yaml
rename to data/v2/stigmata/110782.yaml
diff --git a/data/v2-pre/stigmata/110783.yaml b/data/v2/stigmata/110783.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110783.yaml
rename to data/v2/stigmata/110783.yaml
diff --git a/data/v2-pre/stigmata/110791.yaml b/data/v2/stigmata/110791.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110791.yaml
rename to data/v2/stigmata/110791.yaml
diff --git a/data/v2-pre/stigmata/110792.yaml b/data/v2/stigmata/110792.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110792.yaml
rename to data/v2/stigmata/110792.yaml
diff --git a/data/v2-pre/stigmata/110793.yaml b/data/v2/stigmata/110793.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110793.yaml
rename to data/v2/stigmata/110793.yaml
diff --git a/data/v2-pre/stigmata/110801.yaml b/data/v2/stigmata/110801.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110801.yaml
rename to data/v2/stigmata/110801.yaml
diff --git a/data/v2-pre/stigmata/110802.yaml b/data/v2/stigmata/110802.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110802.yaml
rename to data/v2/stigmata/110802.yaml
diff --git a/data/v2-pre/stigmata/110803.yaml b/data/v2/stigmata/110803.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110803.yaml
rename to data/v2/stigmata/110803.yaml
diff --git a/data/v2-pre/stigmata/110811.yaml b/data/v2/stigmata/110811.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110811.yaml
rename to data/v2/stigmata/110811.yaml
diff --git a/data/v2-pre/stigmata/110812.yaml b/data/v2/stigmata/110812.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110812.yaml
rename to data/v2/stigmata/110812.yaml
diff --git a/data/v2-pre/stigmata/110813.yaml b/data/v2/stigmata/110813.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110813.yaml
rename to data/v2/stigmata/110813.yaml
diff --git a/data/v2-pre/stigmata/110821.yaml b/data/v2/stigmata/110821.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110821.yaml
rename to data/v2/stigmata/110821.yaml
diff --git a/data/v2-pre/stigmata/110822.yaml b/data/v2/stigmata/110822.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110822.yaml
rename to data/v2/stigmata/110822.yaml
diff --git a/data/v2-pre/stigmata/110823.yaml b/data/v2/stigmata/110823.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110823.yaml
rename to data/v2/stigmata/110823.yaml
diff --git a/data/v2-pre/stigmata/110831.yaml b/data/v2/stigmata/110831.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110831.yaml
rename to data/v2/stigmata/110831.yaml
diff --git a/data/v2-pre/stigmata/110832.yaml b/data/v2/stigmata/110832.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110832.yaml
rename to data/v2/stigmata/110832.yaml
diff --git a/data/v2-pre/stigmata/110833.yaml b/data/v2/stigmata/110833.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110833.yaml
rename to data/v2/stigmata/110833.yaml
diff --git a/data/v2-pre/stigmata/110841.yaml b/data/v2/stigmata/110841.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110841.yaml
rename to data/v2/stigmata/110841.yaml
diff --git a/data/v2-pre/stigmata/110842.yaml b/data/v2/stigmata/110842.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110842.yaml
rename to data/v2/stigmata/110842.yaml
diff --git a/data/v2-pre/stigmata/110843.yaml b/data/v2/stigmata/110843.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110843.yaml
rename to data/v2/stigmata/110843.yaml
diff --git a/data/v2-pre/stigmata/110851.yaml b/data/v2/stigmata/110851.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110851.yaml
rename to data/v2/stigmata/110851.yaml
diff --git a/data/v2-pre/stigmata/110852.yaml b/data/v2/stigmata/110852.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110852.yaml
rename to data/v2/stigmata/110852.yaml
diff --git a/data/v2-pre/stigmata/110853.yaml b/data/v2/stigmata/110853.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110853.yaml
rename to data/v2/stigmata/110853.yaml
diff --git a/data/v2-pre/stigmata/110861.yaml b/data/v2/stigmata/110861.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110861.yaml
rename to data/v2/stigmata/110861.yaml
diff --git a/data/v2-pre/stigmata/110862.yaml b/data/v2/stigmata/110862.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110862.yaml
rename to data/v2/stigmata/110862.yaml
diff --git a/data/v2-pre/stigmata/110863.yaml b/data/v2/stigmata/110863.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110863.yaml
rename to data/v2/stigmata/110863.yaml
diff --git a/data/v2-pre/stigmata/110871.yaml b/data/v2/stigmata/110871.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110871.yaml
rename to data/v2/stigmata/110871.yaml
diff --git a/data/v2-pre/stigmata/110872.yaml b/data/v2/stigmata/110872.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110872.yaml
rename to data/v2/stigmata/110872.yaml
diff --git a/data/v2-pre/stigmata/110873.yaml b/data/v2/stigmata/110873.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110873.yaml
rename to data/v2/stigmata/110873.yaml
diff --git a/data/v2-pre/stigmata/110881.yaml b/data/v2/stigmata/110881.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110881.yaml
rename to data/v2/stigmata/110881.yaml
diff --git a/data/v2-pre/stigmata/110882.yaml b/data/v2/stigmata/110882.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110882.yaml
rename to data/v2/stigmata/110882.yaml
diff --git a/data/v2-pre/stigmata/110883.yaml b/data/v2/stigmata/110883.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110883.yaml
rename to data/v2/stigmata/110883.yaml
diff --git a/data/v2-pre/stigmata/110891.yaml b/data/v2/stigmata/110891.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110891.yaml
rename to data/v2/stigmata/110891.yaml
diff --git a/data/v2-pre/stigmata/110892.yaml b/data/v2/stigmata/110892.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110892.yaml
rename to data/v2/stigmata/110892.yaml
diff --git a/data/v2-pre/stigmata/110893.yaml b/data/v2/stigmata/110893.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110893.yaml
rename to data/v2/stigmata/110893.yaml
diff --git a/data/v2-pre/stigmata/110903.yaml b/data/v2/stigmata/110903.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110903.yaml
rename to data/v2/stigmata/110903.yaml
diff --git a/data/v2-pre/stigmata/110911.yaml b/data/v2/stigmata/110911.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110911.yaml
rename to data/v2/stigmata/110911.yaml
diff --git a/data/v2-pre/stigmata/110912.yaml b/data/v2/stigmata/110912.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110912.yaml
rename to data/v2/stigmata/110912.yaml
diff --git a/data/v2-pre/stigmata/110913.yaml b/data/v2/stigmata/110913.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110913.yaml
rename to data/v2/stigmata/110913.yaml
diff --git a/data/v2-pre/stigmata/110921.yaml b/data/v2/stigmata/110921.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110921.yaml
rename to data/v2/stigmata/110921.yaml
diff --git a/data/v2-pre/stigmata/110922.yaml b/data/v2/stigmata/110922.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110922.yaml
rename to data/v2/stigmata/110922.yaml
diff --git a/data/v2-pre/stigmata/110923.yaml b/data/v2/stigmata/110923.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110923.yaml
rename to data/v2/stigmata/110923.yaml
diff --git a/data/v2-pre/stigmata/110931.yaml b/data/v2/stigmata/110931.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110931.yaml
rename to data/v2/stigmata/110931.yaml
diff --git a/data/v2-pre/stigmata/110932.yaml b/data/v2/stigmata/110932.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110932.yaml
rename to data/v2/stigmata/110932.yaml
diff --git a/data/v2-pre/stigmata/110933.yaml b/data/v2/stigmata/110933.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110933.yaml
rename to data/v2/stigmata/110933.yaml
diff --git a/data/v2-pre/stigmata/110941.yaml b/data/v2/stigmata/110941.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110941.yaml
rename to data/v2/stigmata/110941.yaml
diff --git a/data/v2-pre/stigmata/110942.yaml b/data/v2/stigmata/110942.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110942.yaml
rename to data/v2/stigmata/110942.yaml
diff --git a/data/v2-pre/stigmata/110943.yaml b/data/v2/stigmata/110943.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110943.yaml
rename to data/v2/stigmata/110943.yaml
diff --git a/data/v2-pre/stigmata/110951.yaml b/data/v2/stigmata/110951.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110951.yaml
rename to data/v2/stigmata/110951.yaml
diff --git a/data/v2-pre/stigmata/110952.yaml b/data/v2/stigmata/110952.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110952.yaml
rename to data/v2/stigmata/110952.yaml
diff --git a/data/v2-pre/stigmata/110953.yaml b/data/v2/stigmata/110953.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110953.yaml
rename to data/v2/stigmata/110953.yaml
diff --git a/data/v2-pre/stigmata/110961.yaml b/data/v2/stigmata/110961.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110961.yaml
rename to data/v2/stigmata/110961.yaml
diff --git a/data/v2-pre/stigmata/110962.yaml b/data/v2/stigmata/110962.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110962.yaml
rename to data/v2/stigmata/110962.yaml
diff --git a/data/v2-pre/stigmata/110963.yaml b/data/v2/stigmata/110963.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110963.yaml
rename to data/v2/stigmata/110963.yaml
diff --git a/data/v2-pre/stigmata/110971.yaml b/data/v2/stigmata/110971.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110971.yaml
rename to data/v2/stigmata/110971.yaml
diff --git a/data/v2-pre/stigmata/110972.yaml b/data/v2/stigmata/110972.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110972.yaml
rename to data/v2/stigmata/110972.yaml
diff --git a/data/v2-pre/stigmata/110973.yaml b/data/v2/stigmata/110973.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110973.yaml
rename to data/v2/stigmata/110973.yaml
diff --git a/data/v2-pre/stigmata/110981.yaml b/data/v2/stigmata/110981.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110981.yaml
rename to data/v2/stigmata/110981.yaml
diff --git a/data/v2-pre/stigmata/110982.yaml b/data/v2/stigmata/110982.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110982.yaml
rename to data/v2/stigmata/110982.yaml
diff --git a/data/v2-pre/stigmata/110983.yaml b/data/v2/stigmata/110983.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110983.yaml
rename to data/v2/stigmata/110983.yaml
diff --git a/data/v2-pre/stigmata/110991.yaml b/data/v2/stigmata/110991.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110991.yaml
rename to data/v2/stigmata/110991.yaml
diff --git a/data/v2-pre/stigmata/110992.yaml b/data/v2/stigmata/110992.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110992.yaml
rename to data/v2/stigmata/110992.yaml
diff --git a/data/v2-pre/stigmata/110993.yaml b/data/v2/stigmata/110993.yaml
similarity index 100%
rename from data/v2-pre/stigmata/110993.yaml
rename to data/v2/stigmata/110993.yaml
diff --git a/data/v2-pre/stigmata/111001.yaml b/data/v2/stigmata/111001.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111001.yaml
rename to data/v2/stigmata/111001.yaml
diff --git a/data/v2-pre/stigmata/111002.yaml b/data/v2/stigmata/111002.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111002.yaml
rename to data/v2/stigmata/111002.yaml
diff --git a/data/v2-pre/stigmata/111003.yaml b/data/v2/stigmata/111003.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111003.yaml
rename to data/v2/stigmata/111003.yaml
diff --git a/data/v2-pre/stigmata/111011.yaml b/data/v2/stigmata/111011.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111011.yaml
rename to data/v2/stigmata/111011.yaml
diff --git a/data/v2-pre/stigmata/111012.yaml b/data/v2/stigmata/111012.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111012.yaml
rename to data/v2/stigmata/111012.yaml
diff --git a/data/v2-pre/stigmata/111013.yaml b/data/v2/stigmata/111013.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111013.yaml
rename to data/v2/stigmata/111013.yaml
diff --git a/data/v2-pre/stigmata/111021.yaml b/data/v2/stigmata/111021.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111021.yaml
rename to data/v2/stigmata/111021.yaml
diff --git a/data/v2-pre/stigmata/111022.yaml b/data/v2/stigmata/111022.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111022.yaml
rename to data/v2/stigmata/111022.yaml
diff --git a/data/v2-pre/stigmata/111023.yaml b/data/v2/stigmata/111023.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111023.yaml
rename to data/v2/stigmata/111023.yaml
diff --git a/data/v2-pre/stigmata/111031.yaml b/data/v2/stigmata/111031.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111031.yaml
rename to data/v2/stigmata/111031.yaml
diff --git a/data/v2-pre/stigmata/111032.yaml b/data/v2/stigmata/111032.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111032.yaml
rename to data/v2/stigmata/111032.yaml
diff --git a/data/v2-pre/stigmata/111033.yaml b/data/v2/stigmata/111033.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111033.yaml
rename to data/v2/stigmata/111033.yaml
diff --git a/data/v2-pre/stigmata/111034.yaml b/data/v2/stigmata/111034.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111034.yaml
rename to data/v2/stigmata/111034.yaml
diff --git a/data/v2-pre/stigmata/111035.yaml b/data/v2/stigmata/111035.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111035.yaml
rename to data/v2/stigmata/111035.yaml
diff --git a/data/v2-pre/stigmata/111036.yaml b/data/v2/stigmata/111036.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111036.yaml
rename to data/v2/stigmata/111036.yaml
diff --git a/data/v2-pre/stigmata/111037.yaml b/data/v2/stigmata/111037.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111037.yaml
rename to data/v2/stigmata/111037.yaml
diff --git a/data/v2-pre/stigmata/111038.yaml b/data/v2/stigmata/111038.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111038.yaml
rename to data/v2/stigmata/111038.yaml
diff --git a/data/v2-pre/stigmata/111039.yaml b/data/v2/stigmata/111039.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111039.yaml
rename to data/v2/stigmata/111039.yaml
diff --git a/data/v2-pre/stigmata/111040.yaml b/data/v2/stigmata/111040.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111040.yaml
rename to data/v2/stigmata/111040.yaml
diff --git a/data/v2-pre/stigmata/111041.yaml b/data/v2/stigmata/111041.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111041.yaml
rename to data/v2/stigmata/111041.yaml
diff --git a/data/v2-pre/stigmata/111042.yaml b/data/v2/stigmata/111042.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111042.yaml
rename to data/v2/stigmata/111042.yaml
diff --git a/data/v2-pre/stigmata/111043.yaml b/data/v2/stigmata/111043.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111043.yaml
rename to data/v2/stigmata/111043.yaml
diff --git a/data/v2-pre/stigmata/111044.yaml b/data/v2/stigmata/111044.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111044.yaml
rename to data/v2/stigmata/111044.yaml
diff --git a/data/v2-pre/stigmata/111045.yaml b/data/v2/stigmata/111045.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111045.yaml
rename to data/v2/stigmata/111045.yaml
diff --git a/data/v2-pre/stigmata/111046.yaml b/data/v2/stigmata/111046.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111046.yaml
rename to data/v2/stigmata/111046.yaml
diff --git a/data/v2-pre/stigmata/111047.yaml b/data/v2/stigmata/111047.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111047.yaml
rename to data/v2/stigmata/111047.yaml
diff --git a/data/v2-pre/stigmata/111048.yaml b/data/v2/stigmata/111048.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111048.yaml
rename to data/v2/stigmata/111048.yaml
diff --git a/data/v2-pre/stigmata/111049.yaml b/data/v2/stigmata/111049.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111049.yaml
rename to data/v2/stigmata/111049.yaml
diff --git a/data/v2-pre/stigmata/111050.yaml b/data/v2/stigmata/111050.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111050.yaml
rename to data/v2/stigmata/111050.yaml
diff --git a/data/v2-pre/stigmata/111051.yaml b/data/v2/stigmata/111051.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111051.yaml
rename to data/v2/stigmata/111051.yaml
diff --git a/data/v2-pre/stigmata/111052.yaml b/data/v2/stigmata/111052.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111052.yaml
rename to data/v2/stigmata/111052.yaml
diff --git a/data/v2-pre/stigmata/111053.yaml b/data/v2/stigmata/111053.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111053.yaml
rename to data/v2/stigmata/111053.yaml
diff --git a/data/v2-pre/stigmata/111054.yaml b/data/v2/stigmata/111054.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111054.yaml
rename to data/v2/stigmata/111054.yaml
diff --git a/data/v2-pre/stigmata/111055.yaml b/data/v2/stigmata/111055.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111055.yaml
rename to data/v2/stigmata/111055.yaml
diff --git a/data/v2-pre/stigmata/111056.yaml b/data/v2/stigmata/111056.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111056.yaml
rename to data/v2/stigmata/111056.yaml
diff --git a/data/v2-pre/stigmata/111057.yaml b/data/v2/stigmata/111057.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111057.yaml
rename to data/v2/stigmata/111057.yaml
diff --git a/data/v2-pre/stigmata/111058.yaml b/data/v2/stigmata/111058.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111058.yaml
rename to data/v2/stigmata/111058.yaml
diff --git a/data/v2-pre/stigmata/111059.yaml b/data/v2/stigmata/111059.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111059.yaml
rename to data/v2/stigmata/111059.yaml
diff --git a/data/v2-pre/stigmata/111060.yaml b/data/v2/stigmata/111060.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111060.yaml
rename to data/v2/stigmata/111060.yaml
diff --git a/data/v2-pre/stigmata/111061.yaml b/data/v2/stigmata/111061.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111061.yaml
rename to data/v2/stigmata/111061.yaml
diff --git a/data/v2-pre/stigmata/111062.yaml b/data/v2/stigmata/111062.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111062.yaml
rename to data/v2/stigmata/111062.yaml
diff --git a/data/v2-pre/stigmata/111063.yaml b/data/v2/stigmata/111063.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111063.yaml
rename to data/v2/stigmata/111063.yaml
diff --git a/data/v2-pre/stigmata/111064.yaml b/data/v2/stigmata/111064.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111064.yaml
rename to data/v2/stigmata/111064.yaml
diff --git a/data/v2-pre/stigmata/111065.yaml b/data/v2/stigmata/111065.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111065.yaml
rename to data/v2/stigmata/111065.yaml
diff --git a/data/v2-pre/stigmata/111066.yaml b/data/v2/stigmata/111066.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111066.yaml
rename to data/v2/stigmata/111066.yaml
diff --git a/data/v2-pre/stigmata/111067.yaml b/data/v2/stigmata/111067.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111067.yaml
rename to data/v2/stigmata/111067.yaml
diff --git a/data/v2-pre/stigmata/111068.yaml b/data/v2/stigmata/111068.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111068.yaml
rename to data/v2/stigmata/111068.yaml
diff --git a/data/v2-pre/stigmata/111069.yaml b/data/v2/stigmata/111069.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111069.yaml
rename to data/v2/stigmata/111069.yaml
diff --git a/data/v2-pre/stigmata/111070.yaml b/data/v2/stigmata/111070.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111070.yaml
rename to data/v2/stigmata/111070.yaml
diff --git a/data/v2-pre/stigmata/111071.yaml b/data/v2/stigmata/111071.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111071.yaml
rename to data/v2/stigmata/111071.yaml
diff --git a/data/v2-pre/stigmata/111072.yaml b/data/v2/stigmata/111072.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111072.yaml
rename to data/v2/stigmata/111072.yaml
diff --git a/data/v2-pre/stigmata/111073.yaml b/data/v2/stigmata/111073.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111073.yaml
rename to data/v2/stigmata/111073.yaml
diff --git a/data/v2-pre/stigmata/111074.yaml b/data/v2/stigmata/111074.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111074.yaml
rename to data/v2/stigmata/111074.yaml
diff --git a/data/v2-pre/stigmata/111075.yaml b/data/v2/stigmata/111075.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111075.yaml
rename to data/v2/stigmata/111075.yaml
diff --git a/data/v2-pre/stigmata/111076.yaml b/data/v2/stigmata/111076.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111076.yaml
rename to data/v2/stigmata/111076.yaml
diff --git a/data/v2-pre/stigmata/111077.yaml b/data/v2/stigmata/111077.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111077.yaml
rename to data/v2/stigmata/111077.yaml
diff --git a/data/v2-pre/stigmata/111078.yaml b/data/v2/stigmata/111078.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111078.yaml
rename to data/v2/stigmata/111078.yaml
diff --git a/data/v2-pre/stigmata/111079.yaml b/data/v2/stigmata/111079.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111079.yaml
rename to data/v2/stigmata/111079.yaml
diff --git a/data/v2-pre/stigmata/111080.yaml b/data/v2/stigmata/111080.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111080.yaml
rename to data/v2/stigmata/111080.yaml
diff --git a/data/v2-pre/stigmata/111081.yaml b/data/v2/stigmata/111081.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111081.yaml
rename to data/v2/stigmata/111081.yaml
diff --git a/data/v2-pre/stigmata/111082.yaml b/data/v2/stigmata/111082.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111082.yaml
rename to data/v2/stigmata/111082.yaml
diff --git a/data/v2-pre/stigmata/111083.yaml b/data/v2/stigmata/111083.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111083.yaml
rename to data/v2/stigmata/111083.yaml
diff --git a/data/v2-pre/stigmata/111084.yaml b/data/v2/stigmata/111084.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111084.yaml
rename to data/v2/stigmata/111084.yaml
diff --git a/data/v2-pre/stigmata/111085.yaml b/data/v2/stigmata/111085.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111085.yaml
rename to data/v2/stigmata/111085.yaml
diff --git a/data/v2-pre/stigmata/111086.yaml b/data/v2/stigmata/111086.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111086.yaml
rename to data/v2/stigmata/111086.yaml
diff --git a/data/v2-pre/stigmata/111087.yaml b/data/v2/stigmata/111087.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111087.yaml
rename to data/v2/stigmata/111087.yaml
diff --git a/data/v2-pre/stigmata/111088.yaml b/data/v2/stigmata/111088.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111088.yaml
rename to data/v2/stigmata/111088.yaml
diff --git a/data/v2-pre/stigmata/111089.yaml b/data/v2/stigmata/111089.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111089.yaml
rename to data/v2/stigmata/111089.yaml
diff --git a/data/v2-pre/stigmata/111090.yaml b/data/v2/stigmata/111090.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111090.yaml
rename to data/v2/stigmata/111090.yaml
diff --git a/data/v2-pre/stigmata/111091.yaml b/data/v2/stigmata/111091.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111091.yaml
rename to data/v2/stigmata/111091.yaml
diff --git a/data/v2-pre/stigmata/111092.yaml b/data/v2/stigmata/111092.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111092.yaml
rename to data/v2/stigmata/111092.yaml
diff --git a/data/v2-pre/stigmata/111093.yaml b/data/v2/stigmata/111093.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111093.yaml
rename to data/v2/stigmata/111093.yaml
diff --git a/data/v2-pre/stigmata/111094.yaml b/data/v2/stigmata/111094.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111094.yaml
rename to data/v2/stigmata/111094.yaml
diff --git a/data/v2-pre/stigmata/111095.yaml b/data/v2/stigmata/111095.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111095.yaml
rename to data/v2/stigmata/111095.yaml
diff --git a/data/v2-pre/stigmata/111096.yaml b/data/v2/stigmata/111096.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111096.yaml
rename to data/v2/stigmata/111096.yaml
diff --git a/data/v2-pre/stigmata/111097.yaml b/data/v2/stigmata/111097.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111097.yaml
rename to data/v2/stigmata/111097.yaml
diff --git a/data/v2-pre/stigmata/111098.yaml b/data/v2/stigmata/111098.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111098.yaml
rename to data/v2/stigmata/111098.yaml
diff --git a/data/v2-pre/stigmata/111099.yaml b/data/v2/stigmata/111099.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111099.yaml
rename to data/v2/stigmata/111099.yaml
diff --git a/data/v2-pre/stigmata/111100.yaml b/data/v2/stigmata/111100.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111100.yaml
rename to data/v2/stigmata/111100.yaml
diff --git a/data/v2-pre/stigmata/111101.yaml b/data/v2/stigmata/111101.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111101.yaml
rename to data/v2/stigmata/111101.yaml
diff --git a/data/v2-pre/stigmata/111102.yaml b/data/v2/stigmata/111102.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111102.yaml
rename to data/v2/stigmata/111102.yaml
diff --git a/data/v2-pre/stigmata/111103.yaml b/data/v2/stigmata/111103.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111103.yaml
rename to data/v2/stigmata/111103.yaml
diff --git a/data/v2-pre/stigmata/111104.yaml b/data/v2/stigmata/111104.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111104.yaml
rename to data/v2/stigmata/111104.yaml
diff --git a/data/v2-pre/stigmata/111105.yaml b/data/v2/stigmata/111105.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111105.yaml
rename to data/v2/stigmata/111105.yaml
diff --git a/data/v2-pre/stigmata/111106.yaml b/data/v2/stigmata/111106.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111106.yaml
rename to data/v2/stigmata/111106.yaml
diff --git a/data/v2-pre/stigmata/111107.yaml b/data/v2/stigmata/111107.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111107.yaml
rename to data/v2/stigmata/111107.yaml
diff --git a/data/v2-pre/stigmata/111108.yaml b/data/v2/stigmata/111108.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111108.yaml
rename to data/v2/stigmata/111108.yaml
diff --git a/data/v2-pre/stigmata/111109.yaml b/data/v2/stigmata/111109.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111109.yaml
rename to data/v2/stigmata/111109.yaml
diff --git a/data/v2-pre/stigmata/111110.yaml b/data/v2/stigmata/111110.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111110.yaml
rename to data/v2/stigmata/111110.yaml
diff --git a/data/v2-pre/stigmata/111111.yaml b/data/v2/stigmata/111111.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111111.yaml
rename to data/v2/stigmata/111111.yaml
diff --git a/data/v2-pre/stigmata/111112.yaml b/data/v2/stigmata/111112.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111112.yaml
rename to data/v2/stigmata/111112.yaml
diff --git a/data/v2-pre/stigmata/111113.yaml b/data/v2/stigmata/111113.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111113.yaml
rename to data/v2/stigmata/111113.yaml
diff --git a/data/v2-pre/stigmata/111114.yaml b/data/v2/stigmata/111114.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111114.yaml
rename to data/v2/stigmata/111114.yaml
diff --git a/data/v2-pre/stigmata/111115.yaml b/data/v2/stigmata/111115.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111115.yaml
rename to data/v2/stigmata/111115.yaml
diff --git a/data/v2-pre/stigmata/111116.yaml b/data/v2/stigmata/111116.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111116.yaml
rename to data/v2/stigmata/111116.yaml
diff --git a/data/v2-pre/stigmata/111117.yaml b/data/v2/stigmata/111117.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111117.yaml
rename to data/v2/stigmata/111117.yaml
diff --git a/data/v2-pre/stigmata/111118.yaml b/data/v2/stigmata/111118.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111118.yaml
rename to data/v2/stigmata/111118.yaml
diff --git a/data/v2-pre/stigmata/111119.yaml b/data/v2/stigmata/111119.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111119.yaml
rename to data/v2/stigmata/111119.yaml
diff --git a/data/v2-pre/stigmata/111120.yaml b/data/v2/stigmata/111120.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111120.yaml
rename to data/v2/stigmata/111120.yaml
diff --git a/data/v2-pre/stigmata/111121.yaml b/data/v2/stigmata/111121.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111121.yaml
rename to data/v2/stigmata/111121.yaml
diff --git a/data/v2-pre/stigmata/111122.yaml b/data/v2/stigmata/111122.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111122.yaml
rename to data/v2/stigmata/111122.yaml
diff --git a/data/v2-pre/stigmata/111123.yaml b/data/v2/stigmata/111123.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111123.yaml
rename to data/v2/stigmata/111123.yaml
diff --git a/data/v2-pre/stigmata/111124.yaml b/data/v2/stigmata/111124.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111124.yaml
rename to data/v2/stigmata/111124.yaml
diff --git a/data/v2-pre/stigmata/111125.yaml b/data/v2/stigmata/111125.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111125.yaml
rename to data/v2/stigmata/111125.yaml
diff --git a/data/v2-pre/stigmata/111126.yaml b/data/v2/stigmata/111126.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111126.yaml
rename to data/v2/stigmata/111126.yaml
diff --git a/data/v2-pre/stigmata/111127.yaml b/data/v2/stigmata/111127.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111127.yaml
rename to data/v2/stigmata/111127.yaml
diff --git a/data/v2-pre/stigmata/111128.yaml b/data/v2/stigmata/111128.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111128.yaml
rename to data/v2/stigmata/111128.yaml
diff --git a/data/v2-pre/stigmata/111129.yaml b/data/v2/stigmata/111129.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111129.yaml
rename to data/v2/stigmata/111129.yaml
diff --git a/data/v2-pre/stigmata/111130.yaml b/data/v2/stigmata/111130.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111130.yaml
rename to data/v2/stigmata/111130.yaml
diff --git a/data/v2-pre/stigmata/111131.yaml b/data/v2/stigmata/111131.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111131.yaml
rename to data/v2/stigmata/111131.yaml
diff --git a/data/v2-pre/stigmata/111132.yaml b/data/v2/stigmata/111132.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111132.yaml
rename to data/v2/stigmata/111132.yaml
diff --git a/data/v2-pre/stigmata/111133.yaml b/data/v2/stigmata/111133.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111133.yaml
rename to data/v2/stigmata/111133.yaml
diff --git a/data/v2-pre/stigmata/111134.yaml b/data/v2/stigmata/111134.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111134.yaml
rename to data/v2/stigmata/111134.yaml
diff --git a/data/v2-pre/stigmata/111135.yaml b/data/v2/stigmata/111135.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111135.yaml
rename to data/v2/stigmata/111135.yaml
diff --git a/data/v2-pre/stigmata/111136.yaml b/data/v2/stigmata/111136.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111136.yaml
rename to data/v2/stigmata/111136.yaml
diff --git a/data/v2-pre/stigmata/111137.yaml b/data/v2/stigmata/111137.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111137.yaml
rename to data/v2/stigmata/111137.yaml
diff --git a/data/v2-pre/stigmata/111138.yaml b/data/v2/stigmata/111138.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111138.yaml
rename to data/v2/stigmata/111138.yaml
diff --git a/data/v2-pre/stigmata/111139.yaml b/data/v2/stigmata/111139.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111139.yaml
rename to data/v2/stigmata/111139.yaml
diff --git a/data/v2-pre/stigmata/111140.yaml b/data/v2/stigmata/111140.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111140.yaml
rename to data/v2/stigmata/111140.yaml
diff --git a/data/v2-pre/stigmata/111141.yaml b/data/v2/stigmata/111141.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111141.yaml
rename to data/v2/stigmata/111141.yaml
diff --git a/data/v2-pre/stigmata/111142.yaml b/data/v2/stigmata/111142.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111142.yaml
rename to data/v2/stigmata/111142.yaml
diff --git a/data/v2-pre/stigmata/111143.yaml b/data/v2/stigmata/111143.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111143.yaml
rename to data/v2/stigmata/111143.yaml
diff --git a/data/v2-pre/stigmata/111144.yaml b/data/v2/stigmata/111144.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111144.yaml
rename to data/v2/stigmata/111144.yaml
diff --git a/data/v2-pre/stigmata/111145.yaml b/data/v2/stigmata/111145.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111145.yaml
rename to data/v2/stigmata/111145.yaml
diff --git a/data/v2-pre/stigmata/111146.yaml b/data/v2/stigmata/111146.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111146.yaml
rename to data/v2/stigmata/111146.yaml
diff --git a/data/v2-pre/stigmata/111147.yaml b/data/v2/stigmata/111147.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111147.yaml
rename to data/v2/stigmata/111147.yaml
diff --git a/data/v2-pre/stigmata/111148.yaml b/data/v2/stigmata/111148.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111148.yaml
rename to data/v2/stigmata/111148.yaml
diff --git a/data/v2-pre/stigmata/111149.yaml b/data/v2/stigmata/111149.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111149.yaml
rename to data/v2/stigmata/111149.yaml
diff --git a/data/v2-pre/stigmata/111150.yaml b/data/v2/stigmata/111150.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111150.yaml
rename to data/v2/stigmata/111150.yaml
diff --git a/data/v2-pre/stigmata/111151.yaml b/data/v2/stigmata/111151.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111151.yaml
rename to data/v2/stigmata/111151.yaml
diff --git a/data/v2-pre/stigmata/111152.yaml b/data/v2/stigmata/111152.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111152.yaml
rename to data/v2/stigmata/111152.yaml
diff --git a/data/v2-pre/stigmata/111153.yaml b/data/v2/stigmata/111153.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111153.yaml
rename to data/v2/stigmata/111153.yaml
diff --git a/data/v2-pre/stigmata/111154.yaml b/data/v2/stigmata/111154.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111154.yaml
rename to data/v2/stigmata/111154.yaml
diff --git a/data/v2-pre/stigmata/111155.yaml b/data/v2/stigmata/111155.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111155.yaml
rename to data/v2/stigmata/111155.yaml
diff --git a/data/v2-pre/stigmata/111156.yaml b/data/v2/stigmata/111156.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111156.yaml
rename to data/v2/stigmata/111156.yaml
diff --git a/data/v2-pre/stigmata/111157.yaml b/data/v2/stigmata/111157.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111157.yaml
rename to data/v2/stigmata/111157.yaml
diff --git a/data/v2-pre/stigmata/111158.yaml b/data/v2/stigmata/111158.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111158.yaml
rename to data/v2/stigmata/111158.yaml
diff --git a/data/v2-pre/stigmata/111159.yaml b/data/v2/stigmata/111159.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111159.yaml
rename to data/v2/stigmata/111159.yaml
diff --git a/data/v2-pre/stigmata/111160.yaml b/data/v2/stigmata/111160.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111160.yaml
rename to data/v2/stigmata/111160.yaml
diff --git a/data/v2-pre/stigmata/111161.yaml b/data/v2/stigmata/111161.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111161.yaml
rename to data/v2/stigmata/111161.yaml
diff --git a/data/v2-pre/stigmata/111162.yaml b/data/v2/stigmata/111162.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111162.yaml
rename to data/v2/stigmata/111162.yaml
diff --git a/data/v2-pre/stigmata/111163.yaml b/data/v2/stigmata/111163.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111163.yaml
rename to data/v2/stigmata/111163.yaml
diff --git a/data/v2-pre/stigmata/111164.yaml b/data/v2/stigmata/111164.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111164.yaml
rename to data/v2/stigmata/111164.yaml
diff --git a/data/v2-pre/stigmata/111165.yaml b/data/v2/stigmata/111165.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111165.yaml
rename to data/v2/stigmata/111165.yaml
diff --git a/data/v2-pre/stigmata/111166.yaml b/data/v2/stigmata/111166.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111166.yaml
rename to data/v2/stigmata/111166.yaml
diff --git a/data/v2-pre/stigmata/111167.yaml b/data/v2/stigmata/111167.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111167.yaml
rename to data/v2/stigmata/111167.yaml
diff --git a/data/v2-pre/stigmata/111168.yaml b/data/v2/stigmata/111168.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111168.yaml
rename to data/v2/stigmata/111168.yaml
diff --git a/data/v2-pre/stigmata/111169.yaml b/data/v2/stigmata/111169.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111169.yaml
rename to data/v2/stigmata/111169.yaml
diff --git a/data/v2-pre/stigmata/111170.yaml b/data/v2/stigmata/111170.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111170.yaml
rename to data/v2/stigmata/111170.yaml
diff --git a/data/v2-pre/stigmata/111171.yaml b/data/v2/stigmata/111171.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111171.yaml
rename to data/v2/stigmata/111171.yaml
diff --git a/data/v2-pre/stigmata/111172.yaml b/data/v2/stigmata/111172.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111172.yaml
rename to data/v2/stigmata/111172.yaml
diff --git a/data/v2-pre/stigmata/111173.yaml b/data/v2/stigmata/111173.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111173.yaml
rename to data/v2/stigmata/111173.yaml
diff --git a/data/v2-pre/stigmata/111174.yaml b/data/v2/stigmata/111174.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111174.yaml
rename to data/v2/stigmata/111174.yaml
diff --git a/data/v2-pre/stigmata/111175.yaml b/data/v2/stigmata/111175.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111175.yaml
rename to data/v2/stigmata/111175.yaml
diff --git a/data/v2-pre/stigmata/111176.yaml b/data/v2/stigmata/111176.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111176.yaml
rename to data/v2/stigmata/111176.yaml
diff --git a/data/v2-pre/stigmata/111177.yaml b/data/v2/stigmata/111177.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111177.yaml
rename to data/v2/stigmata/111177.yaml
diff --git a/data/v2-pre/stigmata/111178.yaml b/data/v2/stigmata/111178.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111178.yaml
rename to data/v2/stigmata/111178.yaml
diff --git a/data/v2-pre/stigmata/111179.yaml b/data/v2/stigmata/111179.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111179.yaml
rename to data/v2/stigmata/111179.yaml
diff --git a/data/v2-pre/stigmata/111180.yaml b/data/v2/stigmata/111180.yaml
similarity index 100%
rename from data/v2-pre/stigmata/111180.yaml
rename to data/v2/stigmata/111180.yaml
diff --git a/data/v2-pre/stigmata/120011.yaml b/data/v2/stigmata/120011.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120011.yaml
rename to data/v2/stigmata/120011.yaml
diff --git a/data/v2-pre/stigmata/120023.yaml b/data/v2/stigmata/120023.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120023.yaml
rename to data/v2/stigmata/120023.yaml
diff --git a/data/v2-pre/stigmata/120033.yaml b/data/v2/stigmata/120033.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120033.yaml
rename to data/v2/stigmata/120033.yaml
diff --git a/data/v2-pre/stigmata/120041.yaml b/data/v2/stigmata/120041.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120041.yaml
rename to data/v2/stigmata/120041.yaml
diff --git a/data/v2-pre/stigmata/120053.yaml b/data/v2/stigmata/120053.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120053.yaml
rename to data/v2/stigmata/120053.yaml
diff --git a/data/v2-pre/stigmata/120062.yaml b/data/v2/stigmata/120062.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120062.yaml
rename to data/v2/stigmata/120062.yaml
diff --git a/data/v2-pre/stigmata/120072.yaml b/data/v2/stigmata/120072.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120072.yaml
rename to data/v2/stigmata/120072.yaml
diff --git a/data/v2-pre/stigmata/120081.yaml b/data/v2/stigmata/120081.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120081.yaml
rename to data/v2/stigmata/120081.yaml
diff --git a/data/v2-pre/stigmata/120092.yaml b/data/v2/stigmata/120092.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120092.yaml
rename to data/v2/stigmata/120092.yaml
diff --git a/data/v2-pre/stigmata/120101.yaml b/data/v2/stigmata/120101.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120101.yaml
rename to data/v2/stigmata/120101.yaml
diff --git a/data/v2-pre/stigmata/120112.yaml b/data/v2/stigmata/120112.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120112.yaml
rename to data/v2/stigmata/120112.yaml
diff --git a/data/v2-pre/stigmata/120122.yaml b/data/v2/stigmata/120122.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120122.yaml
rename to data/v2/stigmata/120122.yaml
diff --git a/data/v2-pre/stigmata/120132.yaml b/data/v2/stigmata/120132.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120132.yaml
rename to data/v2/stigmata/120132.yaml
diff --git a/data/v2-pre/stigmata/120141.yaml b/data/v2/stigmata/120141.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120141.yaml
rename to data/v2/stigmata/120141.yaml
diff --git a/data/v2-pre/stigmata/120151.yaml b/data/v2/stigmata/120151.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120151.yaml
rename to data/v2/stigmata/120151.yaml
diff --git a/data/v2-pre/stigmata/120163.yaml b/data/v2/stigmata/120163.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120163.yaml
rename to data/v2/stigmata/120163.yaml
diff --git a/data/v2-pre/stigmata/120173.yaml b/data/v2/stigmata/120173.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120173.yaml
rename to data/v2/stigmata/120173.yaml
diff --git a/data/v2-pre/stigmata/120181.yaml b/data/v2/stigmata/120181.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120181.yaml
rename to data/v2/stigmata/120181.yaml
diff --git a/data/v2-pre/stigmata/120191.yaml b/data/v2/stigmata/120191.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120191.yaml
rename to data/v2/stigmata/120191.yaml
diff --git a/data/v2-pre/stigmata/120202.yaml b/data/v2/stigmata/120202.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120202.yaml
rename to data/v2/stigmata/120202.yaml
diff --git a/data/v2-pre/stigmata/120213.yaml b/data/v2/stigmata/120213.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120213.yaml
rename to data/v2/stigmata/120213.yaml
diff --git a/data/v2-pre/stigmata/120222.yaml b/data/v2/stigmata/120222.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120222.yaml
rename to data/v2/stigmata/120222.yaml
diff --git a/data/v2-pre/stigmata/120232.yaml b/data/v2/stigmata/120232.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120232.yaml
rename to data/v2/stigmata/120232.yaml
diff --git a/data/v2-pre/stigmata/120241.yaml b/data/v2/stigmata/120241.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120241.yaml
rename to data/v2/stigmata/120241.yaml
diff --git a/data/v2-pre/stigmata/120253.yaml b/data/v2/stigmata/120253.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120253.yaml
rename to data/v2/stigmata/120253.yaml
diff --git a/data/v2-pre/stigmata/120262.yaml b/data/v2/stigmata/120262.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120262.yaml
rename to data/v2/stigmata/120262.yaml
diff --git a/data/v2-pre/stigmata/120272.yaml b/data/v2/stigmata/120272.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120272.yaml
rename to data/v2/stigmata/120272.yaml
diff --git a/data/v2-pre/stigmata/120283.yaml b/data/v2/stigmata/120283.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120283.yaml
rename to data/v2/stigmata/120283.yaml
diff --git a/data/v2-pre/stigmata/120291.yaml b/data/v2/stigmata/120291.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120291.yaml
rename to data/v2/stigmata/120291.yaml
diff --git a/data/v2-pre/stigmata/120303.yaml b/data/v2/stigmata/120303.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120303.yaml
rename to data/v2/stigmata/120303.yaml
diff --git a/data/v2-pre/stigmata/120312.yaml b/data/v2/stigmata/120312.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120312.yaml
rename to data/v2/stigmata/120312.yaml
diff --git a/data/v2-pre/stigmata/120321.yaml b/data/v2/stigmata/120321.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120321.yaml
rename to data/v2/stigmata/120321.yaml
diff --git a/data/v2-pre/stigmata/120332.yaml b/data/v2/stigmata/120332.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120332.yaml
rename to data/v2/stigmata/120332.yaml
diff --git a/data/v2-pre/stigmata/120343.yaml b/data/v2/stigmata/120343.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120343.yaml
rename to data/v2/stigmata/120343.yaml
diff --git a/data/v2-pre/stigmata/120352.yaml b/data/v2/stigmata/120352.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120352.yaml
rename to data/v2/stigmata/120352.yaml
diff --git a/data/v2-pre/stigmata/120361.yaml b/data/v2/stigmata/120361.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120361.yaml
rename to data/v2/stigmata/120361.yaml
diff --git a/data/v2-pre/stigmata/120373.yaml b/data/v2/stigmata/120373.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120373.yaml
rename to data/v2/stigmata/120373.yaml
diff --git a/data/v2-pre/stigmata/120382.yaml b/data/v2/stigmata/120382.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120382.yaml
rename to data/v2/stigmata/120382.yaml
diff --git a/data/v2-pre/stigmata/120391.yaml b/data/v2/stigmata/120391.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120391.yaml
rename to data/v2/stigmata/120391.yaml
diff --git a/data/v2-pre/stigmata/120403.yaml b/data/v2/stigmata/120403.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120403.yaml
rename to data/v2/stigmata/120403.yaml
diff --git a/data/v2-pre/stigmata/120411.yaml b/data/v2/stigmata/120411.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120411.yaml
rename to data/v2/stigmata/120411.yaml
diff --git a/data/v2-pre/stigmata/120423.yaml b/data/v2/stigmata/120423.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120423.yaml
rename to data/v2/stigmata/120423.yaml
diff --git a/data/v2-pre/stigmata/120432.yaml b/data/v2/stigmata/120432.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120432.yaml
rename to data/v2/stigmata/120432.yaml
diff --git a/data/v2-pre/stigmata/120443.yaml b/data/v2/stigmata/120443.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120443.yaml
rename to data/v2/stigmata/120443.yaml
diff --git a/data/v2-pre/stigmata/120452.yaml b/data/v2/stigmata/120452.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120452.yaml
rename to data/v2/stigmata/120452.yaml
diff --git a/data/v2-pre/stigmata/120463.yaml b/data/v2/stigmata/120463.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120463.yaml
rename to data/v2/stigmata/120463.yaml
diff --git a/data/v2-pre/stigmata/120471.yaml b/data/v2/stigmata/120471.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120471.yaml
rename to data/v2/stigmata/120471.yaml
diff --git a/data/v2-pre/stigmata/120481.yaml b/data/v2/stigmata/120481.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120481.yaml
rename to data/v2/stigmata/120481.yaml
diff --git a/data/v2-pre/stigmata/120492.yaml b/data/v2/stigmata/120492.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120492.yaml
rename to data/v2/stigmata/120492.yaml
diff --git a/data/v2-pre/stigmata/120501.yaml b/data/v2/stigmata/120501.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120501.yaml
rename to data/v2/stigmata/120501.yaml
diff --git a/data/v2-pre/stigmata/120511.yaml b/data/v2/stigmata/120511.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120511.yaml
rename to data/v2/stigmata/120511.yaml
diff --git a/data/v2-pre/stigmata/120522.yaml b/data/v2/stigmata/120522.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120522.yaml
rename to data/v2/stigmata/120522.yaml
diff --git a/data/v2-pre/stigmata/120531.yaml b/data/v2/stigmata/120531.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120531.yaml
rename to data/v2/stigmata/120531.yaml
diff --git a/data/v2-pre/stigmata/120542.yaml b/data/v2/stigmata/120542.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120542.yaml
rename to data/v2/stigmata/120542.yaml
diff --git a/data/v2-pre/stigmata/120553.yaml b/data/v2/stigmata/120553.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120553.yaml
rename to data/v2/stigmata/120553.yaml
diff --git a/data/v2-pre/stigmata/120561.yaml b/data/v2/stigmata/120561.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120561.yaml
rename to data/v2/stigmata/120561.yaml
diff --git a/data/v2-pre/stigmata/120571.yaml b/data/v2/stigmata/120571.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120571.yaml
rename to data/v2/stigmata/120571.yaml
diff --git a/data/v2-pre/stigmata/120582.yaml b/data/v2/stigmata/120582.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120582.yaml
rename to data/v2/stigmata/120582.yaml
diff --git a/data/v2-pre/stigmata/120583.yaml b/data/v2/stigmata/120583.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120583.yaml
rename to data/v2/stigmata/120583.yaml
diff --git a/data/v2-pre/stigmata/120584.yaml b/data/v2/stigmata/120584.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120584.yaml
rename to data/v2/stigmata/120584.yaml
diff --git a/data/v2-pre/stigmata/120585.yaml b/data/v2/stigmata/120585.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120585.yaml
rename to data/v2/stigmata/120585.yaml
diff --git a/data/v2-pre/stigmata/120586.yaml b/data/v2/stigmata/120586.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120586.yaml
rename to data/v2/stigmata/120586.yaml
diff --git a/data/v2-pre/stigmata/120587.yaml b/data/v2/stigmata/120587.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120587.yaml
rename to data/v2/stigmata/120587.yaml
diff --git a/data/v2-pre/stigmata/120588.yaml b/data/v2/stigmata/120588.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120588.yaml
rename to data/v2/stigmata/120588.yaml
diff --git a/data/v2-pre/stigmata/120589.yaml b/data/v2/stigmata/120589.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120589.yaml
rename to data/v2/stigmata/120589.yaml
diff --git a/data/v2-pre/stigmata/120590.yaml b/data/v2/stigmata/120590.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120590.yaml
rename to data/v2/stigmata/120590.yaml
diff --git a/data/v2-pre/stigmata/120591.yaml b/data/v2/stigmata/120591.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120591.yaml
rename to data/v2/stigmata/120591.yaml
diff --git a/data/v2-pre/stigmata/120592.yaml b/data/v2/stigmata/120592.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120592.yaml
rename to data/v2/stigmata/120592.yaml
diff --git a/data/v2-pre/stigmata/120593.yaml b/data/v2/stigmata/120593.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120593.yaml
rename to data/v2/stigmata/120593.yaml
diff --git a/data/v2-pre/stigmata/120594.yaml b/data/v2/stigmata/120594.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120594.yaml
rename to data/v2/stigmata/120594.yaml
diff --git a/data/v2-pre/stigmata/120595.yaml b/data/v2/stigmata/120595.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120595.yaml
rename to data/v2/stigmata/120595.yaml
diff --git a/data/v2-pre/stigmata/120596.yaml b/data/v2/stigmata/120596.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120596.yaml
rename to data/v2/stigmata/120596.yaml
diff --git a/data/v2-pre/stigmata/120597.yaml b/data/v2/stigmata/120597.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120597.yaml
rename to data/v2/stigmata/120597.yaml
diff --git a/data/v2-pre/stigmata/120598.yaml b/data/v2/stigmata/120598.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120598.yaml
rename to data/v2/stigmata/120598.yaml
diff --git a/data/v2-pre/stigmata/120599.yaml b/data/v2/stigmata/120599.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120599.yaml
rename to data/v2/stigmata/120599.yaml
diff --git a/data/v2-pre/stigmata/120600.yaml b/data/v2/stigmata/120600.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120600.yaml
rename to data/v2/stigmata/120600.yaml
diff --git a/data/v2-pre/stigmata/120601.yaml b/data/v2/stigmata/120601.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120601.yaml
rename to data/v2/stigmata/120601.yaml
diff --git a/data/v2-pre/stigmata/120602.yaml b/data/v2/stigmata/120602.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120602.yaml
rename to data/v2/stigmata/120602.yaml
diff --git a/data/v2-pre/stigmata/120603.yaml b/data/v2/stigmata/120603.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120603.yaml
rename to data/v2/stigmata/120603.yaml
diff --git a/data/v2-pre/stigmata/120604.yaml b/data/v2/stigmata/120604.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120604.yaml
rename to data/v2/stigmata/120604.yaml
diff --git a/data/v2-pre/stigmata/120605.yaml b/data/v2/stigmata/120605.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120605.yaml
rename to data/v2/stigmata/120605.yaml
diff --git a/data/v2-pre/stigmata/120606.yaml b/data/v2/stigmata/120606.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120606.yaml
rename to data/v2/stigmata/120606.yaml
diff --git a/data/v2-pre/stigmata/120607.yaml b/data/v2/stigmata/120607.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120607.yaml
rename to data/v2/stigmata/120607.yaml
diff --git a/data/v2-pre/stigmata/120608.yaml b/data/v2/stigmata/120608.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120608.yaml
rename to data/v2/stigmata/120608.yaml
diff --git a/data/v2-pre/stigmata/120609.yaml b/data/v2/stigmata/120609.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120609.yaml
rename to data/v2/stigmata/120609.yaml
diff --git a/data/v2-pre/stigmata/120610.yaml b/data/v2/stigmata/120610.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120610.yaml
rename to data/v2/stigmata/120610.yaml
diff --git a/data/v2-pre/stigmata/120611.yaml b/data/v2/stigmata/120611.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120611.yaml
rename to data/v2/stigmata/120611.yaml
diff --git a/data/v2-pre/stigmata/120612.yaml b/data/v2/stigmata/120612.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120612.yaml
rename to data/v2/stigmata/120612.yaml
diff --git a/data/v2-pre/stigmata/120613.yaml b/data/v2/stigmata/120613.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120613.yaml
rename to data/v2/stigmata/120613.yaml
diff --git a/data/v2-pre/stigmata/120614.yaml b/data/v2/stigmata/120614.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120614.yaml
rename to data/v2/stigmata/120614.yaml
diff --git a/data/v2-pre/stigmata/120615.yaml b/data/v2/stigmata/120615.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120615.yaml
rename to data/v2/stigmata/120615.yaml
diff --git a/data/v2-pre/stigmata/120616.yaml b/data/v2/stigmata/120616.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120616.yaml
rename to data/v2/stigmata/120616.yaml
diff --git a/data/v2-pre/stigmata/120617.yaml b/data/v2/stigmata/120617.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120617.yaml
rename to data/v2/stigmata/120617.yaml
diff --git a/data/v2-pre/stigmata/120618.yaml b/data/v2/stigmata/120618.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120618.yaml
rename to data/v2/stigmata/120618.yaml
diff --git a/data/v2-pre/stigmata/120619.yaml b/data/v2/stigmata/120619.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120619.yaml
rename to data/v2/stigmata/120619.yaml
diff --git a/data/v2-pre/stigmata/120620.yaml b/data/v2/stigmata/120620.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120620.yaml
rename to data/v2/stigmata/120620.yaml
diff --git a/data/v2-pre/stigmata/120621.yaml b/data/v2/stigmata/120621.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120621.yaml
rename to data/v2/stigmata/120621.yaml
diff --git a/data/v2-pre/stigmata/120622.yaml b/data/v2/stigmata/120622.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120622.yaml
rename to data/v2/stigmata/120622.yaml
diff --git a/data/v2-pre/stigmata/120623.yaml b/data/v2/stigmata/120623.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120623.yaml
rename to data/v2/stigmata/120623.yaml
diff --git a/data/v2-pre/stigmata/120624.yaml b/data/v2/stigmata/120624.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120624.yaml
rename to data/v2/stigmata/120624.yaml
diff --git a/data/v2-pre/stigmata/120625.yaml b/data/v2/stigmata/120625.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120625.yaml
rename to data/v2/stigmata/120625.yaml
diff --git a/data/v2-pre/stigmata/120626.yaml b/data/v2/stigmata/120626.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120626.yaml
rename to data/v2/stigmata/120626.yaml
diff --git a/data/v2-pre/stigmata/120627.yaml b/data/v2/stigmata/120627.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120627.yaml
rename to data/v2/stigmata/120627.yaml
diff --git a/data/v2-pre/stigmata/120628.yaml b/data/v2/stigmata/120628.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120628.yaml
rename to data/v2/stigmata/120628.yaml
diff --git a/data/v2-pre/stigmata/120629.yaml b/data/v2/stigmata/120629.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120629.yaml
rename to data/v2/stigmata/120629.yaml
diff --git a/data/v2-pre/stigmata/120630.yaml b/data/v2/stigmata/120630.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120630.yaml
rename to data/v2/stigmata/120630.yaml
diff --git a/data/v2-pre/stigmata/120631.yaml b/data/v2/stigmata/120631.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120631.yaml
rename to data/v2/stigmata/120631.yaml
diff --git a/data/v2-pre/stigmata/120632.yaml b/data/v2/stigmata/120632.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120632.yaml
rename to data/v2/stigmata/120632.yaml
diff --git a/data/v2-pre/stigmata/120633.yaml b/data/v2/stigmata/120633.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120633.yaml
rename to data/v2/stigmata/120633.yaml
diff --git a/data/v2-pre/stigmata/120634.yaml b/data/v2/stigmata/120634.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120634.yaml
rename to data/v2/stigmata/120634.yaml
diff --git a/data/v2-pre/stigmata/120635.yaml b/data/v2/stigmata/120635.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120635.yaml
rename to data/v2/stigmata/120635.yaml
diff --git a/data/v2-pre/stigmata/120636.yaml b/data/v2/stigmata/120636.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120636.yaml
rename to data/v2/stigmata/120636.yaml
diff --git a/data/v2-pre/stigmata/120637.yaml b/data/v2/stigmata/120637.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120637.yaml
rename to data/v2/stigmata/120637.yaml
diff --git a/data/v2-pre/stigmata/120638.yaml b/data/v2/stigmata/120638.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120638.yaml
rename to data/v2/stigmata/120638.yaml
diff --git a/data/v2-pre/stigmata/120655.yaml b/data/v2/stigmata/120655.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120655.yaml
rename to data/v2/stigmata/120655.yaml
diff --git a/data/v2-pre/stigmata/120656.yaml b/data/v2/stigmata/120656.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120656.yaml
rename to data/v2/stigmata/120656.yaml
diff --git a/data/v2-pre/stigmata/120657.yaml b/data/v2/stigmata/120657.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120657.yaml
rename to data/v2/stigmata/120657.yaml
diff --git a/data/v2-pre/stigmata/120658.yaml b/data/v2/stigmata/120658.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120658.yaml
rename to data/v2/stigmata/120658.yaml
diff --git a/data/v2-pre/stigmata/120659.yaml b/data/v2/stigmata/120659.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120659.yaml
rename to data/v2/stigmata/120659.yaml
diff --git a/data/v2-pre/stigmata/120660.yaml b/data/v2/stigmata/120660.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120660.yaml
rename to data/v2/stigmata/120660.yaml
diff --git a/data/v2-pre/stigmata/120661.yaml b/data/v2/stigmata/120661.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120661.yaml
rename to data/v2/stigmata/120661.yaml
diff --git a/data/v2-pre/stigmata/120662.yaml b/data/v2/stigmata/120662.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120662.yaml
rename to data/v2/stigmata/120662.yaml
diff --git a/data/v2-pre/stigmata/120663.yaml b/data/v2/stigmata/120663.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120663.yaml
rename to data/v2/stigmata/120663.yaml
diff --git a/data/v2-pre/stigmata/120664.yaml b/data/v2/stigmata/120664.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120664.yaml
rename to data/v2/stigmata/120664.yaml
diff --git a/data/v2-pre/stigmata/120665.yaml b/data/v2/stigmata/120665.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120665.yaml
rename to data/v2/stigmata/120665.yaml
diff --git a/data/v2-pre/stigmata/120666.yaml b/data/v2/stigmata/120666.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120666.yaml
rename to data/v2/stigmata/120666.yaml
diff --git a/data/v2-pre/stigmata/120667.yaml b/data/v2/stigmata/120667.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120667.yaml
rename to data/v2/stigmata/120667.yaml
diff --git a/data/v2-pre/stigmata/120668.yaml b/data/v2/stigmata/120668.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120668.yaml
rename to data/v2/stigmata/120668.yaml
diff --git a/data/v2-pre/stigmata/120669.yaml b/data/v2/stigmata/120669.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120669.yaml
rename to data/v2/stigmata/120669.yaml
diff --git a/data/v2-pre/stigmata/120670.yaml b/data/v2/stigmata/120670.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120670.yaml
rename to data/v2/stigmata/120670.yaml
diff --git a/data/v2-pre/stigmata/120671.yaml b/data/v2/stigmata/120671.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120671.yaml
rename to data/v2/stigmata/120671.yaml
diff --git a/data/v2-pre/stigmata/120672.yaml b/data/v2/stigmata/120672.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120672.yaml
rename to data/v2/stigmata/120672.yaml
diff --git a/data/v2-pre/stigmata/120673.yaml b/data/v2/stigmata/120673.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120673.yaml
rename to data/v2/stigmata/120673.yaml
diff --git a/data/v2-pre/stigmata/120674.yaml b/data/v2/stigmata/120674.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120674.yaml
rename to data/v2/stigmata/120674.yaml
diff --git a/data/v2-pre/stigmata/120675.yaml b/data/v2/stigmata/120675.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120675.yaml
rename to data/v2/stigmata/120675.yaml
diff --git a/data/v2-pre/stigmata/120676.yaml b/data/v2/stigmata/120676.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120676.yaml
rename to data/v2/stigmata/120676.yaml
diff --git a/data/v2-pre/stigmata/120678.yaml b/data/v2/stigmata/120678.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120678.yaml
rename to data/v2/stigmata/120678.yaml
diff --git a/data/v2-pre/stigmata/120679.yaml b/data/v2/stigmata/120679.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120679.yaml
rename to data/v2/stigmata/120679.yaml
diff --git a/data/v2-pre/stigmata/120680.yaml b/data/v2/stigmata/120680.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120680.yaml
rename to data/v2/stigmata/120680.yaml
diff --git a/data/v2-pre/stigmata/120681.yaml b/data/v2/stigmata/120681.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120681.yaml
rename to data/v2/stigmata/120681.yaml
diff --git a/data/v2-pre/stigmata/120682.yaml b/data/v2/stigmata/120682.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120682.yaml
rename to data/v2/stigmata/120682.yaml
diff --git a/data/v2-pre/stigmata/120683.yaml b/data/v2/stigmata/120683.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120683.yaml
rename to data/v2/stigmata/120683.yaml
diff --git a/data/v2-pre/stigmata/120684.yaml b/data/v2/stigmata/120684.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120684.yaml
rename to data/v2/stigmata/120684.yaml
diff --git a/data/v2-pre/stigmata/120685.yaml b/data/v2/stigmata/120685.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120685.yaml
rename to data/v2/stigmata/120685.yaml
diff --git a/data/v2-pre/stigmata/120686.yaml b/data/v2/stigmata/120686.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120686.yaml
rename to data/v2/stigmata/120686.yaml
diff --git a/data/v2-pre/stigmata/120687.yaml b/data/v2/stigmata/120687.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120687.yaml
rename to data/v2/stigmata/120687.yaml
diff --git a/data/v2-pre/stigmata/120688.yaml b/data/v2/stigmata/120688.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120688.yaml
rename to data/v2/stigmata/120688.yaml
diff --git a/data/v2-pre/stigmata/120689.yaml b/data/v2/stigmata/120689.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120689.yaml
rename to data/v2/stigmata/120689.yaml
diff --git a/data/v2-pre/stigmata/120690.yaml b/data/v2/stigmata/120690.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120690.yaml
rename to data/v2/stigmata/120690.yaml
diff --git a/data/v2-pre/stigmata/120692.yaml b/data/v2/stigmata/120692.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120692.yaml
rename to data/v2/stigmata/120692.yaml
diff --git a/data/v2-pre/stigmata/120693.yaml b/data/v2/stigmata/120693.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120693.yaml
rename to data/v2/stigmata/120693.yaml
diff --git a/data/v2-pre/stigmata/120694.yaml b/data/v2/stigmata/120694.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120694.yaml
rename to data/v2/stigmata/120694.yaml
diff --git a/data/v2-pre/stigmata/120695.yaml b/data/v2/stigmata/120695.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120695.yaml
rename to data/v2/stigmata/120695.yaml
diff --git a/data/v2-pre/stigmata/120696.yaml b/data/v2/stigmata/120696.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120696.yaml
rename to data/v2/stigmata/120696.yaml
diff --git a/data/v2-pre/stigmata/120697.yaml b/data/v2/stigmata/120697.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120697.yaml
rename to data/v2/stigmata/120697.yaml
diff --git a/data/v2-pre/stigmata/120698.yaml b/data/v2/stigmata/120698.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120698.yaml
rename to data/v2/stigmata/120698.yaml
diff --git a/data/v2-pre/stigmata/120699.yaml b/data/v2/stigmata/120699.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120699.yaml
rename to data/v2/stigmata/120699.yaml
diff --git a/data/v2-pre/stigmata/120700.yaml b/data/v2/stigmata/120700.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120700.yaml
rename to data/v2/stigmata/120700.yaml
diff --git a/data/v2-pre/stigmata/120701.yaml b/data/v2/stigmata/120701.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120701.yaml
rename to data/v2/stigmata/120701.yaml
diff --git a/data/v2-pre/stigmata/120702.yaml b/data/v2/stigmata/120702.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120702.yaml
rename to data/v2/stigmata/120702.yaml
diff --git a/data/v2-pre/stigmata/120703.yaml b/data/v2/stigmata/120703.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120703.yaml
rename to data/v2/stigmata/120703.yaml
diff --git a/data/v2-pre/stigmata/120704.yaml b/data/v2/stigmata/120704.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120704.yaml
rename to data/v2/stigmata/120704.yaml
diff --git a/data/v2-pre/stigmata/120705.yaml b/data/v2/stigmata/120705.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120705.yaml
rename to data/v2/stigmata/120705.yaml
diff --git a/data/v2-pre/stigmata/120706.yaml b/data/v2/stigmata/120706.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120706.yaml
rename to data/v2/stigmata/120706.yaml
diff --git a/data/v2-pre/stigmata/120707.yaml b/data/v2/stigmata/120707.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120707.yaml
rename to data/v2/stigmata/120707.yaml
diff --git a/data/v2-pre/stigmata/120708.yaml b/data/v2/stigmata/120708.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120708.yaml
rename to data/v2/stigmata/120708.yaml
diff --git a/data/v2-pre/stigmata/120709.yaml b/data/v2/stigmata/120709.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120709.yaml
rename to data/v2/stigmata/120709.yaml
diff --git a/data/v2-pre/stigmata/120710.yaml b/data/v2/stigmata/120710.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120710.yaml
rename to data/v2/stigmata/120710.yaml
diff --git a/data/v2-pre/stigmata/120711.yaml b/data/v2/stigmata/120711.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120711.yaml
rename to data/v2/stigmata/120711.yaml
diff --git a/data/v2-pre/stigmata/120713.yaml b/data/v2/stigmata/120713.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120713.yaml
rename to data/v2/stigmata/120713.yaml
diff --git a/data/v2-pre/stigmata/120714.yaml b/data/v2/stigmata/120714.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120714.yaml
rename to data/v2/stigmata/120714.yaml
diff --git a/data/v2-pre/stigmata/120715.yaml b/data/v2/stigmata/120715.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120715.yaml
rename to data/v2/stigmata/120715.yaml
diff --git a/data/v2-pre/stigmata/120716.yaml b/data/v2/stigmata/120716.yaml
similarity index 100%
rename from data/v2-pre/stigmata/120716.yaml
rename to data/v2/stigmata/120716.yaml
diff --git a/data/v2-pre/tag-list.yaml b/data/v2/tag-list.yaml
similarity index 100%
rename from data/v2-pre/tag-list.yaml
rename to data/v2/tag-list.yaml
diff --git a/data/v2-pre/weapon-catalog.yaml b/data/v2/weapon-catalog.yaml
similarity index 100%
rename from data/v2-pre/weapon-catalog.yaml
rename to data/v2/weapon-catalog.yaml
diff --git a/data/v2-pre/weapons/10001.yaml b/data/v2/weapons/10001.yaml
similarity index 100%
rename from data/v2-pre/weapons/10001.yaml
rename to data/v2/weapons/10001.yaml
diff --git a/data/v2-pre/weapons/10002.yaml b/data/v2/weapons/10002.yaml
similarity index 100%
rename from data/v2-pre/weapons/10002.yaml
rename to data/v2/weapons/10002.yaml
diff --git a/data/v2-pre/weapons/10003.yaml b/data/v2/weapons/10003.yaml
similarity index 100%
rename from data/v2-pre/weapons/10003.yaml
rename to data/v2/weapons/10003.yaml
diff --git a/data/v2-pre/weapons/10004.yaml b/data/v2/weapons/10004.yaml
similarity index 100%
rename from data/v2-pre/weapons/10004.yaml
rename to data/v2/weapons/10004.yaml
diff --git a/data/v2-pre/weapons/10005.yaml b/data/v2/weapons/10005.yaml
similarity index 100%
rename from data/v2-pre/weapons/10005.yaml
rename to data/v2/weapons/10005.yaml
diff --git a/data/v2-pre/weapons/10006.yaml b/data/v2/weapons/10006.yaml
similarity index 100%
rename from data/v2-pre/weapons/10006.yaml
rename to data/v2/weapons/10006.yaml
diff --git a/data/v2-pre/weapons/10007.yaml b/data/v2/weapons/10007.yaml
similarity index 100%
rename from data/v2-pre/weapons/10007.yaml
rename to data/v2/weapons/10007.yaml
diff --git a/data/v2-pre/weapons/10008.yaml b/data/v2/weapons/10008.yaml
similarity index 100%
rename from data/v2-pre/weapons/10008.yaml
rename to data/v2/weapons/10008.yaml
diff --git a/data/v2-pre/weapons/10009.yaml b/data/v2/weapons/10009.yaml
similarity index 100%
rename from data/v2-pre/weapons/10009.yaml
rename to data/v2/weapons/10009.yaml
diff --git a/data/v2-pre/weapons/10010.yaml b/data/v2/weapons/10010.yaml
similarity index 100%
rename from data/v2-pre/weapons/10010.yaml
rename to data/v2/weapons/10010.yaml
diff --git a/data/v2-pre/weapons/10011.yaml b/data/v2/weapons/10011.yaml
similarity index 100%
rename from data/v2-pre/weapons/10011.yaml
rename to data/v2/weapons/10011.yaml
diff --git a/data/v2-pre/weapons/10012.yaml b/data/v2/weapons/10012.yaml
similarity index 100%
rename from data/v2-pre/weapons/10012.yaml
rename to data/v2/weapons/10012.yaml
diff --git a/data/v2-pre/weapons/10013.yaml b/data/v2/weapons/10013.yaml
similarity index 100%
rename from data/v2-pre/weapons/10013.yaml
rename to data/v2/weapons/10013.yaml
diff --git a/data/v2-pre/weapons/10014.yaml b/data/v2/weapons/10014.yaml
similarity index 100%
rename from data/v2-pre/weapons/10014.yaml
rename to data/v2/weapons/10014.yaml
diff --git a/data/v2-pre/weapons/10015.yaml b/data/v2/weapons/10015.yaml
similarity index 100%
rename from data/v2-pre/weapons/10015.yaml
rename to data/v2/weapons/10015.yaml
diff --git a/data/v2-pre/weapons/10016.yaml b/data/v2/weapons/10016.yaml
similarity index 100%
rename from data/v2-pre/weapons/10016.yaml
rename to data/v2/weapons/10016.yaml
diff --git a/data/v2-pre/weapons/10017.yaml b/data/v2/weapons/10017.yaml
similarity index 100%
rename from data/v2-pre/weapons/10017.yaml
rename to data/v2/weapons/10017.yaml
diff --git a/data/v2-pre/weapons/10018.yaml b/data/v2/weapons/10018.yaml
similarity index 100%
rename from data/v2-pre/weapons/10018.yaml
rename to data/v2/weapons/10018.yaml
diff --git a/data/v2-pre/weapons/10019.yaml b/data/v2/weapons/10019.yaml
similarity index 100%
rename from data/v2-pre/weapons/10019.yaml
rename to data/v2/weapons/10019.yaml
diff --git a/data/v2-pre/weapons/10020.yaml b/data/v2/weapons/10020.yaml
similarity index 100%
rename from data/v2-pre/weapons/10020.yaml
rename to data/v2/weapons/10020.yaml
diff --git a/data/v2-pre/weapons/10021.yaml b/data/v2/weapons/10021.yaml
similarity index 100%
rename from data/v2-pre/weapons/10021.yaml
rename to data/v2/weapons/10021.yaml
diff --git a/data/v2-pre/weapons/10022.yaml b/data/v2/weapons/10022.yaml
similarity index 100%
rename from data/v2-pre/weapons/10022.yaml
rename to data/v2/weapons/10022.yaml
diff --git a/data/v2-pre/weapons/10023.yaml b/data/v2/weapons/10023.yaml
similarity index 100%
rename from data/v2-pre/weapons/10023.yaml
rename to data/v2/weapons/10023.yaml
diff --git a/data/v2-pre/weapons/10024.yaml b/data/v2/weapons/10024.yaml
similarity index 100%
rename from data/v2-pre/weapons/10024.yaml
rename to data/v2/weapons/10024.yaml
diff --git a/data/v2-pre/weapons/10025.yaml b/data/v2/weapons/10025.yaml
similarity index 100%
rename from data/v2-pre/weapons/10025.yaml
rename to data/v2/weapons/10025.yaml
diff --git a/data/v2-pre/weapons/10026.yaml b/data/v2/weapons/10026.yaml
similarity index 100%
rename from data/v2-pre/weapons/10026.yaml
rename to data/v2/weapons/10026.yaml
diff --git a/data/v2-pre/weapons/10027.yaml b/data/v2/weapons/10027.yaml
similarity index 100%
rename from data/v2-pre/weapons/10027.yaml
rename to data/v2/weapons/10027.yaml
diff --git a/data/v2-pre/weapons/10028.yaml b/data/v2/weapons/10028.yaml
similarity index 100%
rename from data/v2-pre/weapons/10028.yaml
rename to data/v2/weapons/10028.yaml
diff --git a/data/v2-pre/weapons/10029.yaml b/data/v2/weapons/10029.yaml
similarity index 100%
rename from data/v2-pre/weapons/10029.yaml
rename to data/v2/weapons/10029.yaml
diff --git a/data/v2-pre/weapons/10030.yaml b/data/v2/weapons/10030.yaml
similarity index 100%
rename from data/v2-pre/weapons/10030.yaml
rename to data/v2/weapons/10030.yaml
diff --git a/data/v2-pre/weapons/10031.yaml b/data/v2/weapons/10031.yaml
similarity index 100%
rename from data/v2-pre/weapons/10031.yaml
rename to data/v2/weapons/10031.yaml
diff --git a/data/v2-pre/weapons/10032.yaml b/data/v2/weapons/10032.yaml
similarity index 100%
rename from data/v2-pre/weapons/10032.yaml
rename to data/v2/weapons/10032.yaml
diff --git a/data/v2-pre/weapons/10033.yaml b/data/v2/weapons/10033.yaml
similarity index 100%
rename from data/v2-pre/weapons/10033.yaml
rename to data/v2/weapons/10033.yaml
diff --git a/data/v2-pre/weapons/10034.yaml b/data/v2/weapons/10034.yaml
similarity index 100%
rename from data/v2-pre/weapons/10034.yaml
rename to data/v2/weapons/10034.yaml
diff --git a/data/v2-pre/weapons/10035.yaml b/data/v2/weapons/10035.yaml
similarity index 100%
rename from data/v2-pre/weapons/10035.yaml
rename to data/v2/weapons/10035.yaml
diff --git a/data/v2-pre/weapons/10036.yaml b/data/v2/weapons/10036.yaml
similarity index 100%
rename from data/v2-pre/weapons/10036.yaml
rename to data/v2/weapons/10036.yaml
diff --git a/data/v2-pre/weapons/10037.yaml b/data/v2/weapons/10037.yaml
similarity index 100%
rename from data/v2-pre/weapons/10037.yaml
rename to data/v2/weapons/10037.yaml
diff --git a/data/v2-pre/weapons/10038.yaml b/data/v2/weapons/10038.yaml
similarity index 100%
rename from data/v2-pre/weapons/10038.yaml
rename to data/v2/weapons/10038.yaml
diff --git a/data/v2-pre/weapons/10039.yaml b/data/v2/weapons/10039.yaml
similarity index 100%
rename from data/v2-pre/weapons/10039.yaml
rename to data/v2/weapons/10039.yaml
diff --git a/data/v2-pre/weapons/10040.yaml b/data/v2/weapons/10040.yaml
similarity index 100%
rename from data/v2-pre/weapons/10040.yaml
rename to data/v2/weapons/10040.yaml
diff --git a/data/v2-pre/weapons/10041.yaml b/data/v2/weapons/10041.yaml
similarity index 100%
rename from data/v2-pre/weapons/10041.yaml
rename to data/v2/weapons/10041.yaml
diff --git a/data/v2-pre/weapons/10042.yaml b/data/v2/weapons/10042.yaml
similarity index 100%
rename from data/v2-pre/weapons/10042.yaml
rename to data/v2/weapons/10042.yaml
diff --git a/data/v2-pre/weapons/10043.yaml b/data/v2/weapons/10043.yaml
similarity index 100%
rename from data/v2-pre/weapons/10043.yaml
rename to data/v2/weapons/10043.yaml
diff --git a/data/v2-pre/weapons/10044.yaml b/data/v2/weapons/10044.yaml
similarity index 100%
rename from data/v2-pre/weapons/10044.yaml
rename to data/v2/weapons/10044.yaml
diff --git a/data/v2-pre/weapons/10045.yaml b/data/v2/weapons/10045.yaml
similarity index 100%
rename from data/v2-pre/weapons/10045.yaml
rename to data/v2/weapons/10045.yaml
diff --git a/data/v2-pre/weapons/10046.yaml b/data/v2/weapons/10046.yaml
similarity index 100%
rename from data/v2-pre/weapons/10046.yaml
rename to data/v2/weapons/10046.yaml
diff --git a/data/v2-pre/weapons/10047.yaml b/data/v2/weapons/10047.yaml
similarity index 100%
rename from data/v2-pre/weapons/10047.yaml
rename to data/v2/weapons/10047.yaml
diff --git a/data/v2-pre/weapons/10048.yaml b/data/v2/weapons/10048.yaml
similarity index 100%
rename from data/v2-pre/weapons/10048.yaml
rename to data/v2/weapons/10048.yaml
diff --git a/data/v2-pre/weapons/10049.yaml b/data/v2/weapons/10049.yaml
similarity index 100%
rename from data/v2-pre/weapons/10049.yaml
rename to data/v2/weapons/10049.yaml
diff --git a/data/v2-pre/weapons/10050.yaml b/data/v2/weapons/10050.yaml
similarity index 100%
rename from data/v2-pre/weapons/10050.yaml
rename to data/v2/weapons/10050.yaml
diff --git a/data/v2-pre/weapons/10051.yaml b/data/v2/weapons/10051.yaml
similarity index 100%
rename from data/v2-pre/weapons/10051.yaml
rename to data/v2/weapons/10051.yaml
diff --git a/data/v2-pre/weapons/10052.yaml b/data/v2/weapons/10052.yaml
similarity index 100%
rename from data/v2-pre/weapons/10052.yaml
rename to data/v2/weapons/10052.yaml
diff --git a/data/v2-pre/weapons/10053.yaml b/data/v2/weapons/10053.yaml
similarity index 100%
rename from data/v2-pre/weapons/10053.yaml
rename to data/v2/weapons/10053.yaml
diff --git a/data/v2-pre/weapons/10054.yaml b/data/v2/weapons/10054.yaml
similarity index 100%
rename from data/v2-pre/weapons/10054.yaml
rename to data/v2/weapons/10054.yaml
diff --git a/data/v2-pre/weapons/10055.yaml b/data/v2/weapons/10055.yaml
similarity index 100%
rename from data/v2-pre/weapons/10055.yaml
rename to data/v2/weapons/10055.yaml
diff --git a/data/v2-pre/weapons/10056.yaml b/data/v2/weapons/10056.yaml
similarity index 100%
rename from data/v2-pre/weapons/10056.yaml
rename to data/v2/weapons/10056.yaml
diff --git a/data/v2-pre/weapons/10057.yaml b/data/v2/weapons/10057.yaml
similarity index 100%
rename from data/v2-pre/weapons/10057.yaml
rename to data/v2/weapons/10057.yaml
diff --git a/data/v2-pre/weapons/10058.yaml b/data/v2/weapons/10058.yaml
similarity index 100%
rename from data/v2-pre/weapons/10058.yaml
rename to data/v2/weapons/10058.yaml
diff --git a/data/v2-pre/weapons/10059.yaml b/data/v2/weapons/10059.yaml
similarity index 100%
rename from data/v2-pre/weapons/10059.yaml
rename to data/v2/weapons/10059.yaml
diff --git a/data/v2-pre/weapons/10060.yaml b/data/v2/weapons/10060.yaml
similarity index 100%
rename from data/v2-pre/weapons/10060.yaml
rename to data/v2/weapons/10060.yaml
diff --git a/data/v2-pre/weapons/10061.yaml b/data/v2/weapons/10061.yaml
similarity index 100%
rename from data/v2-pre/weapons/10061.yaml
rename to data/v2/weapons/10061.yaml
diff --git a/data/v2-pre/weapons/10062.yaml b/data/v2/weapons/10062.yaml
similarity index 100%
rename from data/v2-pre/weapons/10062.yaml
rename to data/v2/weapons/10062.yaml
diff --git a/data/v2-pre/weapons/10063.yaml b/data/v2/weapons/10063.yaml
similarity index 100%
rename from data/v2-pre/weapons/10063.yaml
rename to data/v2/weapons/10063.yaml
diff --git a/data/v2-pre/weapons/10064.yaml b/data/v2/weapons/10064.yaml
similarity index 100%
rename from data/v2-pre/weapons/10064.yaml
rename to data/v2/weapons/10064.yaml
diff --git a/data/v2-pre/weapons/10065.yaml b/data/v2/weapons/10065.yaml
similarity index 100%
rename from data/v2-pre/weapons/10065.yaml
rename to data/v2/weapons/10065.yaml
diff --git a/data/v2-pre/weapons/10066.yaml b/data/v2/weapons/10066.yaml
similarity index 100%
rename from data/v2-pre/weapons/10066.yaml
rename to data/v2/weapons/10066.yaml
diff --git a/data/v2-pre/weapons/10067.yaml b/data/v2/weapons/10067.yaml
similarity index 100%
rename from data/v2-pre/weapons/10067.yaml
rename to data/v2/weapons/10067.yaml
diff --git a/data/v2-pre/weapons/10068.yaml b/data/v2/weapons/10068.yaml
similarity index 100%
rename from data/v2-pre/weapons/10068.yaml
rename to data/v2/weapons/10068.yaml
diff --git a/data/v2-pre/weapons/10069.yaml b/data/v2/weapons/10069.yaml
similarity index 100%
rename from data/v2-pre/weapons/10069.yaml
rename to data/v2/weapons/10069.yaml
diff --git a/data/v2-pre/weapons/10070.yaml b/data/v2/weapons/10070.yaml
similarity index 100%
rename from data/v2-pre/weapons/10070.yaml
rename to data/v2/weapons/10070.yaml
diff --git a/data/v2-pre/weapons/10071.yaml b/data/v2/weapons/10071.yaml
similarity index 100%
rename from data/v2-pre/weapons/10071.yaml
rename to data/v2/weapons/10071.yaml
diff --git a/data/v2-pre/weapons/10072.yaml b/data/v2/weapons/10072.yaml
similarity index 100%
rename from data/v2-pre/weapons/10072.yaml
rename to data/v2/weapons/10072.yaml
diff --git a/data/v2-pre/weapons/10073.yaml b/data/v2/weapons/10073.yaml
similarity index 100%
rename from data/v2-pre/weapons/10073.yaml
rename to data/v2/weapons/10073.yaml
diff --git a/data/v2-pre/weapons/10074.yaml b/data/v2/weapons/10074.yaml
similarity index 100%
rename from data/v2-pre/weapons/10074.yaml
rename to data/v2/weapons/10074.yaml
diff --git a/data/v2-pre/weapons/10075.yaml b/data/v2/weapons/10075.yaml
similarity index 100%
rename from data/v2-pre/weapons/10075.yaml
rename to data/v2/weapons/10075.yaml
diff --git a/data/v2-pre/weapons/10076.yaml b/data/v2/weapons/10076.yaml
similarity index 100%
rename from data/v2-pre/weapons/10076.yaml
rename to data/v2/weapons/10076.yaml
diff --git a/data/v2-pre/weapons/10077.yaml b/data/v2/weapons/10077.yaml
similarity index 100%
rename from data/v2-pre/weapons/10077.yaml
rename to data/v2/weapons/10077.yaml
diff --git a/data/v2-pre/weapons/10078.yaml b/data/v2/weapons/10078.yaml
similarity index 100%
rename from data/v2-pre/weapons/10078.yaml
rename to data/v2/weapons/10078.yaml
diff --git a/data/v2-pre/weapons/10079.yaml b/data/v2/weapons/10079.yaml
similarity index 100%
rename from data/v2-pre/weapons/10079.yaml
rename to data/v2/weapons/10079.yaml
diff --git a/data/v2-pre/weapons/10080.yaml b/data/v2/weapons/10080.yaml
similarity index 100%
rename from data/v2-pre/weapons/10080.yaml
rename to data/v2/weapons/10080.yaml
diff --git a/data/v2-pre/weapons/10081.yaml b/data/v2/weapons/10081.yaml
similarity index 100%
rename from data/v2-pre/weapons/10081.yaml
rename to data/v2/weapons/10081.yaml
diff --git a/data/v2-pre/weapons/10082.yaml b/data/v2/weapons/10082.yaml
similarity index 100%
rename from data/v2-pre/weapons/10082.yaml
rename to data/v2/weapons/10082.yaml
diff --git a/data/v2-pre/weapons/10083.yaml b/data/v2/weapons/10083.yaml
similarity index 100%
rename from data/v2-pre/weapons/10083.yaml
rename to data/v2/weapons/10083.yaml
diff --git a/data/v2-pre/weapons/10084.yaml b/data/v2/weapons/10084.yaml
similarity index 100%
rename from data/v2-pre/weapons/10084.yaml
rename to data/v2/weapons/10084.yaml
diff --git a/data/v2-pre/weapons/10085.yaml b/data/v2/weapons/10085.yaml
similarity index 100%
rename from data/v2-pre/weapons/10085.yaml
rename to data/v2/weapons/10085.yaml
diff --git a/data/v2-pre/weapons/10086.yaml b/data/v2/weapons/10086.yaml
similarity index 100%
rename from data/v2-pre/weapons/10086.yaml
rename to data/v2/weapons/10086.yaml
diff --git a/data/v2-pre/weapons/10087.yaml b/data/v2/weapons/10087.yaml
similarity index 100%
rename from data/v2-pre/weapons/10087.yaml
rename to data/v2/weapons/10087.yaml
diff --git a/data/v2-pre/weapons/10088.yaml b/data/v2/weapons/10088.yaml
similarity index 100%
rename from data/v2-pre/weapons/10088.yaml
rename to data/v2/weapons/10088.yaml
diff --git a/data/v2-pre/weapons/10089.yaml b/data/v2/weapons/10089.yaml
similarity index 100%
rename from data/v2-pre/weapons/10089.yaml
rename to data/v2/weapons/10089.yaml
diff --git a/data/v2-pre/weapons/10090.yaml b/data/v2/weapons/10090.yaml
similarity index 100%
rename from data/v2-pre/weapons/10090.yaml
rename to data/v2/weapons/10090.yaml
diff --git a/data/v2-pre/weapons/10091.yaml b/data/v2/weapons/10091.yaml
similarity index 100%
rename from data/v2-pre/weapons/10091.yaml
rename to data/v2/weapons/10091.yaml
diff --git a/data/v2-pre/weapons/10092.yaml b/data/v2/weapons/10092.yaml
similarity index 100%
rename from data/v2-pre/weapons/10092.yaml
rename to data/v2/weapons/10092.yaml
diff --git a/data/v2-pre/weapons/10093.yaml b/data/v2/weapons/10093.yaml
similarity index 100%
rename from data/v2-pre/weapons/10093.yaml
rename to data/v2/weapons/10093.yaml
diff --git a/data/v2-pre/weapons/10094.yaml b/data/v2/weapons/10094.yaml
similarity index 100%
rename from data/v2-pre/weapons/10094.yaml
rename to data/v2/weapons/10094.yaml
diff --git a/data/v2-pre/weapons/10095.yaml b/data/v2/weapons/10095.yaml
similarity index 100%
rename from data/v2-pre/weapons/10095.yaml
rename to data/v2/weapons/10095.yaml
diff --git a/data/v2-pre/weapons/10096.yaml b/data/v2/weapons/10096.yaml
similarity index 100%
rename from data/v2-pre/weapons/10096.yaml
rename to data/v2/weapons/10096.yaml
diff --git a/data/v2-pre/weapons/10097.yaml b/data/v2/weapons/10097.yaml
similarity index 100%
rename from data/v2-pre/weapons/10097.yaml
rename to data/v2/weapons/10097.yaml
diff --git a/data/v2-pre/weapons/10098.yaml b/data/v2/weapons/10098.yaml
similarity index 100%
rename from data/v2-pre/weapons/10098.yaml
rename to data/v2/weapons/10098.yaml
diff --git a/data/v2-pre/weapons/10099.yaml b/data/v2/weapons/10099.yaml
similarity index 100%
rename from data/v2-pre/weapons/10099.yaml
rename to data/v2/weapons/10099.yaml
diff --git a/data/v2-pre/weapons/10100.yaml b/data/v2/weapons/10100.yaml
similarity index 100%
rename from data/v2-pre/weapons/10100.yaml
rename to data/v2/weapons/10100.yaml
diff --git a/data/v2-pre/weapons/10101.yaml b/data/v2/weapons/10101.yaml
similarity index 100%
rename from data/v2-pre/weapons/10101.yaml
rename to data/v2/weapons/10101.yaml
diff --git a/data/v2-pre/weapons/10102.yaml b/data/v2/weapons/10102.yaml
similarity index 100%
rename from data/v2-pre/weapons/10102.yaml
rename to data/v2/weapons/10102.yaml
diff --git a/data/v2-pre/weapons/10103.yaml b/data/v2/weapons/10103.yaml
similarity index 100%
rename from data/v2-pre/weapons/10103.yaml
rename to data/v2/weapons/10103.yaml
diff --git a/data/v2-pre/weapons/10104.yaml b/data/v2/weapons/10104.yaml
similarity index 100%
rename from data/v2-pre/weapons/10104.yaml
rename to data/v2/weapons/10104.yaml
diff --git a/data/v2-pre/weapons/10105.yaml b/data/v2/weapons/10105.yaml
similarity index 100%
rename from data/v2-pre/weapons/10105.yaml
rename to data/v2/weapons/10105.yaml
diff --git a/data/v2-pre/weapons/10106.yaml b/data/v2/weapons/10106.yaml
similarity index 100%
rename from data/v2-pre/weapons/10106.yaml
rename to data/v2/weapons/10106.yaml
diff --git a/data/v2-pre/weapons/10107.yaml b/data/v2/weapons/10107.yaml
similarity index 100%
rename from data/v2-pre/weapons/10107.yaml
rename to data/v2/weapons/10107.yaml
diff --git a/data/v2-pre/weapons/10108.yaml b/data/v2/weapons/10108.yaml
similarity index 100%
rename from data/v2-pre/weapons/10108.yaml
rename to data/v2/weapons/10108.yaml
diff --git a/data/v2-pre/weapons/10109.yaml b/data/v2/weapons/10109.yaml
similarity index 100%
rename from data/v2-pre/weapons/10109.yaml
rename to data/v2/weapons/10109.yaml
diff --git a/data/v2-pre/weapons/10110.yaml b/data/v2/weapons/10110.yaml
similarity index 100%
rename from data/v2-pre/weapons/10110.yaml
rename to data/v2/weapons/10110.yaml
diff --git a/data/v2-pre/weapons/10111.yaml b/data/v2/weapons/10111.yaml
similarity index 100%
rename from data/v2-pre/weapons/10111.yaml
rename to data/v2/weapons/10111.yaml
diff --git a/data/v2-pre/weapons/10112.yaml b/data/v2/weapons/10112.yaml
similarity index 100%
rename from data/v2-pre/weapons/10112.yaml
rename to data/v2/weapons/10112.yaml
diff --git a/data/v2-pre/weapons/10113.yaml b/data/v2/weapons/10113.yaml
similarity index 100%
rename from data/v2-pre/weapons/10113.yaml
rename to data/v2/weapons/10113.yaml
diff --git a/data/v2-pre/weapons/10114.yaml b/data/v2/weapons/10114.yaml
similarity index 100%
rename from data/v2-pre/weapons/10114.yaml
rename to data/v2/weapons/10114.yaml
diff --git a/data/v2-pre/weapons/10115.yaml b/data/v2/weapons/10115.yaml
similarity index 100%
rename from data/v2-pre/weapons/10115.yaml
rename to data/v2/weapons/10115.yaml
diff --git a/data/v2-pre/weapons/10116.yaml b/data/v2/weapons/10116.yaml
similarity index 100%
rename from data/v2-pre/weapons/10116.yaml
rename to data/v2/weapons/10116.yaml
diff --git a/data/v2-pre/weapons/10117.yaml b/data/v2/weapons/10117.yaml
similarity index 100%
rename from data/v2-pre/weapons/10117.yaml
rename to data/v2/weapons/10117.yaml
diff --git a/data/v2-pre/weapons/10118.yaml b/data/v2/weapons/10118.yaml
similarity index 100%
rename from data/v2-pre/weapons/10118.yaml
rename to data/v2/weapons/10118.yaml
diff --git a/data/v2-pre/weapons/10119.yaml b/data/v2/weapons/10119.yaml
similarity index 100%
rename from data/v2-pre/weapons/10119.yaml
rename to data/v2/weapons/10119.yaml
diff --git a/data/v2-pre/weapons/10120.yaml b/data/v2/weapons/10120.yaml
similarity index 100%
rename from data/v2-pre/weapons/10120.yaml
rename to data/v2/weapons/10120.yaml
diff --git a/data/v2-pre/weapons/10121.yaml b/data/v2/weapons/10121.yaml
similarity index 100%
rename from data/v2-pre/weapons/10121.yaml
rename to data/v2/weapons/10121.yaml
diff --git a/data/v2-pre/weapons/10122.yaml b/data/v2/weapons/10122.yaml
similarity index 100%
rename from data/v2-pre/weapons/10122.yaml
rename to data/v2/weapons/10122.yaml
diff --git a/data/v2-pre/weapons/10123.yaml b/data/v2/weapons/10123.yaml
similarity index 100%
rename from data/v2-pre/weapons/10123.yaml
rename to data/v2/weapons/10123.yaml
diff --git a/data/v2-pre/weapons/10124.yaml b/data/v2/weapons/10124.yaml
similarity index 100%
rename from data/v2-pre/weapons/10124.yaml
rename to data/v2/weapons/10124.yaml
diff --git a/data/v2-pre/weapons/10125.yaml b/data/v2/weapons/10125.yaml
similarity index 100%
rename from data/v2-pre/weapons/10125.yaml
rename to data/v2/weapons/10125.yaml
diff --git a/data/v2-pre/weapons/10126.yaml b/data/v2/weapons/10126.yaml
similarity index 100%
rename from data/v2-pre/weapons/10126.yaml
rename to data/v2/weapons/10126.yaml
diff --git a/data/v2-pre/weapons/10127.yaml b/data/v2/weapons/10127.yaml
similarity index 100%
rename from data/v2-pre/weapons/10127.yaml
rename to data/v2/weapons/10127.yaml
diff --git a/data/v2-pre/weapons/10128.yaml b/data/v2/weapons/10128.yaml
similarity index 100%
rename from data/v2-pre/weapons/10128.yaml
rename to data/v2/weapons/10128.yaml
diff --git a/data/v2-pre/weapons/10129.yaml b/data/v2/weapons/10129.yaml
similarity index 100%
rename from data/v2-pre/weapons/10129.yaml
rename to data/v2/weapons/10129.yaml
diff --git a/data/v2-pre/weapons/10130.yaml b/data/v2/weapons/10130.yaml
similarity index 100%
rename from data/v2-pre/weapons/10130.yaml
rename to data/v2/weapons/10130.yaml
diff --git a/data/v2-pre/weapons/10131.yaml b/data/v2/weapons/10131.yaml
similarity index 100%
rename from data/v2-pre/weapons/10131.yaml
rename to data/v2/weapons/10131.yaml
diff --git a/data/v2-pre/weapons/10132.yaml b/data/v2/weapons/10132.yaml
similarity index 100%
rename from data/v2-pre/weapons/10132.yaml
rename to data/v2/weapons/10132.yaml
diff --git a/data/v2-pre/weapons/10133.yaml b/data/v2/weapons/10133.yaml
similarity index 100%
rename from data/v2-pre/weapons/10133.yaml
rename to data/v2/weapons/10133.yaml
diff --git a/data/v2-pre/weapons/10134.yaml b/data/v2/weapons/10134.yaml
similarity index 100%
rename from data/v2-pre/weapons/10134.yaml
rename to data/v2/weapons/10134.yaml
diff --git a/data/v2-pre/weapons/10135.yaml b/data/v2/weapons/10135.yaml
similarity index 100%
rename from data/v2-pre/weapons/10135.yaml
rename to data/v2/weapons/10135.yaml
diff --git a/data/v2-pre/weapons/10136.yaml b/data/v2/weapons/10136.yaml
similarity index 100%
rename from data/v2-pre/weapons/10136.yaml
rename to data/v2/weapons/10136.yaml
diff --git a/data/v2-pre/weapons/10137.yaml b/data/v2/weapons/10137.yaml
similarity index 100%
rename from data/v2-pre/weapons/10137.yaml
rename to data/v2/weapons/10137.yaml
diff --git a/data/v2-pre/weapons/10138.yaml b/data/v2/weapons/10138.yaml
similarity index 100%
rename from data/v2-pre/weapons/10138.yaml
rename to data/v2/weapons/10138.yaml
diff --git a/data/v2-pre/weapons/10139.yaml b/data/v2/weapons/10139.yaml
similarity index 100%
rename from data/v2-pre/weapons/10139.yaml
rename to data/v2/weapons/10139.yaml
diff --git a/data/v2-pre/weapons/10140.yaml b/data/v2/weapons/10140.yaml
similarity index 100%
rename from data/v2-pre/weapons/10140.yaml
rename to data/v2/weapons/10140.yaml
diff --git a/data/v2-pre/weapons/10141.yaml b/data/v2/weapons/10141.yaml
similarity index 100%
rename from data/v2-pre/weapons/10141.yaml
rename to data/v2/weapons/10141.yaml
diff --git a/data/v2-pre/weapons/10142.yaml b/data/v2/weapons/10142.yaml
similarity index 100%
rename from data/v2-pre/weapons/10142.yaml
rename to data/v2/weapons/10142.yaml
diff --git a/data/v2-pre/weapons/10143.yaml b/data/v2/weapons/10143.yaml
similarity index 100%
rename from data/v2-pre/weapons/10143.yaml
rename to data/v2/weapons/10143.yaml
diff --git a/data/v2-pre/weapons/10144.yaml b/data/v2/weapons/10144.yaml
similarity index 100%
rename from data/v2-pre/weapons/10144.yaml
rename to data/v2/weapons/10144.yaml
diff --git a/data/v2-pre/weapons/10145.yaml b/data/v2/weapons/10145.yaml
similarity index 100%
rename from data/v2-pre/weapons/10145.yaml
rename to data/v2/weapons/10145.yaml
diff --git a/data/v2-pre/weapons/10146.yaml b/data/v2/weapons/10146.yaml
similarity index 100%
rename from data/v2-pre/weapons/10146.yaml
rename to data/v2/weapons/10146.yaml
diff --git a/data/v2-pre/weapons/10147.yaml b/data/v2/weapons/10147.yaml
similarity index 100%
rename from data/v2-pre/weapons/10147.yaml
rename to data/v2/weapons/10147.yaml
diff --git a/data/v2-pre/weapons/10148.yaml b/data/v2/weapons/10148.yaml
similarity index 100%
rename from data/v2-pre/weapons/10148.yaml
rename to data/v2/weapons/10148.yaml
diff --git a/data/v2-pre/weapons/10150.yaml b/data/v2/weapons/10150.yaml
similarity index 100%
rename from data/v2-pre/weapons/10150.yaml
rename to data/v2/weapons/10150.yaml
diff --git a/data/v2-pre/weapons/10151.yaml b/data/v2/weapons/10151.yaml
similarity index 100%
rename from data/v2-pre/weapons/10151.yaml
rename to data/v2/weapons/10151.yaml
diff --git a/data/v2-pre/weapons/10152.yaml b/data/v2/weapons/10152.yaml
similarity index 100%
rename from data/v2-pre/weapons/10152.yaml
rename to data/v2/weapons/10152.yaml
diff --git a/data/v2-pre/weapons/10153.yaml b/data/v2/weapons/10153.yaml
similarity index 100%
rename from data/v2-pre/weapons/10153.yaml
rename to data/v2/weapons/10153.yaml
diff --git a/data/v2-pre/weapons/10154.yaml b/data/v2/weapons/10154.yaml
similarity index 100%
rename from data/v2-pre/weapons/10154.yaml
rename to data/v2/weapons/10154.yaml
diff --git a/data/v2-pre/weapons/10156.yaml b/data/v2/weapons/10156.yaml
similarity index 100%
rename from data/v2-pre/weapons/10156.yaml
rename to data/v2/weapons/10156.yaml
diff --git a/data/v2-pre/weapons/10157.yaml b/data/v2/weapons/10157.yaml
similarity index 100%
rename from data/v2-pre/weapons/10157.yaml
rename to data/v2/weapons/10157.yaml
diff --git a/data/v2-pre/weapons/10158.yaml b/data/v2/weapons/10158.yaml
similarity index 100%
rename from data/v2-pre/weapons/10158.yaml
rename to data/v2/weapons/10158.yaml
diff --git a/data/v2-pre/weapons/10159.yaml b/data/v2/weapons/10159.yaml
similarity index 100%
rename from data/v2-pre/weapons/10159.yaml
rename to data/v2/weapons/10159.yaml
diff --git a/data/v2-pre/weapons/10160.yaml b/data/v2/weapons/10160.yaml
similarity index 100%
rename from data/v2-pre/weapons/10160.yaml
rename to data/v2/weapons/10160.yaml
diff --git a/data/v2-pre/weapons/10161.yaml b/data/v2/weapons/10161.yaml
similarity index 100%
rename from data/v2-pre/weapons/10161.yaml
rename to data/v2/weapons/10161.yaml
diff --git a/data/v2-pre/weapons/10162.yaml b/data/v2/weapons/10162.yaml
similarity index 100%
rename from data/v2-pre/weapons/10162.yaml
rename to data/v2/weapons/10162.yaml
diff --git a/data/v2-pre/weapons/10163.yaml b/data/v2/weapons/10163.yaml
similarity index 100%
rename from data/v2-pre/weapons/10163.yaml
rename to data/v2/weapons/10163.yaml
diff --git a/data/v2-pre/weapons/10164.yaml b/data/v2/weapons/10164.yaml
similarity index 100%
rename from data/v2-pre/weapons/10164.yaml
rename to data/v2/weapons/10164.yaml
diff --git a/data/v2-pre/weapons/10165.yaml b/data/v2/weapons/10165.yaml
similarity index 100%
rename from data/v2-pre/weapons/10165.yaml
rename to data/v2/weapons/10165.yaml
diff --git a/data/v2-pre/weapons/10166.yaml b/data/v2/weapons/10166.yaml
similarity index 100%
rename from data/v2-pre/weapons/10166.yaml
rename to data/v2/weapons/10166.yaml
diff --git a/data/v2-pre/weapons/10167.yaml b/data/v2/weapons/10167.yaml
similarity index 100%
rename from data/v2-pre/weapons/10167.yaml
rename to data/v2/weapons/10167.yaml
diff --git a/data/v2-pre/weapons/10168.yaml b/data/v2/weapons/10168.yaml
similarity index 100%
rename from data/v2-pre/weapons/10168.yaml
rename to data/v2/weapons/10168.yaml
diff --git a/data/v2-pre/weapons/10169.yaml b/data/v2/weapons/10169.yaml
similarity index 100%
rename from data/v2-pre/weapons/10169.yaml
rename to data/v2/weapons/10169.yaml
diff --git a/data/v2-pre/weapons/10170.yaml b/data/v2/weapons/10170.yaml
similarity index 100%
rename from data/v2-pre/weapons/10170.yaml
rename to data/v2/weapons/10170.yaml
diff --git a/data/v2-pre/weapons/10171.yaml b/data/v2/weapons/10171.yaml
similarity index 100%
rename from data/v2-pre/weapons/10171.yaml
rename to data/v2/weapons/10171.yaml
diff --git a/data/v2-pre/weapons/10172.yaml b/data/v2/weapons/10172.yaml
similarity index 100%
rename from data/v2-pre/weapons/10172.yaml
rename to data/v2/weapons/10172.yaml
diff --git a/data/v2-pre/weapons/10173.yaml b/data/v2/weapons/10173.yaml
similarity index 100%
rename from data/v2-pre/weapons/10173.yaml
rename to data/v2/weapons/10173.yaml
diff --git a/data/v2-pre/weapons/10174.yaml b/data/v2/weapons/10174.yaml
similarity index 100%
rename from data/v2-pre/weapons/10174.yaml
rename to data/v2/weapons/10174.yaml
diff --git a/data/v2-pre/weapons/10175.yaml b/data/v2/weapons/10175.yaml
similarity index 100%
rename from data/v2-pre/weapons/10175.yaml
rename to data/v2/weapons/10175.yaml
diff --git a/data/v2-pre/weapons/10176.yaml b/data/v2/weapons/10176.yaml
similarity index 100%
rename from data/v2-pre/weapons/10176.yaml
rename to data/v2/weapons/10176.yaml
diff --git a/data/v2-pre/weapons/10177.yaml b/data/v2/weapons/10177.yaml
similarity index 100%
rename from data/v2-pre/weapons/10177.yaml
rename to data/v2/weapons/10177.yaml
diff --git a/data/v2-pre/weapons/10178.yaml b/data/v2/weapons/10178.yaml
similarity index 100%
rename from data/v2-pre/weapons/10178.yaml
rename to data/v2/weapons/10178.yaml
diff --git a/data/v2-pre/weapons/10179.yaml b/data/v2/weapons/10179.yaml
similarity index 100%
rename from data/v2-pre/weapons/10179.yaml
rename to data/v2/weapons/10179.yaml
diff --git a/data/v2-pre/weapons/10180.yaml b/data/v2/weapons/10180.yaml
similarity index 100%
rename from data/v2-pre/weapons/10180.yaml
rename to data/v2/weapons/10180.yaml
diff --git a/data/v2-pre/weapons/10181.yaml b/data/v2/weapons/10181.yaml
similarity index 100%
rename from data/v2-pre/weapons/10181.yaml
rename to data/v2/weapons/10181.yaml
diff --git a/data/v2-pre/weapons/10182.yaml b/data/v2/weapons/10182.yaml
similarity index 100%
rename from data/v2-pre/weapons/10182.yaml
rename to data/v2/weapons/10182.yaml
diff --git a/data/v2-pre/weapons/10183.yaml b/data/v2/weapons/10183.yaml
similarity index 100%
rename from data/v2-pre/weapons/10183.yaml
rename to data/v2/weapons/10183.yaml
diff --git a/data/v2-pre/weapons/10184.yaml b/data/v2/weapons/10184.yaml
similarity index 100%
rename from data/v2-pre/weapons/10184.yaml
rename to data/v2/weapons/10184.yaml
diff --git a/data/v2-pre/weapons/10185.yaml b/data/v2/weapons/10185.yaml
similarity index 100%
rename from data/v2-pre/weapons/10185.yaml
rename to data/v2/weapons/10185.yaml
diff --git a/data/v2-pre/weapons/10186.yaml b/data/v2/weapons/10186.yaml
similarity index 100%
rename from data/v2-pre/weapons/10186.yaml
rename to data/v2/weapons/10186.yaml
diff --git a/data/v2-pre/weapons/10187.yaml b/data/v2/weapons/10187.yaml
similarity index 100%
rename from data/v2-pre/weapons/10187.yaml
rename to data/v2/weapons/10187.yaml
diff --git a/data/v2-pre/weapons/10188.yaml b/data/v2/weapons/10188.yaml
similarity index 100%
rename from data/v2-pre/weapons/10188.yaml
rename to data/v2/weapons/10188.yaml
diff --git a/data/v2-pre/weapons/10189.yaml b/data/v2/weapons/10189.yaml
similarity index 100%
rename from data/v2-pre/weapons/10189.yaml
rename to data/v2/weapons/10189.yaml
diff --git a/data/v2-pre/weapons/10190.yaml b/data/v2/weapons/10190.yaml
similarity index 100%
rename from data/v2-pre/weapons/10190.yaml
rename to data/v2/weapons/10190.yaml
diff --git a/data/v2-pre/weapons/10191.yaml b/data/v2/weapons/10191.yaml
similarity index 100%
rename from data/v2-pre/weapons/10191.yaml
rename to data/v2/weapons/10191.yaml
diff --git a/data/v2-pre/weapons/10193.yaml b/data/v2/weapons/10193.yaml
similarity index 100%
rename from data/v2-pre/weapons/10193.yaml
rename to data/v2/weapons/10193.yaml
diff --git a/data/v2-pre/weapons/10194.yaml b/data/v2/weapons/10194.yaml
similarity index 100%
rename from data/v2-pre/weapons/10194.yaml
rename to data/v2/weapons/10194.yaml
diff --git a/data/v2-pre/weapons/10195.yaml b/data/v2/weapons/10195.yaml
similarity index 100%
rename from data/v2-pre/weapons/10195.yaml
rename to data/v2/weapons/10195.yaml
diff --git a/data/v2-pre/weapons/10196.yaml b/data/v2/weapons/10196.yaml
similarity index 100%
rename from data/v2-pre/weapons/10196.yaml
rename to data/v2/weapons/10196.yaml
diff --git a/data/v2-pre/weapons/10197.yaml b/data/v2/weapons/10197.yaml
similarity index 100%
rename from data/v2-pre/weapons/10197.yaml
rename to data/v2/weapons/10197.yaml
diff --git a/data/v2-pre/weapons/10198.yaml b/data/v2/weapons/10198.yaml
similarity index 100%
rename from data/v2-pre/weapons/10198.yaml
rename to data/v2/weapons/10198.yaml
diff --git a/data/v2-pre/weapons/10199.yaml b/data/v2/weapons/10199.yaml
similarity index 100%
rename from data/v2-pre/weapons/10199.yaml
rename to data/v2/weapons/10199.yaml
diff --git a/data/v2-pre/weapons/10200.yaml b/data/v2/weapons/10200.yaml
similarity index 100%
rename from data/v2-pre/weapons/10200.yaml
rename to data/v2/weapons/10200.yaml
diff --git a/data/v2-pre/weapons/10201.yaml b/data/v2/weapons/10201.yaml
similarity index 100%
rename from data/v2-pre/weapons/10201.yaml
rename to data/v2/weapons/10201.yaml
diff --git a/data/v2-pre/weapons/10202.yaml b/data/v2/weapons/10202.yaml
similarity index 100%
rename from data/v2-pre/weapons/10202.yaml
rename to data/v2/weapons/10202.yaml
diff --git a/data/v2-pre/weapons/10203.yaml b/data/v2/weapons/10203.yaml
similarity index 100%
rename from data/v2-pre/weapons/10203.yaml
rename to data/v2/weapons/10203.yaml
diff --git a/data/v2-pre/weapons/10204.yaml b/data/v2/weapons/10204.yaml
similarity index 100%
rename from data/v2-pre/weapons/10204.yaml
rename to data/v2/weapons/10204.yaml
diff --git a/data/v2-pre/weapons/10205.yaml b/data/v2/weapons/10205.yaml
similarity index 100%
rename from data/v2-pre/weapons/10205.yaml
rename to data/v2/weapons/10205.yaml
diff --git a/data/v2-pre/weapons/10206.yaml b/data/v2/weapons/10206.yaml
similarity index 100%
rename from data/v2-pre/weapons/10206.yaml
rename to data/v2/weapons/10206.yaml
diff --git a/data/v2-pre/weapons/10207.yaml b/data/v2/weapons/10207.yaml
similarity index 100%
rename from data/v2-pre/weapons/10207.yaml
rename to data/v2/weapons/10207.yaml
diff --git a/data/v2-pre/weapons/10208.yaml b/data/v2/weapons/10208.yaml
similarity index 100%
rename from data/v2-pre/weapons/10208.yaml
rename to data/v2/weapons/10208.yaml
diff --git a/data/v2-pre/weapons/10209.yaml b/data/v2/weapons/10209.yaml
similarity index 100%
rename from data/v2-pre/weapons/10209.yaml
rename to data/v2/weapons/10209.yaml
diff --git a/data/v2-pre/weapons/10210.yaml b/data/v2/weapons/10210.yaml
similarity index 100%
rename from data/v2-pre/weapons/10210.yaml
rename to data/v2/weapons/10210.yaml
diff --git a/data/v2-pre/weapons/10211.yaml b/data/v2/weapons/10211.yaml
similarity index 100%
rename from data/v2-pre/weapons/10211.yaml
rename to data/v2/weapons/10211.yaml
diff --git a/data/v2-pre/weapons/10212.yaml b/data/v2/weapons/10212.yaml
similarity index 100%
rename from data/v2-pre/weapons/10212.yaml
rename to data/v2/weapons/10212.yaml
diff --git a/data/v2-pre/weapons/10213.yaml b/data/v2/weapons/10213.yaml
similarity index 100%
rename from data/v2-pre/weapons/10213.yaml
rename to data/v2/weapons/10213.yaml
diff --git a/data/v2-pre/weapons/10214.yaml b/data/v2/weapons/10214.yaml
similarity index 100%
rename from data/v2-pre/weapons/10214.yaml
rename to data/v2/weapons/10214.yaml
diff --git a/data/v2-pre/weapons/10215.yaml b/data/v2/weapons/10215.yaml
similarity index 100%
rename from data/v2-pre/weapons/10215.yaml
rename to data/v2/weapons/10215.yaml
diff --git a/data/v2-pre/weapons/10216.yaml b/data/v2/weapons/10216.yaml
similarity index 100%
rename from data/v2-pre/weapons/10216.yaml
rename to data/v2/weapons/10216.yaml
diff --git a/data/v2-pre/weapons/10217.yaml b/data/v2/weapons/10217.yaml
similarity index 100%
rename from data/v2-pre/weapons/10217.yaml
rename to data/v2/weapons/10217.yaml
diff --git a/data/v2-pre/weapons/10218.yaml b/data/v2/weapons/10218.yaml
similarity index 100%
rename from data/v2-pre/weapons/10218.yaml
rename to data/v2/weapons/10218.yaml
diff --git a/data/v2-pre/weapons/10219.yaml b/data/v2/weapons/10219.yaml
similarity index 100%
rename from data/v2-pre/weapons/10219.yaml
rename to data/v2/weapons/10219.yaml
diff --git a/data/v2-pre/weapons/10220.yaml b/data/v2/weapons/10220.yaml
similarity index 100%
rename from data/v2-pre/weapons/10220.yaml
rename to data/v2/weapons/10220.yaml
diff --git a/data/v2-pre/weapons/10221.yaml b/data/v2/weapons/10221.yaml
similarity index 100%
rename from data/v2-pre/weapons/10221.yaml
rename to data/v2/weapons/10221.yaml
diff --git a/data/v2-pre/weapons/10222.yaml b/data/v2/weapons/10222.yaml
similarity index 100%
rename from data/v2-pre/weapons/10222.yaml
rename to data/v2/weapons/10222.yaml
diff --git a/data/v2-pre/weapons/10223.yaml b/data/v2/weapons/10223.yaml
similarity index 100%
rename from data/v2-pre/weapons/10223.yaml
rename to data/v2/weapons/10223.yaml
diff --git a/data/v2-pre/weapons/10224.yaml b/data/v2/weapons/10224.yaml
similarity index 100%
rename from data/v2-pre/weapons/10224.yaml
rename to data/v2/weapons/10224.yaml
diff --git a/data/v2-pre/weapons/10225.yaml b/data/v2/weapons/10225.yaml
similarity index 100%
rename from data/v2-pre/weapons/10225.yaml
rename to data/v2/weapons/10225.yaml
diff --git a/data/v2-pre/weapons/10226.yaml b/data/v2/weapons/10226.yaml
similarity index 100%
rename from data/v2-pre/weapons/10226.yaml
rename to data/v2/weapons/10226.yaml
diff --git a/data/v2-pre/weapons/10227.yaml b/data/v2/weapons/10227.yaml
similarity index 100%
rename from data/v2-pre/weapons/10227.yaml
rename to data/v2/weapons/10227.yaml
diff --git a/data/v2-pre/weapons/10228.yaml b/data/v2/weapons/10228.yaml
similarity index 100%
rename from data/v2-pre/weapons/10228.yaml
rename to data/v2/weapons/10228.yaml
diff --git a/data/v2-pre/weapons/10229.yaml b/data/v2/weapons/10229.yaml
similarity index 100%
rename from data/v2-pre/weapons/10229.yaml
rename to data/v2/weapons/10229.yaml
diff --git a/data/v2-pre/weapons/10230.yaml b/data/v2/weapons/10230.yaml
similarity index 100%
rename from data/v2-pre/weapons/10230.yaml
rename to data/v2/weapons/10230.yaml
diff --git a/data/v2-pre/weapons/102300.yaml b/data/v2/weapons/102300.yaml
similarity index 100%
rename from data/v2-pre/weapons/102300.yaml
rename to data/v2/weapons/102300.yaml
diff --git a/data/v2-pre/weapons/102301.yaml b/data/v2/weapons/102301.yaml
similarity index 100%
rename from data/v2-pre/weapons/102301.yaml
rename to data/v2/weapons/102301.yaml
diff --git a/data/v2-pre/weapons/102302.yaml b/data/v2/weapons/102302.yaml
similarity index 100%
rename from data/v2-pre/weapons/102302.yaml
rename to data/v2/weapons/102302.yaml
diff --git a/data/v2-pre/weapons/102303.yaml b/data/v2/weapons/102303.yaml
similarity index 100%
rename from data/v2-pre/weapons/102303.yaml
rename to data/v2/weapons/102303.yaml
diff --git a/data/v2-pre/weapons/102305.yaml b/data/v2/weapons/102305.yaml
similarity index 100%
rename from data/v2-pre/weapons/102305.yaml
rename to data/v2/weapons/102305.yaml
diff --git a/data/v2-pre/weapons/102306.yaml b/data/v2/weapons/102306.yaml
similarity index 100%
rename from data/v2-pre/weapons/102306.yaml
rename to data/v2/weapons/102306.yaml
diff --git a/data/v2-pre/weapons/10231.yaml b/data/v2/weapons/10231.yaml
similarity index 100%
rename from data/v2-pre/weapons/10231.yaml
rename to data/v2/weapons/10231.yaml
diff --git a/data/v2-pre/weapons/10232.yaml b/data/v2/weapons/10232.yaml
similarity index 100%
rename from data/v2-pre/weapons/10232.yaml
rename to data/v2/weapons/10232.yaml
diff --git a/data/v2-pre/weapons/10233.yaml b/data/v2/weapons/10233.yaml
similarity index 100%
rename from data/v2-pre/weapons/10233.yaml
rename to data/v2/weapons/10233.yaml
diff --git a/data/v2-pre/weapons/10234.yaml b/data/v2/weapons/10234.yaml
similarity index 100%
rename from data/v2-pre/weapons/10234.yaml
rename to data/v2/weapons/10234.yaml
diff --git a/data/v2-pre/weapons/10235.yaml b/data/v2/weapons/10235.yaml
similarity index 100%
rename from data/v2-pre/weapons/10235.yaml
rename to data/v2/weapons/10235.yaml
diff --git a/data/v2-pre/weapons/10236.yaml b/data/v2/weapons/10236.yaml
similarity index 100%
rename from data/v2-pre/weapons/10236.yaml
rename to data/v2/weapons/10236.yaml
diff --git a/data/v2-pre/weapons/10237.yaml b/data/v2/weapons/10237.yaml
similarity index 100%
rename from data/v2-pre/weapons/10237.yaml
rename to data/v2/weapons/10237.yaml
diff --git a/data/v2-pre/weapons/10238.yaml b/data/v2/weapons/10238.yaml
similarity index 100%
rename from data/v2-pre/weapons/10238.yaml
rename to data/v2/weapons/10238.yaml
diff --git a/data/v2-pre/weapons/10239.yaml b/data/v2/weapons/10239.yaml
similarity index 100%
rename from data/v2-pre/weapons/10239.yaml
rename to data/v2/weapons/10239.yaml
diff --git a/data/v2-pre/weapons/10240.yaml b/data/v2/weapons/10240.yaml
similarity index 100%
rename from data/v2-pre/weapons/10240.yaml
rename to data/v2/weapons/10240.yaml
diff --git a/data/v2-pre/weapons/10241.yaml b/data/v2/weapons/10241.yaml
similarity index 100%
rename from data/v2-pre/weapons/10241.yaml
rename to data/v2/weapons/10241.yaml
diff --git a/data/v2-pre/weapons/10242.yaml b/data/v2/weapons/10242.yaml
similarity index 100%
rename from data/v2-pre/weapons/10242.yaml
rename to data/v2/weapons/10242.yaml
diff --git a/data/v2-pre/weapons/10243.yaml b/data/v2/weapons/10243.yaml
similarity index 100%
rename from data/v2-pre/weapons/10243.yaml
rename to data/v2/weapons/10243.yaml
diff --git a/data/v2-pre/weapons/10244.yaml b/data/v2/weapons/10244.yaml
similarity index 100%
rename from data/v2-pre/weapons/10244.yaml
rename to data/v2/weapons/10244.yaml
diff --git a/data/v2-pre/weapons/10245.yaml b/data/v2/weapons/10245.yaml
similarity index 100%
rename from data/v2-pre/weapons/10245.yaml
rename to data/v2/weapons/10245.yaml
diff --git a/data/v2-pre/weapons/10246.yaml b/data/v2/weapons/10246.yaml
similarity index 100%
rename from data/v2-pre/weapons/10246.yaml
rename to data/v2/weapons/10246.yaml
diff --git a/data/v2-pre/weapons/10247.yaml b/data/v2/weapons/10247.yaml
similarity index 100%
rename from data/v2-pre/weapons/10247.yaml
rename to data/v2/weapons/10247.yaml
diff --git a/data/v2-pre/weapons/10248.yaml b/data/v2/weapons/10248.yaml
similarity index 100%
rename from data/v2-pre/weapons/10248.yaml
rename to data/v2/weapons/10248.yaml
diff --git a/data/v2-pre/weapons/10249.yaml b/data/v2/weapons/10249.yaml
similarity index 100%
rename from data/v2-pre/weapons/10249.yaml
rename to data/v2/weapons/10249.yaml
diff --git a/data/v2-pre/weapons/10250.yaml b/data/v2/weapons/10250.yaml
similarity index 100%
rename from data/v2-pre/weapons/10250.yaml
rename to data/v2/weapons/10250.yaml
diff --git a/data/v2-pre/weapons/10251.yaml b/data/v2/weapons/10251.yaml
similarity index 100%
rename from data/v2-pre/weapons/10251.yaml
rename to data/v2/weapons/10251.yaml
diff --git a/data/v2-pre/weapons/10252.yaml b/data/v2/weapons/10252.yaml
similarity index 100%
rename from data/v2-pre/weapons/10252.yaml
rename to data/v2/weapons/10252.yaml
diff --git a/data/v2-pre/weapons/10253.yaml b/data/v2/weapons/10253.yaml
similarity index 100%
rename from data/v2-pre/weapons/10253.yaml
rename to data/v2/weapons/10253.yaml
diff --git a/data/v2-pre/weapons/10254.yaml b/data/v2/weapons/10254.yaml
similarity index 100%
rename from data/v2-pre/weapons/10254.yaml
rename to data/v2/weapons/10254.yaml
diff --git a/data/v2-pre/weapons/10255.yaml b/data/v2/weapons/10255.yaml
similarity index 100%
rename from data/v2-pre/weapons/10255.yaml
rename to data/v2/weapons/10255.yaml
diff --git a/data/v2-pre/weapons/10256.yaml b/data/v2/weapons/10256.yaml
similarity index 100%
rename from data/v2-pre/weapons/10256.yaml
rename to data/v2/weapons/10256.yaml
diff --git a/data/v2-pre/weapons/10257.yaml b/data/v2/weapons/10257.yaml
similarity index 100%
rename from data/v2-pre/weapons/10257.yaml
rename to data/v2/weapons/10257.yaml
diff --git a/data/v2-pre/weapons/10258.yaml b/data/v2/weapons/10258.yaml
similarity index 100%
rename from data/v2-pre/weapons/10258.yaml
rename to data/v2/weapons/10258.yaml
diff --git a/data/v2-pre/weapons/10259.yaml b/data/v2/weapons/10259.yaml
similarity index 100%
rename from data/v2-pre/weapons/10259.yaml
rename to data/v2/weapons/10259.yaml
diff --git a/data/v2-pre/weapons/10260.yaml b/data/v2/weapons/10260.yaml
similarity index 100%
rename from data/v2-pre/weapons/10260.yaml
rename to data/v2/weapons/10260.yaml
diff --git a/data/v2-pre/weapons/10261.yaml b/data/v2/weapons/10261.yaml
similarity index 100%
rename from data/v2-pre/weapons/10261.yaml
rename to data/v2/weapons/10261.yaml
diff --git a/data/v2-pre/weapons/10262.yaml b/data/v2/weapons/10262.yaml
similarity index 100%
rename from data/v2-pre/weapons/10262.yaml
rename to data/v2/weapons/10262.yaml
diff --git a/data/v2-pre/weapons/10263.yaml b/data/v2/weapons/10263.yaml
similarity index 100%
rename from data/v2-pre/weapons/10263.yaml
rename to data/v2/weapons/10263.yaml
diff --git a/data/v2-pre/weapons/10264.yaml b/data/v2/weapons/10264.yaml
similarity index 100%
rename from data/v2-pre/weapons/10264.yaml
rename to data/v2/weapons/10264.yaml
diff --git a/data/v2-pre/weapons/10265.yaml b/data/v2/weapons/10265.yaml
similarity index 100%
rename from data/v2-pre/weapons/10265.yaml
rename to data/v2/weapons/10265.yaml
diff --git a/data/v2-pre/weapons/10266.yaml b/data/v2/weapons/10266.yaml
similarity index 100%
rename from data/v2-pre/weapons/10266.yaml
rename to data/v2/weapons/10266.yaml
diff --git a/data/v2-pre/weapons/10267.yaml b/data/v2/weapons/10267.yaml
similarity index 100%
rename from data/v2-pre/weapons/10267.yaml
rename to data/v2/weapons/10267.yaml
diff --git a/data/v2-pre/weapons/10268.yaml b/data/v2/weapons/10268.yaml
similarity index 100%
rename from data/v2-pre/weapons/10268.yaml
rename to data/v2/weapons/10268.yaml
diff --git a/data/v2-pre/weapons/10269.yaml b/data/v2/weapons/10269.yaml
similarity index 100%
rename from data/v2-pre/weapons/10269.yaml
rename to data/v2/weapons/10269.yaml
diff --git a/data/v2-pre/weapons/10270.yaml b/data/v2/weapons/10270.yaml
similarity index 100%
rename from data/v2-pre/weapons/10270.yaml
rename to data/v2/weapons/10270.yaml
diff --git a/data/v2-pre/weapons/10271.yaml b/data/v2/weapons/10271.yaml
similarity index 100%
rename from data/v2-pre/weapons/10271.yaml
rename to data/v2/weapons/10271.yaml
diff --git a/data/v2-pre/weapons/10272.yaml b/data/v2/weapons/10272.yaml
similarity index 100%
rename from data/v2-pre/weapons/10272.yaml
rename to data/v2/weapons/10272.yaml
diff --git a/data/v2-pre/weapons/10273.yaml b/data/v2/weapons/10273.yaml
similarity index 100%
rename from data/v2-pre/weapons/10273.yaml
rename to data/v2/weapons/10273.yaml
diff --git a/data/v2-pre/weapons/10274.yaml b/data/v2/weapons/10274.yaml
similarity index 100%
rename from data/v2-pre/weapons/10274.yaml
rename to data/v2/weapons/10274.yaml
diff --git a/data/v2-pre/weapons/10275.yaml b/data/v2/weapons/10275.yaml
similarity index 100%
rename from data/v2-pre/weapons/10275.yaml
rename to data/v2/weapons/10275.yaml
diff --git a/data/v2-pre/weapons/10276.yaml b/data/v2/weapons/10276.yaml
similarity index 100%
rename from data/v2-pre/weapons/10276.yaml
rename to data/v2/weapons/10276.yaml
diff --git a/data/v2-pre/weapons/10277.yaml b/data/v2/weapons/10277.yaml
similarity index 100%
rename from data/v2-pre/weapons/10277.yaml
rename to data/v2/weapons/10277.yaml
diff --git a/data/v2-pre/weapons/10278.yaml b/data/v2/weapons/10278.yaml
similarity index 100%
rename from data/v2-pre/weapons/10278.yaml
rename to data/v2/weapons/10278.yaml
diff --git a/data/v2-pre/weapons/10279.yaml b/data/v2/weapons/10279.yaml
similarity index 100%
rename from data/v2-pre/weapons/10279.yaml
rename to data/v2/weapons/10279.yaml
diff --git a/data/v2-pre/weapons/18001.yaml b/data/v2/weapons/18001.yaml
similarity index 100%
rename from data/v2-pre/weapons/18001.yaml
rename to data/v2/weapons/18001.yaml
diff --git a/data/v2-pre/weapons/18002.yaml b/data/v2/weapons/18002.yaml
similarity index 100%
rename from data/v2-pre/weapons/18002.yaml
rename to data/v2/weapons/18002.yaml
diff --git a/data/v2-pre/weapons/18003.yaml b/data/v2/weapons/18003.yaml
similarity index 100%
rename from data/v2-pre/weapons/18003.yaml
rename to data/v2/weapons/18003.yaml
diff --git a/data/v2-pre/weapons/18004.yaml b/data/v2/weapons/18004.yaml
similarity index 100%
rename from data/v2-pre/weapons/18004.yaml
rename to data/v2/weapons/18004.yaml
diff --git a/data/v2-pre/weapons/18005.yaml b/data/v2/weapons/18005.yaml
similarity index 100%
rename from data/v2-pre/weapons/18005.yaml
rename to data/v2/weapons/18005.yaml
diff --git a/data/v2-pre/weapons/18006.yaml b/data/v2/weapons/18006.yaml
similarity index 100%
rename from data/v2-pre/weapons/18006.yaml
rename to data/v2/weapons/18006.yaml
diff --git a/data/v2-pre/weapons/18007.yaml b/data/v2/weapons/18007.yaml
similarity index 100%
rename from data/v2-pre/weapons/18007.yaml
rename to data/v2/weapons/18007.yaml
diff --git a/data/v2-pre/weapons/18008.yaml b/data/v2/weapons/18008.yaml
similarity index 100%
rename from data/v2-pre/weapons/18008.yaml
rename to data/v2/weapons/18008.yaml
diff --git a/data/v2-pre/weapons/18009.yaml b/data/v2/weapons/18009.yaml
similarity index 100%
rename from data/v2-pre/weapons/18009.yaml
rename to data/v2/weapons/18009.yaml
diff --git a/data/v2-pre/weapons/18010.yaml b/data/v2/weapons/18010.yaml
similarity index 100%
rename from data/v2-pre/weapons/18010.yaml
rename to data/v2/weapons/18010.yaml
diff --git a/data/v2-pre/weapons/18011.yaml b/data/v2/weapons/18011.yaml
similarity index 100%
rename from data/v2-pre/weapons/18011.yaml
rename to data/v2/weapons/18011.yaml
diff --git a/data/v2-pre/weapons/18012.yaml b/data/v2/weapons/18012.yaml
similarity index 100%
rename from data/v2-pre/weapons/18012.yaml
rename to data/v2/weapons/18012.yaml
diff --git a/data/v2-pre/weapons/18013.yaml b/data/v2/weapons/18013.yaml
similarity index 100%
rename from data/v2-pre/weapons/18013.yaml
rename to data/v2/weapons/18013.yaml
diff --git a/data/v2-pre/weapons/18014.yaml b/data/v2/weapons/18014.yaml
similarity index 100%
rename from data/v2-pre/weapons/18014.yaml
rename to data/v2/weapons/18014.yaml
diff --git a/data/v2-pre/weapons/18015.yaml b/data/v2/weapons/18015.yaml
similarity index 100%
rename from data/v2-pre/weapons/18015.yaml
rename to data/v2/weapons/18015.yaml
diff --git a/data/v2-pre/weapons/18016.yaml b/data/v2/weapons/18016.yaml
similarity index 100%
rename from data/v2-pre/weapons/18016.yaml
rename to data/v2/weapons/18016.yaml
diff --git a/data/v2-pre/weapons/18017.yaml b/data/v2/weapons/18017.yaml
similarity index 100%
rename from data/v2-pre/weapons/18017.yaml
rename to data/v2/weapons/18017.yaml
diff --git a/data/v2-pre/weapons/18018.yaml b/data/v2/weapons/18018.yaml
similarity index 100%
rename from data/v2-pre/weapons/18018.yaml
rename to data/v2/weapons/18018.yaml
diff --git a/data/v2-pre/weapons/18019.yaml b/data/v2/weapons/18019.yaml
similarity index 100%
rename from data/v2-pre/weapons/18019.yaml
rename to data/v2/weapons/18019.yaml
diff --git a/data/v2-pre/weapons/18020.yaml b/data/v2/weapons/18020.yaml
similarity index 100%
rename from data/v2-pre/weapons/18020.yaml
rename to data/v2/weapons/18020.yaml
diff --git a/data/v2-pre/weapons/18021.yaml b/data/v2/weapons/18021.yaml
similarity index 100%
rename from data/v2-pre/weapons/18021.yaml
rename to data/v2/weapons/18021.yaml
diff --git a/data/v2-pre/weapons/19001.yaml b/data/v2/weapons/19001.yaml
similarity index 100%
rename from data/v2-pre/weapons/19001.yaml
rename to data/v2/weapons/19001.yaml
diff --git a/data/v2-pre/weapons/19002.yaml b/data/v2/weapons/19002.yaml
similarity index 100%
rename from data/v2-pre/weapons/19002.yaml
rename to data/v2/weapons/19002.yaml
diff --git a/data/v2-pre/weapons/19003.yaml b/data/v2/weapons/19003.yaml
similarity index 100%
rename from data/v2-pre/weapons/19003.yaml
rename to data/v2/weapons/19003.yaml
diff --git a/data/v2-pre/weapons/19004.yaml b/data/v2/weapons/19004.yaml
similarity index 100%
rename from data/v2-pre/weapons/19004.yaml
rename to data/v2/weapons/19004.yaml
diff --git a/data/v2-pre/weapons/19005.yaml b/data/v2/weapons/19005.yaml
similarity index 100%
rename from data/v2-pre/weapons/19005.yaml
rename to data/v2/weapons/19005.yaml
diff --git a/data/v2-pre/weapons/19006.yaml b/data/v2/weapons/19006.yaml
similarity index 100%
rename from data/v2-pre/weapons/19006.yaml
rename to data/v2/weapons/19006.yaml
diff --git a/data/v2-pre/weapons/19007.yaml b/data/v2/weapons/19007.yaml
similarity index 100%
rename from data/v2-pre/weapons/19007.yaml
rename to data/v2/weapons/19007.yaml
diff --git a/data/v2-pre/weapons/19008.yaml b/data/v2/weapons/19008.yaml
similarity index 100%
rename from data/v2-pre/weapons/19008.yaml
rename to data/v2/weapons/19008.yaml
diff --git a/data/v2-pre/weapons/19009.yaml b/data/v2/weapons/19009.yaml
similarity index 100%
rename from data/v2-pre/weapons/19009.yaml
rename to data/v2/weapons/19009.yaml
diff --git a/data/v2-pre/weapons/19010.yaml b/data/v2/weapons/19010.yaml
similarity index 100%
rename from data/v2-pre/weapons/19010.yaml
rename to data/v2/weapons/19010.yaml
diff --git a/data/v2-pre/weapons/19011.yaml b/data/v2/weapons/19011.yaml
similarity index 100%
rename from data/v2-pre/weapons/19011.yaml
rename to data/v2/weapons/19011.yaml
diff --git a/data/v2-pre/weapons/19012.yaml b/data/v2/weapons/19012.yaml
similarity index 100%
rename from data/v2-pre/weapons/19012.yaml
rename to data/v2/weapons/19012.yaml
diff --git a/data/v2-pre/weapons/19013.yaml b/data/v2/weapons/19013.yaml
similarity index 100%
rename from data/v2-pre/weapons/19013.yaml
rename to data/v2/weapons/19013.yaml
diff --git a/data/v2-pre/weapons/19014.yaml b/data/v2/weapons/19014.yaml
similarity index 100%
rename from data/v2-pre/weapons/19014.yaml
rename to data/v2/weapons/19014.yaml
diff --git a/data/v2-pre/weapons/19015.yaml b/data/v2/weapons/19015.yaml
similarity index 100%
rename from data/v2-pre/weapons/19015.yaml
rename to data/v2/weapons/19015.yaml
diff --git a/data/v2-pre/weapons/19016.yaml b/data/v2/weapons/19016.yaml
similarity index 100%
rename from data/v2-pre/weapons/19016.yaml
rename to data/v2/weapons/19016.yaml
diff --git a/data/v2-pre/weapons/20000.yaml b/data/v2/weapons/20000.yaml
similarity index 100%
rename from data/v2-pre/weapons/20000.yaml
rename to data/v2/weapons/20000.yaml
diff --git a/data/v2-pre/weapons/20765.yaml b/data/v2/weapons/20765.yaml
similarity index 100%
rename from data/v2-pre/weapons/20765.yaml
rename to data/v2/weapons/20765.yaml
diff --git a/data/v2-pre/weapons/21001.yaml b/data/v2/weapons/21001.yaml
similarity index 100%
rename from data/v2-pre/weapons/21001.yaml
rename to data/v2/weapons/21001.yaml
diff --git a/data/v2-pre/weapons/21002.yaml b/data/v2/weapons/21002.yaml
similarity index 100%
rename from data/v2-pre/weapons/21002.yaml
rename to data/v2/weapons/21002.yaml
diff --git a/data/v2-pre/weapons/21003.yaml b/data/v2/weapons/21003.yaml
similarity index 100%
rename from data/v2-pre/weapons/21003.yaml
rename to data/v2/weapons/21003.yaml
diff --git a/data/v2-pre/weapons/21004.yaml b/data/v2/weapons/21004.yaml
similarity index 100%
rename from data/v2-pre/weapons/21004.yaml
rename to data/v2/weapons/21004.yaml
diff --git a/data/v2-pre/weapons/21005.yaml b/data/v2/weapons/21005.yaml
similarity index 100%
rename from data/v2-pre/weapons/21005.yaml
rename to data/v2/weapons/21005.yaml
diff --git a/data/v2-pre/weapons/21006.yaml b/data/v2/weapons/21006.yaml
similarity index 100%
rename from data/v2-pre/weapons/21006.yaml
rename to data/v2/weapons/21006.yaml
diff --git a/data/v2-pre/weapons/21007.yaml b/data/v2/weapons/21007.yaml
similarity index 100%
rename from data/v2-pre/weapons/21007.yaml
rename to data/v2/weapons/21007.yaml
diff --git a/data/v2-pre/weapons/21008.yaml b/data/v2/weapons/21008.yaml
similarity index 100%
rename from data/v2-pre/weapons/21008.yaml
rename to data/v2/weapons/21008.yaml
diff --git a/data/v2-pre/weapons/21009.yaml b/data/v2/weapons/21009.yaml
similarity index 100%
rename from data/v2-pre/weapons/21009.yaml
rename to data/v2/weapons/21009.yaml
diff --git a/data/v2-pre/weapons/21010.yaml b/data/v2/weapons/21010.yaml
similarity index 100%
rename from data/v2-pre/weapons/21010.yaml
rename to data/v2/weapons/21010.yaml
diff --git a/data/v2-pre/weapons/21011.yaml b/data/v2/weapons/21011.yaml
similarity index 100%
rename from data/v2-pre/weapons/21011.yaml
rename to data/v2/weapons/21011.yaml
diff --git a/data/v2-pre/weapons/21012.yaml b/data/v2/weapons/21012.yaml
similarity index 100%
rename from data/v2-pre/weapons/21012.yaml
rename to data/v2/weapons/21012.yaml
diff --git a/data/v2-pre/weapons/21013.yaml b/data/v2/weapons/21013.yaml
similarity index 100%
rename from data/v2-pre/weapons/21013.yaml
rename to data/v2/weapons/21013.yaml
diff --git a/data/v2-pre/weapons/21014.yaml b/data/v2/weapons/21014.yaml
similarity index 100%
rename from data/v2-pre/weapons/21014.yaml
rename to data/v2/weapons/21014.yaml
diff --git a/data/v2-pre/weapons/21015.yaml b/data/v2/weapons/21015.yaml
similarity index 100%
rename from data/v2-pre/weapons/21015.yaml
rename to data/v2/weapons/21015.yaml
diff --git a/data/v2-pre/weapons/24000.yaml b/data/v2/weapons/24000.yaml
similarity index 100%
rename from data/v2-pre/weapons/24000.yaml
rename to data/v2/weapons/24000.yaml
diff --git a/data/v2-pre/weapons/24001.yaml b/data/v2/weapons/24001.yaml
similarity index 100%
rename from data/v2-pre/weapons/24001.yaml
rename to data/v2/weapons/24001.yaml
diff --git a/data/v2-pre/weapons/24002.yaml b/data/v2/weapons/24002.yaml
similarity index 100%
rename from data/v2-pre/weapons/24002.yaml
rename to data/v2/weapons/24002.yaml
diff --git a/data/v2-pre/weapons/24003.yaml b/data/v2/weapons/24003.yaml
similarity index 100%
rename from data/v2-pre/weapons/24003.yaml
rename to data/v2/weapons/24003.yaml
diff --git a/data/v2-pre/weapons/24004.yaml b/data/v2/weapons/24004.yaml
similarity index 100%
rename from data/v2-pre/weapons/24004.yaml
rename to data/v2/weapons/24004.yaml
diff --git a/data/v2-pre/weapons/24005.yaml b/data/v2/weapons/24005.yaml
similarity index 100%
rename from data/v2-pre/weapons/24005.yaml
rename to data/v2/weapons/24005.yaml
diff --git a/data/v2-pre/weapons/24006.yaml b/data/v2/weapons/24006.yaml
similarity index 100%
rename from data/v2-pre/weapons/24006.yaml
rename to data/v2/weapons/24006.yaml
diff --git a/data/v2-pre/weapons/24007.yaml b/data/v2/weapons/24007.yaml
similarity index 100%
rename from data/v2-pre/weapons/24007.yaml
rename to data/v2/weapons/24007.yaml
diff --git a/data/v2-pre/weapons/24008.yaml b/data/v2/weapons/24008.yaml
similarity index 100%
rename from data/v2-pre/weapons/24008.yaml
rename to data/v2/weapons/24008.yaml
diff --git a/data/v2-pre/weapons/24009.yaml b/data/v2/weapons/24009.yaml
similarity index 100%
rename from data/v2-pre/weapons/24009.yaml
rename to data/v2/weapons/24009.yaml
diff --git a/data/v2-pre/weapons/24010.yaml b/data/v2/weapons/24010.yaml
similarity index 100%
rename from data/v2-pre/weapons/24010.yaml
rename to data/v2/weapons/24010.yaml
diff --git a/data/v2-pre/weapons/24011.yaml b/data/v2/weapons/24011.yaml
similarity index 100%
rename from data/v2-pre/weapons/24011.yaml
rename to data/v2/weapons/24011.yaml
diff --git a/data/v2-pre/weapons/24012.yaml b/data/v2/weapons/24012.yaml
similarity index 100%
rename from data/v2-pre/weapons/24012.yaml
rename to data/v2/weapons/24012.yaml
diff --git a/data/v2-pre/weapons/24013.yaml b/data/v2/weapons/24013.yaml
similarity index 100%
rename from data/v2-pre/weapons/24013.yaml
rename to data/v2/weapons/24013.yaml
diff --git a/data/v2-pre/weapons/24014.yaml b/data/v2/weapons/24014.yaml
similarity index 100%
rename from data/v2-pre/weapons/24014.yaml
rename to data/v2/weapons/24014.yaml
diff --git a/data/v2-pre/weapons/24015.yaml b/data/v2/weapons/24015.yaml
similarity index 100%
rename from data/v2-pre/weapons/24015.yaml
rename to data/v2/weapons/24015.yaml
diff --git a/data/v2-pre/weapons/24016.yaml b/data/v2/weapons/24016.yaml
similarity index 100%
rename from data/v2-pre/weapons/24016.yaml
rename to data/v2/weapons/24016.yaml
diff --git a/data/v2-pre/weapons/24017.yaml b/data/v2/weapons/24017.yaml
similarity index 100%
rename from data/v2-pre/weapons/24017.yaml
rename to data/v2/weapons/24017.yaml
diff --git a/data/v2-pre/weapons/24018.yaml b/data/v2/weapons/24018.yaml
similarity index 100%
rename from data/v2-pre/weapons/24018.yaml
rename to data/v2/weapons/24018.yaml
diff --git a/data/v2-pre/weapons/24019.yaml b/data/v2/weapons/24019.yaml
similarity index 100%
rename from data/v2-pre/weapons/24019.yaml
rename to data/v2/weapons/24019.yaml
diff --git a/data/v2-pre/weapons/24020.yaml b/data/v2/weapons/24020.yaml
similarity index 100%
rename from data/v2-pre/weapons/24020.yaml
rename to data/v2/weapons/24020.yaml
diff --git a/data/v2-pre/weapons/24021.yaml b/data/v2/weapons/24021.yaml
similarity index 100%
rename from data/v2-pre/weapons/24021.yaml
rename to data/v2/weapons/24021.yaml
diff --git a/data/v2-pre/weapons/24022.yaml b/data/v2/weapons/24022.yaml
similarity index 100%
rename from data/v2-pre/weapons/24022.yaml
rename to data/v2/weapons/24022.yaml
diff --git a/data/v2-pre/weapons/24023.yaml b/data/v2/weapons/24023.yaml
similarity index 100%
rename from data/v2-pre/weapons/24023.yaml
rename to data/v2/weapons/24023.yaml
diff --git a/data/v2-pre/weapons/24024.yaml b/data/v2/weapons/24024.yaml
similarity index 100%
rename from data/v2-pre/weapons/24024.yaml
rename to data/v2/weapons/24024.yaml
diff --git a/data/v2-pre/weapons/24025.yaml b/data/v2/weapons/24025.yaml
similarity index 100%
rename from data/v2-pre/weapons/24025.yaml
rename to data/v2/weapons/24025.yaml
diff --git a/data/v2-pre/weapons/24026.yaml b/data/v2/weapons/24026.yaml
similarity index 100%
rename from data/v2-pre/weapons/24026.yaml
rename to data/v2/weapons/24026.yaml
diff --git a/data/v2-pre/weapons/24027.yaml b/data/v2/weapons/24027.yaml
similarity index 100%
rename from data/v2-pre/weapons/24027.yaml
rename to data/v2/weapons/24027.yaml
diff --git a/data/v2-pre/weapons/24028.yaml b/data/v2/weapons/24028.yaml
similarity index 100%
rename from data/v2-pre/weapons/24028.yaml
rename to data/v2/weapons/24028.yaml
diff --git a/data/v2-pre/weapons/24029.yaml b/data/v2/weapons/24029.yaml
similarity index 100%
rename from data/v2-pre/weapons/24029.yaml
rename to data/v2/weapons/24029.yaml
diff --git a/data/v2-pre/weapons/24030.yaml b/data/v2/weapons/24030.yaml
similarity index 100%
rename from data/v2-pre/weapons/24030.yaml
rename to data/v2/weapons/24030.yaml
diff --git a/data/v2-pre/weapons/24031.yaml b/data/v2/weapons/24031.yaml
similarity index 100%
rename from data/v2-pre/weapons/24031.yaml
rename to data/v2/weapons/24031.yaml
diff --git a/data/v2-pre/weapons/24032.yaml b/data/v2/weapons/24032.yaml
similarity index 100%
rename from data/v2-pre/weapons/24032.yaml
rename to data/v2/weapons/24032.yaml
diff --git a/data/v2-pre/weapons/24033.yaml b/data/v2/weapons/24033.yaml
similarity index 100%
rename from data/v2-pre/weapons/24033.yaml
rename to data/v2/weapons/24033.yaml
diff --git a/data/v2-pre/weapons/24034.yaml b/data/v2/weapons/24034.yaml
similarity index 100%
rename from data/v2-pre/weapons/24034.yaml
rename to data/v2/weapons/24034.yaml
diff --git a/data/v2-pre/weapons/24035.yaml b/data/v2/weapons/24035.yaml
similarity index 100%
rename from data/v2-pre/weapons/24035.yaml
rename to data/v2/weapons/24035.yaml
diff --git a/data/v2-pre/weapons/24036.yaml b/data/v2/weapons/24036.yaml
similarity index 100%
rename from data/v2-pre/weapons/24036.yaml
rename to data/v2/weapons/24036.yaml
diff --git a/data/v2-pre/weapons/24037.yaml b/data/v2/weapons/24037.yaml
similarity index 100%
rename from data/v2-pre/weapons/24037.yaml
rename to data/v2/weapons/24037.yaml
diff --git a/data/v2-pre/weapons/24038.yaml b/data/v2/weapons/24038.yaml
similarity index 100%
rename from data/v2-pre/weapons/24038.yaml
rename to data/v2/weapons/24038.yaml
diff --git a/data/v2-pre/weapons/24039.yaml b/data/v2/weapons/24039.yaml
similarity index 100%
rename from data/v2-pre/weapons/24039.yaml
rename to data/v2/weapons/24039.yaml
diff --git a/data/v2-pre/weapons/24040.yaml b/data/v2/weapons/24040.yaml
similarity index 100%
rename from data/v2-pre/weapons/24040.yaml
rename to data/v2/weapons/24040.yaml
diff --git a/data/v2-pre/weapons/24041.yaml b/data/v2/weapons/24041.yaml
similarity index 100%
rename from data/v2-pre/weapons/24041.yaml
rename to data/v2/weapons/24041.yaml
diff --git a/data/v2-pre/weapons/24042.yaml b/data/v2/weapons/24042.yaml
similarity index 100%
rename from data/v2-pre/weapons/24042.yaml
rename to data/v2/weapons/24042.yaml
diff --git a/data/v2-pre/weapons/24043.yaml b/data/v2/weapons/24043.yaml
similarity index 100%
rename from data/v2-pre/weapons/24043.yaml
rename to data/v2/weapons/24043.yaml
diff --git a/data/v2-pre/weapons/24044.yaml b/data/v2/weapons/24044.yaml
similarity index 100%
rename from data/v2-pre/weapons/24044.yaml
rename to data/v2/weapons/24044.yaml
diff --git a/data/v2-pre/weapons/24045.yaml b/data/v2/weapons/24045.yaml
similarity index 100%
rename from data/v2-pre/weapons/24045.yaml
rename to data/v2/weapons/24045.yaml
diff --git a/data/v2-pre/weapons/24046.yaml b/data/v2/weapons/24046.yaml
similarity index 100%
rename from data/v2-pre/weapons/24046.yaml
rename to data/v2/weapons/24046.yaml
diff --git a/data/v2-pre/weapons/24047.yaml b/data/v2/weapons/24047.yaml
similarity index 100%
rename from data/v2-pre/weapons/24047.yaml
rename to data/v2/weapons/24047.yaml
diff --git a/data/v2-pre/weapons/24048.yaml b/data/v2/weapons/24048.yaml
similarity index 100%
rename from data/v2-pre/weapons/24048.yaml
rename to data/v2/weapons/24048.yaml
diff --git a/data/v2-pre/weapons/24049.yaml b/data/v2/weapons/24049.yaml
similarity index 100%
rename from data/v2-pre/weapons/24049.yaml
rename to data/v2/weapons/24049.yaml
diff --git a/data/v2-pre/weapons/24050.yaml b/data/v2/weapons/24050.yaml
similarity index 100%
rename from data/v2-pre/weapons/24050.yaml
rename to data/v2/weapons/24050.yaml
diff --git a/data/v2-pre/weapons/24051.yaml b/data/v2/weapons/24051.yaml
similarity index 100%
rename from data/v2-pre/weapons/24051.yaml
rename to data/v2/weapons/24051.yaml
diff --git a/data/v2-pre/weapons/24053.yaml b/data/v2/weapons/24053.yaml
similarity index 100%
rename from data/v2-pre/weapons/24053.yaml
rename to data/v2/weapons/24053.yaml
diff --git a/src/lib/v2-pre/server/loadData.ts b/src/lib/v2-pre/server/loadData.ts
index 2fc00c5a..8f2cd053 100644
--- a/src/lib/v2-pre/server/loadData.ts
+++ b/src/lib/v2-pre/server/loadData.ts
@@ -17,7 +17,7 @@ import {
   WeaponCatalogItem
 } from '../data/types'
 
-export const dataDir = path.join(process.cwd(), 'data/v2-pre')
+export const dataDir = path.join(process.cwd(), 'data/v2')
 
 export const battlesuitsDir = path.join(dataDir, 'battlesuits')
 export const battlesuitCatalogPath = path.join(dataDir, 'battlesuit-catalog.yaml')
diff --git a/src/pages/v2-pre/battlesuits/[battlesuitId].tsx b/src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx
similarity index 83%
rename from src/pages/v2-pre/battlesuits/[battlesuitId].tsx
rename to src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx
index 15803785..626bb87a 100644
--- a/src/pages/v2-pre/battlesuits/[battlesuitId].tsx
+++ b/src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx
@@ -1,27 +1,27 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import AttributeIcon from '../../../components/v2-pre/AttributeIcon'
-import AvatarFigureImage from '../../../components/v2-pre/AvatarFigureImage'
-import AvatarSkillIcon from '../../../components/v2-pre/AvatarSkillIcon'
-import AvatarSubSkillIcon from '../../../components/v2-pre/AvatarSubSkillIcon'
-import BattlesuitAvatarIcon from '../../../components/v2-pre/BattlesuitAvatarIcon'
-import FormattedText from '../../../components/v2-pre/FormattedText'
-import { formatSkillInfo, formatSubSkillInfo } from '../../../lib/v2-pre/data/formatText'
-import { loadBattlesuitCatalog, loadBattlesuitData } from '../../../lib/v2-pre/server/loadData'
-import { Battlesuit, SkillTagItem } from '../../../lib/v2-pre/data/types'
+import AttributeIcon from '../../../../components/v2-pre/AttributeIcon'
+import AvatarFigureImage from '../../../../components/v2-pre/AvatarFigureImage'
+import AvatarSkillIcon from '../../../../components/v2-pre/AvatarSkillIcon'
+import AvatarSubSkillIcon from '../../../../components/v2-pre/AvatarSubSkillIcon'
+import BattlesuitAvatarIcon from '../../../../components/v2-pre/BattlesuitAvatarIcon'
+import FormattedText from '../../../../components/v2-pre/FormattedText'
+import { formatSkillInfo, formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText'
+import { loadBattlesuitCatalog, loadBattlesuitData } from '../../../../lib/v2-pre/server/loadData'
+import { Battlesuit, SkillTagItem } from '../../../../lib/v2-pre/data/types'
 import { Fragment } from 'react'
-import TagIcon from '../../../components/v2-pre/TagIcon'
+import TagIcon from '../../../../components/v2-pre/TagIcon'
 import {
   getAttributeLabel,
   getCharacterTypeLabel,
   getSkillTypeLabel,
   getTagTypeLabel,
   getWeaponTypeLabel
-} from '../../../lib/v2-pre/data/text'
-import StarIcon from '../../../components/v2-pre/StarIcon'
-import ChibiIcon from '../../../components/v2-pre/ChibiIcon'
-import WeaponTypeIcon from '../../../components/v2-pre/WeaponTypeIcon'
-import { sortBattlesuitSkill } from '../../../lib/v2-pre/data/utils'
+} from '../../../../lib/v2-pre/data/text'
+import StarIcon from '../../../../components/v2-pre/StarIcon'
+import ChibiIcon from '../../../../components/v2-pre/ChibiIcon'
+import WeaponTypeIcon from '../../../../components/v2-pre/WeaponTypeIcon'
+import { sortBattlesuitSkill } from '../../../../lib/v2-pre/data/utils'
 
 interface BattlesuitShowPageProps {
   battlesuit: Battlesuit
diff --git a/src/pages/v2-pre/battlesuits/index.tsx b/src/pages/honkai3rd/v2/battlesuits/index.tsx
similarity index 79%
rename from src/pages/v2-pre/battlesuits/index.tsx
rename to src/pages/honkai3rd/v2/battlesuits/index.tsx
index ec8dc60a..2306b736 100644
--- a/src/pages/v2-pre/battlesuits/index.tsx
+++ b/src/pages/honkai3rd/v2/battlesuits/index.tsx
@@ -2,9 +2,9 @@
 import { Box } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
-import { loadBattlesuitCatalog } from '../../../lib/v2-pre/server/loadData'
-import { BattlesuitCatalogItem } from '../../../lib/v2-pre/data/types'
-import BattlesuitCatalogItemCard from '../../../components/v2-pre/BattlesuitCatalogItemCard'
+import { loadBattlesuitCatalog } from '../../../../lib/v2-pre/server/loadData'
+import { BattlesuitCatalogItem } from '../../../../lib/v2-pre/data/types'
+import BattlesuitCatalogItemCard from '../../../../components/v2-pre/BattlesuitCatalogItemCard'
 
 interface BattlesuitListPageProps {
   battlesuitCatalog: BattlesuitCatalogItem[]
diff --git a/src/pages/v2-pre/elfs/[elfId].tsx b/src/pages/honkai3rd/v2/elfs/[elfId].tsx
similarity index 85%
rename from src/pages/v2-pre/elfs/[elfId].tsx
rename to src/pages/honkai3rd/v2/elfs/[elfId].tsx
index 664e40b2..2280c8af 100644
--- a/src/pages/v2-pre/elfs/[elfId].tsx
+++ b/src/pages/honkai3rd/v2/elfs/[elfId].tsx
@@ -1,14 +1,14 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
 import { useMemo } from 'react'
-import { Elf, ElfSkill } from '../../../lib/v2-pre/data/types'
-import { loadElfCatalog, loadElfData } from '../../../lib/v2-pre/server/loadData'
-import SquareImage from '../../../components/v2-pre/SquareImage'
-import TagIcon from '../../../components/v2-pre/TagIcon'
-import { assetsBucketBaseUrl } from '../../../lib/consts'
-import { ListMap } from '../../../lib/utils'
-import FormattedText from '../../../components/v2-pre/FormattedText'
-import { formatSubSkillInfo } from '../../../lib/v2-pre/data/formatText'
+import { Elf, ElfSkill } from '../../../../lib/v2-pre/data/types'
+import { loadElfCatalog, loadElfData } from '../../../../lib/v2-pre/server/loadData'
+import SquareImage from '../../../../components/v2-pre/SquareImage'
+import TagIcon from '../../../../components/v2-pre/TagIcon'
+import { assetsBucketBaseUrl } from '../../../../lib/consts'
+import { ListMap } from '../../../../lib/utils'
+import FormattedText from '../../../../components/v2-pre/FormattedText'
+import { formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText'
 
 interface ElfShowPageProps {
   elf: Elf
diff --git a/src/pages/v2-pre/elfs/index.tsx b/src/pages/honkai3rd/v2/elfs/index.tsx
similarity index 84%
rename from src/pages/v2-pre/elfs/index.tsx
rename to src/pages/honkai3rd/v2/elfs/index.tsx
index 6ed429f7..641e0030 100644
--- a/src/pages/v2-pre/elfs/index.tsx
+++ b/src/pages/honkai3rd/v2/elfs/index.tsx
@@ -2,10 +2,10 @@
 import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
-import { ElfCatalogItem } from '../../../lib/v2-pre/data/types'
-import { loadElfCatalog } from '../../../lib/v2-pre/server/loadData'
-import RarityBar from '../../../components/v2-pre/RarityBar'
-import ElfIcon from '../../../components/v2-pre/ElfIcon'
+import { ElfCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { loadElfCatalog } from '../../../../lib/v2-pre/server/loadData'
+import RarityBar from '../../../../components/v2-pre/RarityBar'
+import ElfIcon from '../../../../components/v2-pre/ElfIcon'
 
 interface ElfListPageProps {
   elfs: ElfCatalogItem[]
diff --git a/src/pages/v2-pre/er/battlesuits/[battlesuitId].tsx b/src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx
similarity index 91%
rename from src/pages/v2-pre/er/battlesuits/[battlesuitId].tsx
rename to src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx
index 0f05d0ac..2a53a8d3 100644
--- a/src/pages/v2-pre/er/battlesuits/[battlesuitId].tsx
+++ b/src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx
@@ -1,10 +1,14 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading, Image } from 'theme-ui'
-import AvatarFigureImage from '../../../../components/v2-pre/AvatarFigureImage'
-import { loadBattlesuitData, loadErBattlesuit, loadErBattlesuitCatalog } from '../../../../lib/v2-pre/server/loadData'
-import { Battlesuit, ErBattlesuit, ErSignet } from '../../../../lib/v2-pre/data/types'
+import AvatarFigureImage from '../../../../../components/v2-pre/AvatarFigureImage'
+import {
+  loadBattlesuitData,
+  loadErBattlesuit,
+  loadErBattlesuitCatalog
+} from '../../../../../lib/v2-pre/server/loadData'
+import { Battlesuit, ErBattlesuit, ErSignet } from '../../../../../lib/v2-pre/data/types'
 import { Fragment, useMemo } from 'react'
-import { assetsBucketBaseUrl } from '../../../../lib/consts'
+import { assetsBucketBaseUrl } from '../../../../../lib/consts'
 
 interface BattlesuitShowPageProps {
   battlesuit: Battlesuit
diff --git a/src/pages/v2-pre/er/index.tsx b/src/pages/honkai3rd/v2/er/index.tsx
similarity index 87%
rename from src/pages/v2-pre/er/index.tsx
rename to src/pages/honkai3rd/v2/er/index.tsx
index 5fde569c..c2d785e5 100644
--- a/src/pages/v2-pre/er/index.tsx
+++ b/src/pages/honkai3rd/v2/er/index.tsx
@@ -6,15 +6,15 @@ import {
   loadErBattlesuitCatalog,
   loadErSigils,
   loadErSupports
-} from '../../../lib/v2-pre/server/loadData'
-import { BattlesuitCatalogItem, ErBattlesuitCatalogItem } from '../../../lib/v2-pre/data/types'
+} from '../../../../lib/v2-pre/server/loadData'
+import { BattlesuitCatalogItem, ErBattlesuitCatalogItem } from '../../../../lib/v2-pre/data/types'
 import { useMemo } from 'react'
-import BattlesuitCatalogItemCard from '../../../components/v2-pre/BattlesuitCatalogItemCard'
-import { assetsBucketBaseUrl } from '../../../lib/consts'
-import SquareImage from '../../../components/v2-pre/SquareImage'
-import { signetGroups } from '../../../lib/v2-pre/data/er'
-import BattlesuitSmallIcon from '../../../components/v2-pre/BattlesuitSmallIcon'
-import MaterialIcon from '../../../components/v2-pre/MaterialIcon'
+import BattlesuitCatalogItemCard from '../../../../components/v2-pre/BattlesuitCatalogItemCard'
+import { assetsBucketBaseUrl } from '../../../../lib/consts'
+import SquareImage from '../../../../components/v2-pre/SquareImage'
+import { signetGroups } from '../../../../lib/v2-pre/data/er'
+import BattlesuitSmallIcon from '../../../../components/v2-pre/BattlesuitSmallIcon'
+import MaterialIcon from '../../../../components/v2-pre/MaterialIcon'
 
 interface ErPageProps {
   erBattlesuitCatalog: ErBattlesuitCatalogItem[]
diff --git a/src/pages/v2-pre/er/sigils.tsx b/src/pages/honkai3rd/v2/er/sigils.tsx
similarity index 85%
rename from src/pages/v2-pre/er/sigils.tsx
rename to src/pages/honkai3rd/v2/er/sigils.tsx
index 393701d7..dcf2ad88 100644
--- a/src/pages/v2-pre/er/sigils.tsx
+++ b/src/pages/honkai3rd/v2/er/sigils.tsx
@@ -1,8 +1,8 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import MaterialIcon from '../../../components/v2-pre/MaterialIcon'
-import { ErSigil } from '../../../lib/v2-pre/data/types'
-import { loadErSigils } from '../../../lib/v2-pre/server/loadData'
+import MaterialIcon from '../../../../components/v2-pre/MaterialIcon'
+import { ErSigil } from '../../../../lib/v2-pre/data/types'
+import { loadErSigils } from '../../../../lib/v2-pre/server/loadData'
 
 interface SigilsPageProps {
   erSigils: ErSigil[]
diff --git a/src/pages/v2-pre/er/signets/[groupId].tsx b/src/pages/honkai3rd/v2/er/signets/[groupId].tsx
similarity index 84%
rename from src/pages/v2-pre/er/signets/[groupId].tsx
rename to src/pages/honkai3rd/v2/er/signets/[groupId].tsx
index 097d44de..a90b6af6 100644
--- a/src/pages/v2-pre/er/signets/[groupId].tsx
+++ b/src/pages/honkai3rd/v2/er/signets/[groupId].tsx
@@ -1,12 +1,12 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import { loadErSignets } from '../../../../lib/v2-pre/server/loadData'
-import { ErSignet, ErSignetGroup } from '../../../../lib/v2-pre/data/types'
+import { loadErSignets } from '../../../../../lib/v2-pre/server/loadData'
+import { ErSignet, ErSignetGroup } from '../../../../../lib/v2-pre/data/types'
 import { Fragment, useMemo } from 'react'
-import { assetsBucketBaseUrl } from '../../../../lib/consts'
-import { signetGroups } from '../../../../lib/v2-pre/data/er'
-import SquareImage from '../../../../components/v2-pre/SquareImage'
-import { getErSignetTypeLabel } from '../../../../lib/v2-pre/data/text'
+import { assetsBucketBaseUrl } from '../../../../../lib/consts'
+import { signetGroups } from '../../../../../lib/v2-pre/data/er'
+import SquareImage from '../../../../../components/v2-pre/SquareImage'
+import { getErSignetTypeLabel } from '../../../../../lib/v2-pre/data/text'
 
 interface BattlesuitShowPageProps {
   group: ErSignetGroup
diff --git a/src/pages/v2-pre/er/supports.tsx b/src/pages/honkai3rd/v2/er/supports.tsx
similarity index 92%
rename from src/pages/v2-pre/er/supports.tsx
rename to src/pages/honkai3rd/v2/er/supports.tsx
index 3ae60459..efd5a475 100644
--- a/src/pages/v2-pre/er/supports.tsx
+++ b/src/pages/honkai3rd/v2/er/supports.tsx
@@ -1,9 +1,9 @@
 import { NextPageContext } from 'next'
 import { useMemo } from 'react'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import BattlesuitSmallIcon from '../../../components/v2-pre/BattlesuitSmallIcon'
-import { BattlesuitCatalogItem, ErSupportBattlesuit } from '../../../lib/v2-pre/data/types'
-import { loadBattlesuitCatalog, loadErSupports } from '../../../lib/v2-pre/server/loadData'
+import BattlesuitSmallIcon from '../../../../components/v2-pre/BattlesuitSmallIcon'
+import { BattlesuitCatalogItem, ErSupportBattlesuit } from '../../../../lib/v2-pre/data/types'
+import { loadBattlesuitCatalog, loadErSupports } from '../../../../lib/v2-pre/server/loadData'
 
 interface SupportsPageProps {
   battlesuitCatalog: BattlesuitCatalogItem[]
diff --git a/src/pages/v2-pre/index.tsx b/src/pages/honkai3rd/v2/index.tsx
similarity index 100%
rename from src/pages/v2-pre/index.tsx
rename to src/pages/honkai3rd/v2/index.tsx
diff --git a/src/pages/v2-pre/stigmata-sets/[stigmataSetId].tsx b/src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx
similarity index 93%
rename from src/pages/v2-pre/stigmata-sets/[stigmataSetId].tsx
rename to src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx
index c4c25532..d2a42d96 100644
--- a/src/pages/v2-pre/stigmata-sets/[stigmataSetId].tsx
+++ b/src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx
@@ -1,12 +1,12 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading, Link } from 'theme-ui'
-import FormattedText from '../../../components/v2-pre/FormattedText'
-import { formatSubSkillInfo } from '../../../lib/v2-pre/data/formatText'
-import { loadStigmaData, loadStigmataSetCatalog, loadStigmataSetData } from '../../../lib/v2-pre/server/loadData'
-import { RootStigma, StigmataSet } from '../../../lib/v2-pre/data/types'
+import FormattedText from '../../../../components/v2-pre/FormattedText'
+import { formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText'
+import { loadStigmaData, loadStigmataSetCatalog, loadStigmataSetData } from '../../../../lib/v2-pre/server/loadData'
+import { RootStigma, StigmataSet } from '../../../../lib/v2-pre/data/types'
 import { Fragment } from 'react'
-import StigmaIcon from '../../../components/v2-pre/StigmaIcon'
-import StigmaFigureImage from '../../../components/v2-pre/StigmaFigureImage'
+import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
+import StigmaFigureImage from '../../../../components/v2-pre/StigmaFigureImage'
 
 interface StigmataSetShowPage {
   stigmataSet: StigmataSet
diff --git a/src/pages/v2-pre/stigmata-sets/index.tsx b/src/pages/honkai3rd/v2/stigmata-sets/index.tsx
similarity index 90%
rename from src/pages/v2-pre/stigmata-sets/index.tsx
rename to src/pages/honkai3rd/v2/stigmata-sets/index.tsx
index 548431ed..df1f0f3f 100644
--- a/src/pages/v2-pre/stigmata-sets/index.tsx
+++ b/src/pages/honkai3rd/v2/stigmata-sets/index.tsx
@@ -3,9 +3,9 @@ import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
 
-import { StigmataSetCatalogItem } from '../../../lib/v2-pre/data/types'
-import { loadStigmataSetCatalog } from '../../../lib/v2-pre/server/loadData'
-import StigmaIcon from '../../../components/v2-pre/StigmaIcon'
+import { StigmataSetCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { loadStigmataSetCatalog } from '../../../../lib/v2-pre/server/loadData'
+import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
 
 interface StigmataSetListPageProps {
   stigmataSetCatalog: StigmataSetCatalogItem[]
diff --git a/src/pages/v2-pre/stigmata/[stigmaId].tsx b/src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx
similarity index 89%
rename from src/pages/v2-pre/stigmata/[stigmaId].tsx
rename to src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx
index 5f13b901..a47b719c 100644
--- a/src/pages/v2-pre/stigmata/[stigmaId].tsx
+++ b/src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx
@@ -1,14 +1,14 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading, Link } from 'theme-ui'
-import FormattedText from '../../../components/v2-pre/FormattedText'
-import { formatSubSkillInfo, replaceNewLine } from '../../../lib/v2-pre/data/formatText'
-import { loadStigmaData, loadStigmataCatalog, loadStigmataSetData } from '../../../lib/v2-pre/server/loadData'
-import { RootStigma, StigmataSetCatalogItem } from '../../../lib/v2-pre/data/types'
+import FormattedText from '../../../../components/v2-pre/FormattedText'
+import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2-pre/data/formatText'
+import { loadStigmaData, loadStigmataCatalog, loadStigmataSetData } from '../../../../lib/v2-pre/server/loadData'
+import { RootStigma, StigmataSetCatalogItem } from '../../../../lib/v2-pre/data/types'
 import { Fragment } from 'react'
-import { getStigmaTypeLabel } from '../../../lib/v2-pre/data/text'
-import StigmaTypeIcon from '../../../components/v2-pre/StigmaTypeIcon'
-import StigmaIcon from '../../../components/v2-pre/StigmaIcon'
-import StigmaFigureImage from '../../../components/v2-pre/StigmaFigureImage'
+import { getStigmaTypeLabel } from '../../../../lib/v2-pre/data/text'
+import StigmaTypeIcon from '../../../../components/v2-pre/StigmaTypeIcon'
+import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
+import StigmaFigureImage from '../../../../components/v2-pre/StigmaFigureImage'
 
 interface StigmaShowPageProps {
   rootStigma: RootStigma
diff --git a/src/pages/v2-pre/stigmata/index.tsx b/src/pages/honkai3rd/v2/stigmata/index.tsx
similarity index 89%
rename from src/pages/v2-pre/stigmata/index.tsx
rename to src/pages/honkai3rd/v2/stigmata/index.tsx
index e1385bca..ad20e7fd 100644
--- a/src/pages/v2-pre/stigmata/index.tsx
+++ b/src/pages/honkai3rd/v2/stigmata/index.tsx
@@ -3,9 +3,9 @@ import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
 
-import { StigmataCatalogItem } from '../../../lib/v2-pre/data/types'
-import { loadStigmataCatalog } from '../../../lib/v2-pre/server/loadData'
-import StigmaIcon from '../../../components/v2-pre/StigmaIcon'
+import { StigmataCatalogItem } from '../../../../lib/v2-pre/data/types'
+import { loadStigmataCatalog } from '../../../../lib/v2-pre/server/loadData'
+import StigmaIcon from '../../../../components/v2-pre/StigmaIcon'
 
 interface StigmataListPageProps {
   stigmataCatalog: StigmataCatalogItem[]
diff --git a/src/pages/v2-pre/weapons/[weaponId].tsx b/src/pages/honkai3rd/v2/weapons/[weaponId].tsx
similarity index 84%
rename from src/pages/v2-pre/weapons/[weaponId].tsx
rename to src/pages/honkai3rd/v2/weapons/[weaponId].tsx
index 8be92cae..4003cb08 100644
--- a/src/pages/v2-pre/weapons/[weaponId].tsx
+++ b/src/pages/honkai3rd/v2/weapons/[weaponId].tsx
@@ -1,13 +1,13 @@
 import { NextPageContext } from 'next'
 import { Box, Card, Flex, Heading } from 'theme-ui'
-import FormattedText from '../../../components/v2-pre/FormattedText'
-import { formatSubSkillInfo, replaceNewLine } from '../../../lib/v2-pre/data/formatText'
-import { loadWeaponCatalog, loadWeaponData } from '../../../lib/v2-pre/server/loadData'
-import { RootWeaponData } from '../../../lib/v2-pre/data/types'
+import FormattedText from '../../../../components/v2-pre/FormattedText'
+import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2-pre/data/formatText'
+import { loadWeaponCatalog, loadWeaponData } from '../../../../lib/v2-pre/server/loadData'
+import { RootWeaponData } from '../../../../lib/v2-pre/data/types'
 import { Fragment } from 'react'
-import { getWeaponTypeLabel } from '../../../lib/v2-pre/data/text'
-import WeaponTypeIcon from '../../../components/v2-pre/WeaponTypeIcon'
-import WeaponIcon from '../../../components/v2-pre/WeaponIcon'
+import { getWeaponTypeLabel } from '../../../../lib/v2-pre/data/text'
+import WeaponTypeIcon from '../../../../components/v2-pre/WeaponTypeIcon'
+import WeaponIcon from '../../../../components/v2-pre/WeaponIcon'
 
 interface WeaponShowPageProps {
   rootWeapon: RootWeaponData
diff --git a/src/pages/v2-pre/weapons/index.tsx b/src/pages/honkai3rd/v2/weapons/index.tsx
similarity index 94%
rename from src/pages/v2-pre/weapons/index.tsx
rename to src/pages/honkai3rd/v2/weapons/index.tsx
index d4f1b013..16d0e3f7 100644
--- a/src/pages/v2-pre/weapons/index.tsx
+++ b/src/pages/honkai3rd/v2/weapons/index.tsx
@@ -2,9 +2,9 @@
 import { Box, Card } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import { Flex, Link } from 'theme-ui'
-import { loadWeaponCatalog } from '../../../lib/v2-pre/server/loadData'
-import { WeaponCatalogItem } from '../../../lib/v2-pre/data/types'
-import WeaponIcon from '../../../components/v2-pre/WeaponIcon'
+import { loadWeaponCatalog } from '../../../../lib/v2-pre/server/loadData'
+import { WeaponCatalogItem } from '../../../../lib/v2-pre/data/types'
+import WeaponIcon from '../../../../components/v2-pre/WeaponIcon'
 
 interface WeaponListPageProps {
   weaponCatalog: WeaponCatalogItem[]