diff --git a/readme.md b/readme.md
index df141fe..2cc817b 100644
--- a/readme.md
+++ b/readme.md
@@ -40,7 +40,6 @@ Free to download Warhammer 40.000 icons as SVG/iconfont.
 |--|--|--|
 |![The Bloodmaws](./src/svgs/bloodmaws.svg)|The Bloodmaws|`wh40k-bloodmaws`|
 
-
 #### Adeptus Custodes
 
 N/A
@@ -55,7 +54,6 @@ N/A
 |--|--|--|
 |![Khorne Symbol](./src/svgs/khorne-symbol-01.svg)|khorne Symbol|`wh40k-khorne-symbol-01`|
 
-
 *In pcocessing
 
 ### Xenos
diff --git a/src/svgs/sword-01.svg b/src/svgs/General/Other/sword-01.svg
old mode 100755
new mode 100644
similarity index 100%
rename from src/svgs/sword-01.svg
rename to src/svgs/General/Other/sword-01.svg
diff --git a/src/svgs/sword-02.svg b/src/svgs/General/Other/sword-02.svg
old mode 100755
new mode 100644
similarity index 100%
rename from src/svgs/sword-02.svg
rename to src/svgs/General/Other/sword-02.svg
diff --git a/src/svgs/sword-03.svg b/src/svgs/General/Other/sword-03.svg
old mode 100755
new mode 100644
similarity index 100%
rename from src/svgs/sword-03.svg
rename to src/svgs/General/Other/sword-03.svg
diff --git a/src/svgs/sword-04.svg b/src/svgs/General/Other/sword-04.svg
old mode 100755
new mode 100644
similarity index 100%
rename from src/svgs/sword-04.svg
rename to src/svgs/General/Other/sword-04.svg
diff --git a/src/svgs/HQ.svg b/src/svgs/General/UnitType/HQ.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/HQ.svg
rename to src/svgs/General/UnitType/HQ.svg
index 373bc8c..ec544fd
--- a/src/svgs/HQ.svg
+++ b/src/svgs/General/UnitType/HQ.svg
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<g>
-	<path d="M233.6,298.5c-6.5-3.3-14.6-6.8-24.1-9.7c-11.7-3.6-22.3-5.2-30.8-6c-0.4,0-0.8,0.1-1.2,0.2c-7.1,2.5-9.3,6.6-9.9,7.8
-		c-3.9,8.1,1.2,21.1,14.6,29.4c0.3,0.2,0.7,0.3,1.1,0.4c6.1,0.8,21.3,2.1,36.7-6.4c6.4-3.5,11.1-7.7,14.4-11.3
-		C235.6,301.5,235.2,299.4,233.6,298.5z"/>
-	<path d="M322.7,283.1c-0.4-0.2-0.8-0.3-1.2-0.2c-8.5,0.8-19.1,2.4-30.8,6c-9.5,2.8-17.5,6.3-24.1,9.7c-1.6,0.8-2,2.9-0.8,4.3
-		c3.3,3.5,8,7.8,14.4,11.3c15.3,8.5,30.5,7.2,36.7,6.4c0.4-0.1,0.7-0.2,1.1-0.4c13.5-8.2,18.6-21.2,14.6-29.3
-		C332,289.7,329.7,285.6,322.7,283.1z"/>
-	<path d="M256.1,320.9c-1.4-1.3-3.1-2.5-5.2-3.6c-2.1,1.1-3.9,2.3-5.2,3.6c-10.5,10.2-10.8,24.1-10.4,31c0,0.9,1.2,1.3,1.8,0.6
-		c1.4-1.8,3.4-3.9,6.1-5.8c2.8-2,5.6-3.3,7.7-4.1c2.1,0.8,4.9,2,7.7,4.1c2.6,1.9,4.7,4,6.1,5.8c0.6,0.7,1.7,0.4,1.8-0.6
-		C266.9,345.1,266.7,331,256.1,320.9z"/>
-	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M347.2,273.6c25,28.2-9,73.1-13.7,76.8
-		c-8.4,6.6-35-6.9-30.8,0.1c3.1,5.3,6.1,45.4,6.1,45.4h-8.3l-4-14l-7.1-0.1l-1.3,14h-14.4l-1.3-13.4l-4.8-0.7l-0.7,14h-11.5
-		l-0.6-14.4h-9.5l-0.6,14.4H233l-0.7-14l-4.8,0.7l-1.3,13.4h-14.4l-1.3-14l-7.1,0.1l-4,14h-8.3c0,0,2.9-40.1,6.1-45.4
-		c4.2-7-22.4,6.6-30.8-0.1c-4.7-3.6-38.8-48.5-13.7-76.8c6.3-7-24.6-59.3-8.3-105.7c19-54.3,75.4-62.8,99.7-63.9c0,0,2-0.1,5.6-0.1
-		h0.1c0,0,0,0,0.1,0c3.5,0,5.6,0.1,5.6,0.1c24.4,1.1,80.7,9.6,99.8,63.9C371.5,214.2,340.8,266.5,347.2,273.6z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<g>
+	<path d="M233.6,298.5c-6.5-3.3-14.6-6.8-24.1-9.7c-11.7-3.6-22.3-5.2-30.8-6c-0.4,0-0.8,0.1-1.2,0.2c-7.1,2.5-9.3,6.6-9.9,7.8
+		c-3.9,8.1,1.2,21.1,14.6,29.4c0.3,0.2,0.7,0.3,1.1,0.4c6.1,0.8,21.3,2.1,36.7-6.4c6.4-3.5,11.1-7.7,14.4-11.3
+		C235.6,301.5,235.2,299.4,233.6,298.5z"/>
+	<path d="M322.7,283.1c-0.4-0.2-0.8-0.3-1.2-0.2c-8.5,0.8-19.1,2.4-30.8,6c-9.5,2.8-17.5,6.3-24.1,9.7c-1.6,0.8-2,2.9-0.8,4.3
+		c3.3,3.5,8,7.8,14.4,11.3c15.3,8.5,30.5,7.2,36.7,6.4c0.4-0.1,0.7-0.2,1.1-0.4c13.5-8.2,18.6-21.2,14.6-29.3
+		C332,289.7,329.7,285.6,322.7,283.1z"/>
+	<path d="M256.1,320.9c-1.4-1.3-3.1-2.5-5.2-3.6c-2.1,1.1-3.9,2.3-5.2,3.6c-10.5,10.2-10.8,24.1-10.4,31c0,0.9,1.2,1.3,1.8,0.6
+		c1.4-1.8,3.4-3.9,6.1-5.8c2.8-2,5.6-3.3,7.7-4.1c2.1,0.8,4.9,2,7.7,4.1c2.6,1.9,4.7,4,6.1,5.8c0.6,0.7,1.7,0.4,1.8-0.6
+		C266.9,345.1,266.7,331,256.1,320.9z"/>
+	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M347.2,273.6c25,28.2-9,73.1-13.7,76.8
+		c-8.4,6.6-35-6.9-30.8,0.1c3.1,5.3,6.1,45.4,6.1,45.4h-8.3l-4-14l-7.1-0.1l-1.3,14h-14.4l-1.3-13.4l-4.8-0.7l-0.7,14h-11.5
+		l-0.6-14.4h-9.5l-0.6,14.4H233l-0.7-14l-4.8,0.7l-1.3,13.4h-14.4l-1.3-14l-7.1,0.1l-4,14h-8.3c0,0,2.9-40.1,6.1-45.4
+		c4.2-7-22.4,6.6-30.8-0.1c-4.7-3.6-38.8-48.5-13.7-76.8c6.3-7-24.6-59.3-8.3-105.7c19-54.3,75.4-62.8,99.7-63.9c0,0,2-0.1,5.6-0.1
+		h0.1c0,0,0,0,0.1,0c3.5,0,5.6,0.1,5.6,0.1c24.4,1.1,80.7,9.6,99.8,63.9C371.5,214.2,340.8,266.5,347.2,273.6z"/>
+</g>
+</svg>
diff --git a/src/svgs/dedicated-transport.svg b/src/svgs/General/UnitType/dedicated-transport.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/dedicated-transport.svg
rename to src/svgs/General/UnitType/dedicated-transport.svg
index b91b32a..72ca02a
--- a/src/svgs/dedicated-transport.svg
+++ b/src/svgs/General/UnitType/dedicated-transport.svg
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#FFFFFF;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
-<g>
-	<path d="M249.5,180c-12.2,0.6-40.5,5.1-50,33.8c-8.2,24.5,7.3,52.3,4.2,56c-12.6,15,4.5,38.8,6.8,40.7c4.2,3.5,17.6-3.6,15.5,0.1
-		c-1.6,2.8-3.1,24-3.1,24h4.1l2-7.4h3.5l0.7,7.4h7.2l0.7-7.1l2.4-0.4l0.3,7.4h5.9l0.3-7.6h4.8l0.3,7.6h5.9l0.3-7.4l2.4,0.4l0.7,7.1
-		h7.2l0.7-7.4h3.5l2,7.4h4.1c0,0-1.5-21.2-3.1-24c-2.1-3.7,11.3,3.4,15.5-0.1c2.3-2,19.4-25.7,6.8-40.7c-3.2-3.8,12.2-31.5,4.1-56
-		c-9.6-28.8-37.8-33.2-50.1-33.8c0,0-1-0.1-2.8-0.1C250.5,179.9,249.5,180,249.5,180z M237.2,291.3c-7.7,4.5-15.3,3.8-18.4,3.4
-		c-0.2,0-0.4-0.1-0.6-0.2c-6.8-4.4-9.3-11.3-7.3-15.5c0.3-0.7,1.4-2.8,5-4.1c0.2-0.1,0.4-0.1,0.6-0.1c4.3,0.4,9.6,1.3,15.4,3.2
-		c4.8,1.5,8.8,3.4,12.1,5.2c0.9,0.2,1.1,1.4,0.4,2.1C242.8,287.2,240.4,289.4,237.2,291.3z M260.6,283c3.3-1.8,7.4-3.6,12.1-5.2
-		c5.9-1.9,11.2-2.8,15.4-3.2c0.2,0,0.4,0,0.6,0.1c3.5,1.3,4.7,3.5,5,4.1c2,4.4-0.5,11.3-7.3,15.7c-0.2,0.1-0.4,0.2-0.6,0.2
-		c-3.1,0.4-10.7,1.1-18.4-3.4c-3.2-1.8-5.6-4.1-7.2-6C259.6,284.6,259.8,283.5,260.6,283z M255.2,294.9c5.5,5.3,5.6,12.7,5.4,16.4
-		c0,0.5-0.6,0.7-0.9,0.3c-0.7-1-1.7-2.1-3.1-3.1c-1.4-1.1-2.8-1.8-3.9-2.2c-1,0.4-2.4,1.1-3.9,2.2c-1.3,1-2.3,2.1-3.1,3.1
-		c-0.3,0.4-0.9,0.2-0.9-0.3c-0.2-3.6-0.1-11.1,5.2-16.4c0.7-0.7,1.6-1.3,2.6-1.9C253.6,293.6,254.5,294.2,255.2,294.9z"/>
-	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M324.1,263.7V430H177.1V262.1l-95.6-1L253,31.7
-		l166.7,233L324.1,263.7z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
+<g>
+	<path d="M249.5,180c-12.2,0.6-40.5,5.1-50,33.8c-8.2,24.5,7.3,52.3,4.2,56c-12.6,15,4.5,38.8,6.8,40.7c4.2,3.5,17.6-3.6,15.5,0.1
+		c-1.6,2.8-3.1,24-3.1,24h4.1l2-7.4h3.5l0.7,7.4h7.2l0.7-7.1l2.4-0.4l0.3,7.4h5.9l0.3-7.6h4.8l0.3,7.6h5.9l0.3-7.4l2.4,0.4l0.7,7.1
+		h7.2l0.7-7.4h3.5l2,7.4h4.1c0,0-1.5-21.2-3.1-24c-2.1-3.7,11.3,3.4,15.5-0.1c2.3-2,19.4-25.7,6.8-40.7c-3.2-3.8,12.2-31.5,4.1-56
+		c-9.6-28.8-37.8-33.2-50.1-33.8c0,0-1-0.1-2.8-0.1C250.5,179.9,249.5,180,249.5,180z M237.2,291.3c-7.7,4.5-15.3,3.8-18.4,3.4
+		c-0.2,0-0.4-0.1-0.6-0.2c-6.8-4.4-9.3-11.3-7.3-15.5c0.3-0.7,1.4-2.8,5-4.1c0.2-0.1,0.4-0.1,0.6-0.1c4.3,0.4,9.6,1.3,15.4,3.2
+		c4.8,1.5,8.8,3.4,12.1,5.2c0.9,0.2,1.1,1.4,0.4,2.1C242.8,287.2,240.4,289.4,237.2,291.3z M260.6,283c3.3-1.8,7.4-3.6,12.1-5.2
+		c5.9-1.9,11.2-2.8,15.4-3.2c0.2,0,0.4,0,0.6,0.1c3.5,1.3,4.7,3.5,5,4.1c2,4.4-0.5,11.3-7.3,15.7c-0.2,0.1-0.4,0.2-0.6,0.2
+		c-3.1,0.4-10.7,1.1-18.4-3.4c-3.2-1.8-5.6-4.1-7.2-6C259.6,284.6,259.8,283.5,260.6,283z M255.2,294.9c5.5,5.3,5.6,12.7,5.4,16.4
+		c0,0.5-0.6,0.7-0.9,0.3c-0.7-1-1.7-2.1-3.1-3.1c-1.4-1.1-2.8-1.8-3.9-2.2c-1,0.4-2.4,1.1-3.9,2.2c-1.3,1-2.3,2.1-3.1,3.1
+		c-0.3,0.4-0.9,0.2-0.9-0.3c-0.2-3.6-0.1-11.1,5.2-16.4c0.7-0.7,1.6-1.3,2.6-1.9C253.6,293.6,254.5,294.2,255.2,294.9z"/>
+	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M324.1,263.7V430H177.1V262.1l-95.6-1L253,31.7
+		l166.7,233L324.1,263.7z"/>
+</g>
+</svg>
diff --git a/src/svgs/elites.svg b/src/svgs/General/UnitType/elites.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/elites.svg
rename to src/svgs/General/UnitType/elites.svg
index edfaed8..ccc88d8
--- a/src/svgs/elites.svg
+++ b/src/svgs/General/UnitType/elites.svg
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<g>
-	<path d="M285.4,262.2c-0.2-0.1-0.4-0.1-0.6-0.1c-4.1,0.4-9.2,1.2-14.9,3c-4.7,1.4-8.6,3.1-11.8,4.8c-0.8,0.4-1,1.5-0.4,2.2
-		c1.6,1.8,3.9,3.8,7,5.6c7.5,4.2,14.9,3.6,17.9,3.2c0.1,0,0.3-0.1,0.5-0.2c6.5-4.1,9-10.6,7.1-14.6
-		C289.9,265.5,288.8,263.4,285.4,262.2z"/>
-	<path d="M242,269.9c-3.3-1.6-7.2-3.4-11.8-4.8c-5.6-1.8-10.8-2.6-14.9-3c-0.2,0-0.4,0-0.6,0.1c-3.4,1.3-4.5,3.3-4.8,3.9
-		c-1.9,4,0.5,10.5,7.1,14.6c0.1,0.1,0.3,0.2,0.5,0.2c3,0.4,10.4,1,17.9-3.2c3.1-1.7,5.4-3.8,7-5.6C243,271.4,242.8,270.3,242,269.9z
-		"/>
-	<path d="M293.9,347.6c-9.3,3.9-24.5,9-43.9,9.6c-20.5,0.7-36.8-3.9-46.5-7.5c-0.7,5.4-1.9,12-4.4,19.2
-		c-3.7,10.6-8.7,18.8-12.8,24.4c41.1-0.5,82.1-1.1,123.3-1.8c-3.9-4.6-9.7-12.8-13.1-24.4C294.3,359.4,293.8,352.6,293.9,347.6z"/>
-	<path d="M151.4,203.4c-5,0.1-11.8-0.4-19.5-2.6c-11.6-3.4-19.7-9.2-24.4-13.1c-0.6,41.1-1.2,82.1-1.8,123.2
-		c5.6-4.1,13.7-9.1,24.4-12.8c7.2-2.5,13.8-3.8,19.2-4.4c-3.5-9.6-8.2-25.9-7.5-46.4C142.4,227.9,147.5,212.7,151.4,203.4z"/>
-	<path d="M203.4,148.7c9.7-3.5,26-8.2,46.5-7.5c19.4,0.6,34.6,5.7,43.9,9.6c-0.1-5,0.4-11.8,2.6-19.5c3.4-11.6,9.2-19.8,13.1-24.4
-		c-41.1-0.6-82.1-1.1-123.3-1.8c4.1,5.6,9.1,13.7,12.8,24.4C201.5,136.7,202.8,143.3,203.4,148.7z"/>
-	<path d="M250.4,279.1c-1,0.6-1.8,1.1-2.5,1.8c-5.2,5.1-5.3,12.1-5.1,15.5c0.1,0.5,0.6,0.7,0.9,0.3c0.7-0.9,1.7-1.9,3-2.9
-		c1.4-1,2.7-1.6,3.7-2c1,0.4,2.3,1,3.7,2c1.3,1,2.3,2,3,2.9c0.3,0.3,0.9,0.2,0.9-0.3c0.3-3.3,0.1-10.3-5.1-15.5
-		C252.3,280.2,251.4,279.6,250.4,279.1z"/>
-	<path d="M367.7,200.7c-7.7,2.2-14.5,2.7-19.5,2.6c3.9,9.3,9,24.5,9.6,43.9c0.7,20.5-3.9,36.8-7.5,46.5c5.4,0.7,12,1.9,19.2,4.4
-		c10.7,3.6,18.8,8.7,24.4,12.7c-0.6-41.1-1.2-82.1-1.8-123.2C387.6,191.5,379.4,197.3,367.7,200.7z"/>
-	<path d="M249.4,156.9c-50.5,0-91.4,40.9-91.4,91.4s40.9,91.4,91.4,91.4s91.4-40.9,91.4-91.4S299.9,156.9,249.4,156.9z M297.3,257.4
-		c12.2,14.1-4.3,36.4-6.6,38.3c-4.1,3.3-17.1-3.4-15,0.1c1.6,2.6,3,22.6,3,22.6h-4.1l-1.9-7h-3.4l-0.7,7h-7l-0.7-6.7l-2.3-0.3
-		l-0.3,7h-5.7l-0.3-7.2h-4.6l-0.3,7.2h-5.7l-0.3-7l-2.3,0.3l-0.7,6.7h-7l-0.7-7h-3.4l-1.9,7h-4c0,0,1.5-20,3-22.6
-		c2-3.5-10.9,3.2-15-0.1c-2.2-1.9-18.8-24.2-6.6-38.3c3.1-3.5-11.9-29.5-4-52.6c9.3-27,36.7-31.3,48.5-31.8c0,0,0.9-0.1,2.7-0.1
-		c1.7,0,2.7,0.1,2.7,0.1c11.8,0.5,39.2,4.8,48.5,31.8C309.1,227.9,294.1,253.9,297.3,257.4z"/>
-	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M416.8,359.5h-6.7c-4.3-9.4-18.4-27.7-36.6-38.1
-		c-2.9-1.6-7.1-3.2-11.6-4.6c-11.4,18.6-27.3,34.1-46.2,45.1c1.7,4.9,4,10.1,7.3,15.4c12.4,20.2,30.3,28.7,36.9,31.4
-		c0,2.4,0,4.8,0,7.2H137.5v-6.7c9.4-4.3,27.7-18.4,38.1-36.6c1.9-3.1,3.5-7.8,5-12.7c-17.5-10.9-32.3-25.8-43-43.4
-		c-4.8,1.5-9.4,3.1-12.5,4.9c-18.2,10.4-32.3,28.8-36.6,38.1h-6.7V137.2c2.5,0,4.9,0,7.3,0c2.8,6.5,11.2,24.5,31.4,36.9
-		c5.6,3.5,11.1,5.9,16.3,7.6c10.8-18.3,25.9-33.7,43.9-44.9c-1.5-4.9-3.1-9.5-4.9-12.6c-10.4-18.2-28.8-32.3-38.1-36.6v-6.7H360
-		c0,2.4,0,4.8,0,7.2c-6.5,2.8-24.5,11.2-36.9,31.4c-3.2,5.2-5.5,10.4-7.2,15.2c19.4,11.3,35.6,27.3,47,46.6c4.9-1.7,10.1-4,15.4-7.3
-		c20.2-12.4,28.7-30.3,31.4-36.9c2.4,0,4.8,0,7,0V359.5z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<g>
+	<path d="M285.4,262.2c-0.2-0.1-0.4-0.1-0.6-0.1c-4.1,0.4-9.2,1.2-14.9,3c-4.7,1.4-8.6,3.1-11.8,4.8c-0.8,0.4-1,1.5-0.4,2.2
+		c1.6,1.8,3.9,3.8,7,5.6c7.5,4.2,14.9,3.6,17.9,3.2c0.1,0,0.3-0.1,0.5-0.2c6.5-4.1,9-10.6,7.1-14.6
+		C289.9,265.5,288.8,263.4,285.4,262.2z"/>
+	<path d="M242,269.9c-3.3-1.6-7.2-3.4-11.8-4.8c-5.6-1.8-10.8-2.6-14.9-3c-0.2,0-0.4,0-0.6,0.1c-3.4,1.3-4.5,3.3-4.8,3.9
+		c-1.9,4,0.5,10.5,7.1,14.6c0.1,0.1,0.3,0.2,0.5,0.2c3,0.4,10.4,1,17.9-3.2c3.1-1.7,5.4-3.8,7-5.6C243,271.4,242.8,270.3,242,269.9z
+		"/>
+	<path d="M293.9,347.6c-9.3,3.9-24.5,9-43.9,9.6c-20.5,0.7-36.8-3.9-46.5-7.5c-0.7,5.4-1.9,12-4.4,19.2
+		c-3.7,10.6-8.7,18.8-12.8,24.4c41.1-0.5,82.1-1.1,123.3-1.8c-3.9-4.6-9.7-12.8-13.1-24.4C294.3,359.4,293.8,352.6,293.9,347.6z"/>
+	<path d="M151.4,203.4c-5,0.1-11.8-0.4-19.5-2.6c-11.6-3.4-19.7-9.2-24.4-13.1c-0.6,41.1-1.2,82.1-1.8,123.2
+		c5.6-4.1,13.7-9.1,24.4-12.8c7.2-2.5,13.8-3.8,19.2-4.4c-3.5-9.6-8.2-25.9-7.5-46.4C142.4,227.9,147.5,212.7,151.4,203.4z"/>
+	<path d="M203.4,148.7c9.7-3.5,26-8.2,46.5-7.5c19.4,0.6,34.6,5.7,43.9,9.6c-0.1-5,0.4-11.8,2.6-19.5c3.4-11.6,9.2-19.8,13.1-24.4
+		c-41.1-0.6-82.1-1.1-123.3-1.8c4.1,5.6,9.1,13.7,12.8,24.4C201.5,136.7,202.8,143.3,203.4,148.7z"/>
+	<path d="M250.4,279.1c-1,0.6-1.8,1.1-2.5,1.8c-5.2,5.1-5.3,12.1-5.1,15.5c0.1,0.5,0.6,0.7,0.9,0.3c0.7-0.9,1.7-1.9,3-2.9
+		c1.4-1,2.7-1.6,3.7-2c1,0.4,2.3,1,3.7,2c1.3,1,2.3,2,3,2.9c0.3,0.3,0.9,0.2,0.9-0.3c0.3-3.3,0.1-10.3-5.1-15.5
+		C252.3,280.2,251.4,279.6,250.4,279.1z"/>
+	<path d="M367.7,200.7c-7.7,2.2-14.5,2.7-19.5,2.6c3.9,9.3,9,24.5,9.6,43.9c0.7,20.5-3.9,36.8-7.5,46.5c5.4,0.7,12,1.9,19.2,4.4
+		c10.7,3.6,18.8,8.7,24.4,12.7c-0.6-41.1-1.2-82.1-1.8-123.2C387.6,191.5,379.4,197.3,367.7,200.7z"/>
+	<path d="M249.4,156.9c-50.5,0-91.4,40.9-91.4,91.4s40.9,91.4,91.4,91.4s91.4-40.9,91.4-91.4S299.9,156.9,249.4,156.9z M297.3,257.4
+		c12.2,14.1-4.3,36.4-6.6,38.3c-4.1,3.3-17.1-3.4-15,0.1c1.6,2.6,3,22.6,3,22.6h-4.1l-1.9-7h-3.4l-0.7,7h-7l-0.7-6.7l-2.3-0.3
+		l-0.3,7h-5.7l-0.3-7.2h-4.6l-0.3,7.2h-5.7l-0.3-7l-2.3,0.3l-0.7,6.7h-7l-0.7-7h-3.4l-1.9,7h-4c0,0,1.5-20,3-22.6
+		c2-3.5-10.9,3.2-15-0.1c-2.2-1.9-18.8-24.2-6.6-38.3c3.1-3.5-11.9-29.5-4-52.6c9.3-27,36.7-31.3,48.5-31.8c0,0,0.9-0.1,2.7-0.1
+		c1.7,0,2.7,0.1,2.7,0.1c11.8,0.5,39.2,4.8,48.5,31.8C309.1,227.9,294.1,253.9,297.3,257.4z"/>
+	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M416.8,359.5h-6.7c-4.3-9.4-18.4-27.7-36.6-38.1
+		c-2.9-1.6-7.1-3.2-11.6-4.6c-11.4,18.6-27.3,34.1-46.2,45.1c1.7,4.9,4,10.1,7.3,15.4c12.4,20.2,30.3,28.7,36.9,31.4
+		c0,2.4,0,4.8,0,7.2H137.5v-6.7c9.4-4.3,27.7-18.4,38.1-36.6c1.9-3.1,3.5-7.8,5-12.7c-17.5-10.9-32.3-25.8-43-43.4
+		c-4.8,1.5-9.4,3.1-12.5,4.9c-18.2,10.4-32.3,28.8-36.6,38.1h-6.7V137.2c2.5,0,4.9,0,7.3,0c2.8,6.5,11.2,24.5,31.4,36.9
+		c5.6,3.5,11.1,5.9,16.3,7.6c10.8-18.3,25.9-33.7,43.9-44.9c-1.5-4.9-3.1-9.5-4.9-12.6c-10.4-18.2-28.8-32.3-38.1-36.6v-6.7H360
+		c0,2.4,0,4.8,0,7.2c-6.5,2.8-24.5,11.2-36.9,31.4c-3.2,5.2-5.5,10.4-7.2,15.2c19.4,11.3,35.6,27.3,47,46.6c4.9-1.7,10.1-4,15.4-7.3
+		c20.2-12.4,28.7-30.3,31.4-36.9c2.4,0,4.8,0,7,0V359.5z"/>
+</g>
+</svg>
diff --git a/src/svgs/fast-attack.svg b/src/svgs/General/UnitType/fast-attack.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/fast-attack.svg
rename to src/svgs/General/UnitType/fast-attack.svg
index a16fa13..bb644f1
--- a/src/svgs/fast-attack.svg
+++ b/src/svgs/General/UnitType/fast-attack.svg
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#FFFFFF;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
-<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M336.4,444L142,200.7h81.4L131.5,70.4h140.2
-	l72.3,202.3h-72.3L336.4,444z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
+<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M336.4,444L142,200.7h81.4L131.5,70.4h140.2
+	l72.3,202.3h-72.3L336.4,444z"/>
+</svg>
diff --git a/src/svgs/flyer.svg b/src/svgs/General/UnitType/flyer.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/flyer.svg
rename to src/svgs/General/UnitType/flyer.svg
index dc4921f..67cf841
--- a/src/svgs/flyer.svg
+++ b/src/svgs/General/UnitType/flyer.svg
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#FFFFFF;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
-<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M196.1,382.2c-0.7-0.8-1.2-1.4-1.7-2
-	c-7.3-8.6-16.8-9.8-25.3-3.2c-2.7,2.1-5.2,4.7-7.6,7.3c-2.9,3.1-5.7,6.4-8.5,9.5c-8.5,9.3-18.2,13.9-29.7,13.2
-	c-10.3-0.6-20.2-2.4-29.2-9c-1.7-1.2-3.3-2.7-5.3-4.4c3.2-1.1,6-1.8,8.7-3c6.9-3.2,13.9-6.4,20.8-9.9c2.6-1.3,5.1-3.5,7.4-5.5
-	c1.5-1.3,2.9-2.9,3.9-4.7c0.8-1.5,1.3-3.7,1.1-5.4c-0.1-0.8-2.3-1.6-3.6-1.7c-6.1-0.6-12.3-0.7-18.3-1.7
-	c-17-2.9-29.9-13.4-37.6-32.7c-0.2-0.6-0.4-1.2-0.6-1.8c-0.1-0.2-0.1-0.4,0.4-0.7c0.6,0,1.3,0,1.9,0c13.5,1,26.9,0.9,40.2-1.9
-	c2.7-0.6,5.4-1.7,8.1-2.7c0.7-0.3,1.5-0.8,1.9-1.4c0.5-0.7,0.9-1.9,0.8-2.7c0-0.5-1.2-1-1.9-1c-4.7-0.4-9.4,0-14-0.9
-	c-10-2-18.2-8.6-25.7-16.7c-8.2-9-14.8-19.6-20.7-30.9c0-0.2-0.1-0.4-0.2-0.9c0.9,0.5,1.6,0.8,2.3,1.1c11.2,5.6,22.7,10.2,34.8,11.8
-	c4.2,0.5,8.5,0,12.8,0c0.2,0,0.4,0,0.6-0.1c1.4-1.1,2.7-2.2,4.1-3.2c-1-1.3-1.9-3-3.1-3.9c-6.9-5.4-14-10.3-20.6-16.1
-	c-10.1-8.9-18-20.2-22.1-35c-2.2-7.6-3-15.5-2.6-24.1c0.8,0.8,1.4,1.3,1.9,1.8c9.7,10.4,19.9,20.1,31.1,28.1
-	c3.7,2.6,7.7,4.7,11.6,6.8c1.4,0.8,3.3,1.7,4.4-0.4c1-1.9-0.4-3.6-1.4-5c-15.6-22.8-21.8-50-24.3-78.9c-0.9-10.4-1.1-20.9-1.5-31.4
-	c-0.1-0.9,0-1.8,0.4-2.8c0.2,0.7,0.5,1.5,0.8,2.2c7.9,21.8,17.2,42.6,28.9,61.6c17,27.4,38.7,47.1,65,59.1c4,1.8,8,4.1,12,6.2
-	c1.2,0.6,2.3,1.5,3.5,2.3c9,6.8,11.2,20.3,4.6,30.5c-2.1,3.2-4.8,5.8-7.5,8.5c-2.7,2.7-5.7,5-8.4,7.7c-8.7,8.5-10.9,19.8-8.4,32.5
-	c2.4,12.4,9.6,18.6,19.2,21.3c2.1,0.6,4.3,0.9,6.6,1.3C202.8,360.1,199.5,371,196.1,382.2z M273.8,393.9L252.6,443l-21.1-49.2
-	l14.8-18.6l-2.2-40.6h-8.6l-13.1,12l-19.5-18l19.6-17.9l13,12h8l-11.4-213.5l21.4-75.3l21,75.4l-12.3,213.5h7.9l13.1-12l19.5,18
-	l-19.5,17.9l-13.1-12.1h-8.6l-2.3,40.7L273.8,393.9z M444.2,268.2c-5.9,11.3-12.5,21.9-20.7,30.9c-7.5,8.1-15.7,14.7-25.7,16.7
-	c-4.6,0.9-9.3,0.6-14,0.9c-0.7,0-1.9,0.5-1.9,1c-0.1,0.8,0.3,2,0.8,2.7c0.4,0.7,1.2,1.2,1.9,1.4c2.7,1,5.4,2.1,8.1,2.7
-	c13.4,2.7,26.7,2.8,40.2,1.9c0.6,0,1.3,0,1.9,0c0,0.3,0,0.5,0.4,0.7c-0.2,0.6-0.4,1.2-0.6,1.8c-7.7,19.3-20.6,29.8-37.6,32.7
-	c-6.1,1-12.2,1.1-18.3,1.7c-1.3,0.2-3.5,0.9-3.6,1.7c-0.3,1.7,0.3,3.9,1.1,5.4c1,1.9,2.4,3.4,3.9,4.7c2.4,2,4.8,4.2,7.4,5.5
-	c6.9,3.6,13.8,6.8,20.8,9.9c2.6,1.2,5.4,1.9,8.7,3c-2,1.7-3.6,3.2-5.3,4.4c-9,6.6-19,8.4-29.2,9c-11.5,0.7-21.3-3.9-29.7-13.2
-	c-2.9-3.1-5.6-6.4-8.5-9.5c-2.4-2.5-4.9-5.2-7.6-7.3c-8.5-6.6-18-5.3-25.3,3.2c-0.5,0.6-1,1.2-1.7,2c-3.4-11.1-6.7-22-10-32.9
-	c2.4-0.5,4.5-0.7,6.6-1.3c9.6-2.8,16.8-9,19.2-21.3c2.5-12.8,0.3-24-8.4-32.5c-2.7-2.7-5.7-5-8.4-7.7c-2.6-2.7-5.4-5.2-7.5-8.5
-	c-6.5-10.2-4.4-23.7,4.6-30.5c1.1-0.8,2.3-1.7,3.5-2.3c3.9-2.1,7.9-4.3,12-6.2c26.3-12,48-31.7,65-59.1c11.7-19,21-39.8,28.9-61.6
-	c0.2-0.7,0.5-1.5,0.8-2.2c0.4,1,0.4,1.9,0.4,2.8c-0.5,10.5-0.6,21-1.5,31.4c-2.5,28.9-8.7,56.1-24.3,78.9c-1,1.4-2.4,3.1-1.4,5
-	c1.1,2,3,1.1,4.4,0.4c3.9-2.1,7.9-4.2,11.6-6.8c11.2-8,21.3-17.7,31.1-28.1c0.6-0.5,1.1-1,1.9-1.8c0.4,8.6-0.5,16.5-2.6,24.1
-	c-4.1,14.7-11.9,26.1-22.1,35c-6.7,5.8-13.8,10.7-20.6,16.1c-1.2,1-2.1,2.6-3.1,3.9c1.4,1.1,2.7,2.2,4.1,3.2
-	c0.2,0.1,0.4,0.1,0.6,0.1c4.3,0,8.6,0.5,12.8,0c12.1-1.6,23.6-6.2,34.8-11.8c0.6-0.4,1.4-0.7,2.3-1.1
-	C444.3,267.8,444.3,268,444.2,268.2z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
+<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M196.1,382.2c-0.7-0.8-1.2-1.4-1.7-2
+	c-7.3-8.6-16.8-9.8-25.3-3.2c-2.7,2.1-5.2,4.7-7.6,7.3c-2.9,3.1-5.7,6.4-8.5,9.5c-8.5,9.3-18.2,13.9-29.7,13.2
+	c-10.3-0.6-20.2-2.4-29.2-9c-1.7-1.2-3.3-2.7-5.3-4.4c3.2-1.1,6-1.8,8.7-3c6.9-3.2,13.9-6.4,20.8-9.9c2.6-1.3,5.1-3.5,7.4-5.5
+	c1.5-1.3,2.9-2.9,3.9-4.7c0.8-1.5,1.3-3.7,1.1-5.4c-0.1-0.8-2.3-1.6-3.6-1.7c-6.1-0.6-12.3-0.7-18.3-1.7
+	c-17-2.9-29.9-13.4-37.6-32.7c-0.2-0.6-0.4-1.2-0.6-1.8c-0.1-0.2-0.1-0.4,0.4-0.7c0.6,0,1.3,0,1.9,0c13.5,1,26.9,0.9,40.2-1.9
+	c2.7-0.6,5.4-1.7,8.1-2.7c0.7-0.3,1.5-0.8,1.9-1.4c0.5-0.7,0.9-1.9,0.8-2.7c0-0.5-1.2-1-1.9-1c-4.7-0.4-9.4,0-14-0.9
+	c-10-2-18.2-8.6-25.7-16.7c-8.2-9-14.8-19.6-20.7-30.9c0-0.2-0.1-0.4-0.2-0.9c0.9,0.5,1.6,0.8,2.3,1.1c11.2,5.6,22.7,10.2,34.8,11.8
+	c4.2,0.5,8.5,0,12.8,0c0.2,0,0.4,0,0.6-0.1c1.4-1.1,2.7-2.2,4.1-3.2c-1-1.3-1.9-3-3.1-3.9c-6.9-5.4-14-10.3-20.6-16.1
+	c-10.1-8.9-18-20.2-22.1-35c-2.2-7.6-3-15.5-2.6-24.1c0.8,0.8,1.4,1.3,1.9,1.8c9.7,10.4,19.9,20.1,31.1,28.1
+	c3.7,2.6,7.7,4.7,11.6,6.8c1.4,0.8,3.3,1.7,4.4-0.4c1-1.9-0.4-3.6-1.4-5c-15.6-22.8-21.8-50-24.3-78.9c-0.9-10.4-1.1-20.9-1.5-31.4
+	c-0.1-0.9,0-1.8,0.4-2.8c0.2,0.7,0.5,1.5,0.8,2.2c7.9,21.8,17.2,42.6,28.9,61.6c17,27.4,38.7,47.1,65,59.1c4,1.8,8,4.1,12,6.2
+	c1.2,0.6,2.3,1.5,3.5,2.3c9,6.8,11.2,20.3,4.6,30.5c-2.1,3.2-4.8,5.8-7.5,8.5c-2.7,2.7-5.7,5-8.4,7.7c-8.7,8.5-10.9,19.8-8.4,32.5
+	c2.4,12.4,9.6,18.6,19.2,21.3c2.1,0.6,4.3,0.9,6.6,1.3C202.8,360.1,199.5,371,196.1,382.2z M273.8,393.9L252.6,443l-21.1-49.2
+	l14.8-18.6l-2.2-40.6h-8.6l-13.1,12l-19.5-18l19.6-17.9l13,12h8l-11.4-213.5l21.4-75.3l21,75.4l-12.3,213.5h7.9l13.1-12l19.5,18
+	l-19.5,17.9l-13.1-12.1h-8.6l-2.3,40.7L273.8,393.9z M444.2,268.2c-5.9,11.3-12.5,21.9-20.7,30.9c-7.5,8.1-15.7,14.7-25.7,16.7
+	c-4.6,0.9-9.3,0.6-14,0.9c-0.7,0-1.9,0.5-1.9,1c-0.1,0.8,0.3,2,0.8,2.7c0.4,0.7,1.2,1.2,1.9,1.4c2.7,1,5.4,2.1,8.1,2.7
+	c13.4,2.7,26.7,2.8,40.2,1.9c0.6,0,1.3,0,1.9,0c0,0.3,0,0.5,0.4,0.7c-0.2,0.6-0.4,1.2-0.6,1.8c-7.7,19.3-20.6,29.8-37.6,32.7
+	c-6.1,1-12.2,1.1-18.3,1.7c-1.3,0.2-3.5,0.9-3.6,1.7c-0.3,1.7,0.3,3.9,1.1,5.4c1,1.9,2.4,3.4,3.9,4.7c2.4,2,4.8,4.2,7.4,5.5
+	c6.9,3.6,13.8,6.8,20.8,9.9c2.6,1.2,5.4,1.9,8.7,3c-2,1.7-3.6,3.2-5.3,4.4c-9,6.6-19,8.4-29.2,9c-11.5,0.7-21.3-3.9-29.7-13.2
+	c-2.9-3.1-5.6-6.4-8.5-9.5c-2.4-2.5-4.9-5.2-7.6-7.3c-8.5-6.6-18-5.3-25.3,3.2c-0.5,0.6-1,1.2-1.7,2c-3.4-11.1-6.7-22-10-32.9
+	c2.4-0.5,4.5-0.7,6.6-1.3c9.6-2.8,16.8-9,19.2-21.3c2.5-12.8,0.3-24-8.4-32.5c-2.7-2.7-5.7-5-8.4-7.7c-2.6-2.7-5.4-5.2-7.5-8.5
+	c-6.5-10.2-4.4-23.7,4.6-30.5c1.1-0.8,2.3-1.7,3.5-2.3c3.9-2.1,7.9-4.3,12-6.2c26.3-12,48-31.7,65-59.1c11.7-19,21-39.8,28.9-61.6
+	c0.2-0.7,0.5-1.5,0.8-2.2c0.4,1,0.4,1.9,0.4,2.8c-0.5,10.5-0.6,21-1.5,31.4c-2.5,28.9-8.7,56.1-24.3,78.9c-1,1.4-2.4,3.1-1.4,5
+	c1.1,2,3,1.1,4.4,0.4c3.9-2.1,7.9-4.2,11.6-6.8c11.2-8,21.3-17.7,31.1-28.1c0.6-0.5,1.1-1,1.9-1.8c0.4,8.6-0.5,16.5-2.6,24.1
+	c-4.1,14.7-11.9,26.1-22.1,35c-6.7,5.8-13.8,10.7-20.6,16.1c-1.2,1-2.1,2.6-3.1,3.9c1.4,1.1,2.7,2.2,4.1,3.2
+	c0.2,0.1,0.4,0.1,0.6,0.1c4.3,0,8.6,0.5,12.8,0c12.1-1.6,23.6-6.2,34.8-11.8c0.6-0.4,1.4-0.7,2.3-1.1
+	C444.3,267.8,444.3,268,444.2,268.2z"/>
+</svg>
diff --git a/src/svgs/fortification.svg b/src/svgs/General/UnitType/fortification.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/fortification.svg
rename to src/svgs/General/UnitType/fortification.svg
index 85789be..c58aad4
--- a/src/svgs/fortification.svg
+++ b/src/svgs/General/UnitType/fortification.svg
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#FFFFFF;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
-<path class="st0" d="M218,388c0-14.9,6.7-27,15-27"/>
-<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M414,364.3c-0.2,4.9-0.3,14-0.3,20.2v11.2
-	l-47.6,0.2c-26.2,0.1-55.3,0.3-64.6,0.4c-9.3,0.1-17.1,0.1-17.3,0c-0.1,0-3.9-0.1-10.2-0.2v-55.8l-15.7-22.7h-21.1l-15.7,22.7v55.5
-	c-27.7-0.1-30.1-0.1-30.5,0.3c-0.5,0.4-0.6,0.4-0.7-0.1l-0.2-0.5H136H81.6v-24.6v-24.6h9.5h9.4l2.6-1.5
-	c13.5-8.1,24.1-17.7,27.2-24.6c0.6-1.3,0.6-1.5,0.3-14.8c-0.5-24.1-0.9-39.9-1.2-57.2c-0.4-20-0.5-22.2-1.1-22.2
-	c-0.3,0-0.4-0.1-0.4-0.3c0-0.2-1.6-0.3-4.1-0.3c-2.3,0-4.1-0.1-4.1-0.2c0-0.1,0.4-1,0.9-2.1c0.8-1.5,0.9-2,0.6-2.5
-	c-0.4-0.7-2.6-1.7-5.4-2.3l-2-0.4v-2.8v-2.8h-5.5h-5.5v-12.9v-12.9h2.8h2.8l0.2-13.2c0.1-7.2,0.2-16.4,0.2-20.5v-7.4l6-0.2
-	c3.3-0.1,8.1-0.2,10.8-0.2h4.8v6.1c0,5.9,0,6.1,0.6,6.1c0.6,0,0.6-0.2,0.6-14.4v-14.5l-4.1-4.3c-2.7-2.8-4.3-4.3-4.7-4.3l-0.7-0.1
-	v-12.9c0-7.1,0.1-12.9,0.2-12.9c0.1,0,0.8,0.8,1.6,1.7l1.4,1.7h6.2h6.2v4.9v4.9l1.4,0.2c0.8,0.1,2.4,0.2,3.7,0.2h2.3v-5.1v-5.1
-	l3.3-0.2c1.8-0.1,6.3-0.1,9.9-0.1l6.6,0.1l0.1,5l0.1,5h3.1h3.1v-4.9v-4.9h7.9h8v9.8v9.8l1.4,0.1l1.4,0.1l-1.9,2
-	c-1.1,1.1-3.4,3.6-5.1,5.4l-3.2,3.4l0.1,14.7c0.1,12.1,0.2,14.7,0.5,14.7c0.6,0,0.8-1.7,0.8-7.1v-4.8h6.7c3.7,0,8.6-0.1,10.8-0.2
-	l4.1-0.2v3.3c0,1.8,0.1,4.5,0.2,6.1l0.2,2.8l5.7,0.1l5.7,0v-28.1v-28.1l-5.2-3.5c-2.9-2-5.5-3.6-5.8-3.7c-0.5-0.1-0.5-0.8-0.5-11h0
-	V71.9l1.2,0.5c1.1,0.5,1.7,0.5,10.6,0.5h9.4v3c0,1.7,0.1,3.8,0.2,4.7l0.2,1.7h5.1h5.1v-4.7v-4.7l12.5,0.1l12.5,0.1l0.2,3.9
-	c0.1,2.2,0.2,4.3,0.2,4.8l0,0.8h5h5.1l0.2-3.3c0.1-1.8,0.2-3.9,0.2-4.7v-1.5h3.6c2,0,6.7-0.1,10.3-0.2l6.7-0.2v8.8v8.8l1.8,0.1
-	l1.9,0.1l-1.9,1.2c-1,0.7-1.8,1.4-1.8,1.6c0,0.2-0.2,0.4-0.5,0.4c-0.3,0-3,1.7-5.9,3.7l-5.4,3.7v27.7v27.7h4.3
-	c2.3,0,4.8-0.1,5.6-0.2l1.4-0.2l0.1-5.9l0.1-5.9l11-0.1l11-0.1v6.1c0,5.9,0,6.1,0.6,6.1c0.6,0,0.6-0.2,0.6-14.6v-14.6l-4-4.2
-	c-2.2-2.3-4.2-4.2-4.4-4.2c-0.4,0-0.4-1.6-0.4-11V96.8l1-0.4c0.8-0.4,1.8-0.4,7.7-0.4l6.8,0.1l0.1,5l0.1,5h1.3
-	c0.7,0,2.3,0.1,3.5,0.2l2.3,0.2v-3.7c0-2,0.1-4.4,0.2-5.3l0.2-1.5h9.8h9.9v1.8c0,1,0.1,3.3,0.2,5.1l0.2,3.3h3.1h3V101v-5.1l7.9,0.1
-	l7.9,0.1l0.1,9.6l0.1,9.6l1.1,0.1l1.1,0.1l-1.1,1.1c-0.6,0.6-1.1,1.4-1.1,1.7c0,0.4-0.2,0.6-0.6,0.6c-0.4,0-1.8,1.3-4.1,3.7
-	l-3.5,3.8l0,14.9v14.9h0.9h0.9l-0.2-5.8l-0.2-5.8l7.6,0.1c4.2,0.1,9.5,0.2,11.8,0.3l4.2,0.2v12c0,7.8,0.1,12,0.3,12
-	c0.2,0,0.3,3.1,0.3,8.8v8.8h2.1h2.1l-0.1,12.9l-0.1,12.9l-5.2,0.1l-5.2,0.1l-0.1,2.6l-0.1,2.6l-1.6,0.5c-3.6,1.1-4.8,1.6-5,2
-	c-0.4,0.7-0.4,2.3,0.2,3.7c0.3,0.7,0.5,1.3,0.5,1.4c0,0.1-2.3,0.2-5,0.2h-5v3.8c0,2.1,0.1,9.5,0.3,16.6c0.3,12.8,0.6,26.5,1.2,57.3
-	l0.3,16.2l1.8,2.5c6.1,8.7,14.1,16.5,23.5,22.8l2.5,1.7h9.6h9.5v4.3c0,2.7,0.1,4.4,0.3,4.5C414.2,355.2,414.2,358,414,364.3z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
+<path class="st0" d="M218,388c0-14.9,6.7-27,15-27"/>
+<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M414,364.3c-0.2,4.9-0.3,14-0.3,20.2v11.2
+	l-47.6,0.2c-26.2,0.1-55.3,0.3-64.6,0.4c-9.3,0.1-17.1,0.1-17.3,0c-0.1,0-3.9-0.1-10.2-0.2v-55.8l-15.7-22.7h-21.1l-15.7,22.7v55.5
+	c-27.7-0.1-30.1-0.1-30.5,0.3c-0.5,0.4-0.6,0.4-0.7-0.1l-0.2-0.5H136H81.6v-24.6v-24.6h9.5h9.4l2.6-1.5
+	c13.5-8.1,24.1-17.7,27.2-24.6c0.6-1.3,0.6-1.5,0.3-14.8c-0.5-24.1-0.9-39.9-1.2-57.2c-0.4-20-0.5-22.2-1.1-22.2
+	c-0.3,0-0.4-0.1-0.4-0.3c0-0.2-1.6-0.3-4.1-0.3c-2.3,0-4.1-0.1-4.1-0.2c0-0.1,0.4-1,0.9-2.1c0.8-1.5,0.9-2,0.6-2.5
+	c-0.4-0.7-2.6-1.7-5.4-2.3l-2-0.4v-2.8v-2.8h-5.5h-5.5v-12.9v-12.9h2.8h2.8l0.2-13.2c0.1-7.2,0.2-16.4,0.2-20.5v-7.4l6-0.2
+	c3.3-0.1,8.1-0.2,10.8-0.2h4.8v6.1c0,5.9,0,6.1,0.6,6.1c0.6,0,0.6-0.2,0.6-14.4v-14.5l-4.1-4.3c-2.7-2.8-4.3-4.3-4.7-4.3l-0.7-0.1
+	v-12.9c0-7.1,0.1-12.9,0.2-12.9c0.1,0,0.8,0.8,1.6,1.7l1.4,1.7h6.2h6.2v4.9v4.9l1.4,0.2c0.8,0.1,2.4,0.2,3.7,0.2h2.3v-5.1v-5.1
+	l3.3-0.2c1.8-0.1,6.3-0.1,9.9-0.1l6.6,0.1l0.1,5l0.1,5h3.1h3.1v-4.9v-4.9h7.9h8v9.8v9.8l1.4,0.1l1.4,0.1l-1.9,2
+	c-1.1,1.1-3.4,3.6-5.1,5.4l-3.2,3.4l0.1,14.7c0.1,12.1,0.2,14.7,0.5,14.7c0.6,0,0.8-1.7,0.8-7.1v-4.8h6.7c3.7,0,8.6-0.1,10.8-0.2
+	l4.1-0.2v3.3c0,1.8,0.1,4.5,0.2,6.1l0.2,2.8l5.7,0.1l5.7,0v-28.1v-28.1l-5.2-3.5c-2.9-2-5.5-3.6-5.8-3.7c-0.5-0.1-0.5-0.8-0.5-11h0
+	V71.9l1.2,0.5c1.1,0.5,1.7,0.5,10.6,0.5h9.4v3c0,1.7,0.1,3.8,0.2,4.7l0.2,1.7h5.1h5.1v-4.7v-4.7l12.5,0.1l12.5,0.1l0.2,3.9
+	c0.1,2.2,0.2,4.3,0.2,4.8l0,0.8h5h5.1l0.2-3.3c0.1-1.8,0.2-3.9,0.2-4.7v-1.5h3.6c2,0,6.7-0.1,10.3-0.2l6.7-0.2v8.8v8.8l1.8,0.1
+	l1.9,0.1l-1.9,1.2c-1,0.7-1.8,1.4-1.8,1.6c0,0.2-0.2,0.4-0.5,0.4c-0.3,0-3,1.7-5.9,3.7l-5.4,3.7v27.7v27.7h4.3
+	c2.3,0,4.8-0.1,5.6-0.2l1.4-0.2l0.1-5.9l0.1-5.9l11-0.1l11-0.1v6.1c0,5.9,0,6.1,0.6,6.1c0.6,0,0.6-0.2,0.6-14.6v-14.6l-4-4.2
+	c-2.2-2.3-4.2-4.2-4.4-4.2c-0.4,0-0.4-1.6-0.4-11V96.8l1-0.4c0.8-0.4,1.8-0.4,7.7-0.4l6.8,0.1l0.1,5l0.1,5h1.3
+	c0.7,0,2.3,0.1,3.5,0.2l2.3,0.2v-3.7c0-2,0.1-4.4,0.2-5.3l0.2-1.5h9.8h9.9v1.8c0,1,0.1,3.3,0.2,5.1l0.2,3.3h3.1h3V101v-5.1l7.9,0.1
+	l7.9,0.1l0.1,9.6l0.1,9.6l1.1,0.1l1.1,0.1l-1.1,1.1c-0.6,0.6-1.1,1.4-1.1,1.7c0,0.4-0.2,0.6-0.6,0.6c-0.4,0-1.8,1.3-4.1,3.7
+	l-3.5,3.8l0,14.9v14.9h0.9h0.9l-0.2-5.8l-0.2-5.8l7.6,0.1c4.2,0.1,9.5,0.2,11.8,0.3l4.2,0.2v12c0,7.8,0.1,12,0.3,12
+	c0.2,0,0.3,3.1,0.3,8.8v8.8h2.1h2.1l-0.1,12.9l-0.1,12.9l-5.2,0.1l-5.2,0.1l-0.1,2.6l-0.1,2.6l-1.6,0.5c-3.6,1.1-4.8,1.6-5,2
+	c-0.4,0.7-0.4,2.3,0.2,3.7c0.3,0.7,0.5,1.3,0.5,1.4c0,0.1-2.3,0.2-5,0.2h-5v3.8c0,2.1,0.1,9.5,0.3,16.6c0.3,12.8,0.6,26.5,1.2,57.3
+	l0.3,16.2l1.8,2.5c6.1,8.7,14.1,16.5,23.5,22.8l2.5,1.7h9.6h9.5v4.3c0,2.7,0.1,4.4,0.3,4.5C414.2,355.2,414.2,358,414,364.3z"/>
+</svg>
diff --git a/src/svgs/heavy-support.svg b/src/svgs/General/UnitType/heavy-support.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/heavy-support.svg
rename to src/svgs/General/UnitType/heavy-support.svg
index 6d86cb1..9fbc9a1
--- a/src/svgs/heavy-support.svg
+++ b/src/svgs/General/UnitType/heavy-support.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#FFFFFF;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
-<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M398.9,306.8l-38,43.9l26.7,4.9l-67,24.3l0.3-0.4
-	l-0.3,0.1v0.3H196.1h-16.8h-9.9L98.1,267.8l59.8,41.4l-44.4-117.8l61.4,64.2L165.3,119l71.9,109.7l4-64.2l21,56.9L297,87.3v151.2
-	l32.3-43.9l-4.8,56.1l81.4-85.2l-58.8,163.3L398.9,306.8z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
+<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M398.9,306.8l-38,43.9l26.7,4.9l-67,24.3l0.3-0.4
+	l-0.3,0.1v0.3H196.1h-16.8h-9.9L98.1,267.8l59.8,41.4l-44.4-117.8l61.4,64.2L165.3,119l71.9,109.7l4-64.2l21,56.9L297,87.3v151.2
+	l32.3-43.9l-4.8,56.1l81.4-85.2l-58.8,163.3L398.9,306.8z"/>
+</svg>
diff --git a/src/svgs/lord-of-war.svg b/src/svgs/General/UnitType/lord-of-war.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/lord-of-war.svg
rename to src/svgs/General/UnitType/lord-of-war.svg
index 72a2fb0..2783754
--- a/src/svgs/lord-of-war.svg
+++ b/src/svgs/General/UnitType/lord-of-war.svg
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#FFFFFF;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
-<line class="st0" x1="189" y1="342.2" x2="189" y2="342.2"/>
-<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M359.2,130.9l11-15.3c1.8-2.5,5.8-0.9,5.5,2.2
-	l-2,18.7c-0.2,2-2.3,3.3-4.1,2.5l-9-3.4C358.7,134.9,358,132.6,359.2,130.9z M291.8,106.6l7.5-18.8c1.2-2.9,5.4-2.4,5.9,0.7l3.2,20
-	c0.3,2-1.4,3.8-3.4,3.5l-10.7-1.2C292.3,110.6,291,108.5,291.8,106.6z M261.6,167.8c0-0.1,0-0.3,0-0.4c0.1-0.8,0.1-1.6,0.1-2.4
-	c0-0.3,0-0.6,0-0.9c0-2-0.1-3.7-0.1-5.3c0-0.6,0-1.2,0-1.8c1.1-9.5,1.6-17.4,2.8-25.1c1.6-10,7.5-15.7,17.4-17.4
-	c9.8-1.7,19.5-0.7,28.9,3c6.9,2.6,10.7,7.6,10.1,15c-0.9,10.4-2.1,20.6-4.2,30.8c-1.7,8.7-4.8,17.1-7.2,25.7
-	c-0.1,0.3-0.2,0.6-0.3,0.9c0,0.1,0,0.2-0.1,0.3c-0.1,0.2-0.1,0.4-0.2,0.6c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4
-	c-0.1,0.1-0.1,0.2-0.2,0.3c-0.1,0.1-0.1,0.3-0.2,0.4c-0.1,0.1-0.1,0.2-0.2,0.3c0,0.1-0.1,0.2-0.2,0.3c-0.1,0.2-0.1,0.2-0.2,0.3
-	c0,0.1-0.1,0.2-0.2,0.3c-0.1,0.1-0.1,0.1-0.2,0.2c-0.1,0.1-0.2,0.1-0.3,0.2c0,0-0.1,0-0.2,0.1c-0.1,0.1-0.2,0.1-0.3,0.2
-	c0,0-0.1,0-0.2,0.1c-0.2,0-0.3,0-0.4,0.1c0,0-0.1,0.1-0.2,0.1c-0.2,0-0.3,0.1-0.4,0.1c0,0.1-0.1,0.1-0.2,0.1c-0.1,0-0.3,0-0.4,0
-	c0,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.6-0.1c-0.1,0-0.1,0-0.2,0c-0.2-0.1-0.5-0.1-0.8-0.2c0,0-0.1-0.1-0.2-0.1c-0.2-0.1-0.4-0.1-0.6-0.2
-	c-0.2,0-0.3,0-0.4-0.1c-0.2-0.1-0.3-0.1-0.5-0.2c-11.4-5.3-22.7-10.5-34.2-15.6c-3.9-1.7-5.4-4.3-5.3-8.8
-	C261.5,168.8,261.6,168.3,261.6,167.8z M219.3,92.5l4.8-17.1c0.8-3,5-3,5.9,0l4.8,17.1c0.5,2-0.9,3.9-3,3.9h-9.5
-	C220.3,96.4,218.8,94.5,219.3,92.5z M228.2,98.9c16.4,0,21.8,4.8,25.1,21.1c3.1,15.2,2.2,30.4-0.2,45.5c-0.7,4.6-2.6,6.4-7.3,4.3
-	c-12.1-5.3-24.3-10.5-36.2-16c-2-0.9-4.2-3.6-4.5-5.8c-1.3-7.7-1.8-15.6-2.2-20.1C202.8,103.4,207.2,98.9,228.2,98.9z M147.7,83.4
-	l10,15.6c1.1,1.7,0.2,4-1.7,4.6l-9.6,2.9c-1.9,0.6-3.9-0.8-3.9-2.9l-0.3-18.5C142,82,146.1,80.7,147.7,83.4z M140.1,112
-	c8-3.4,16.4-6,24.8-8.1c7-1.8,12.3,1.6,15.2,8c6.5,14,9.8,28.8,10.9,44.1c0.2,1.9-1.6,4.4-3.2,5.7c-12.1,10.2-24.3,20.2-36.6,30
-	c-4.8,3.9-7.4,3.2-9.6-2.2c-7.3-17.6-12.1-36-13.4-57.3C127,124,130.6,116,140.1,112z M141,261.6c-4-10.4-7.8-21-10.8-31.7
-	c-0.7-2.4,1-6.9,3.1-8.6c22.1-19,44.3-37.6,66.7-56.1c1.7-1.5,5.4-2.1,7.5-1.2c27,11.5,54,23.3,81,35c4.4,1.8,8.8,3.7,12.9,6.2
-	c1.4,0.8,3.1,4.1,2.5,5.2c-3.5,7.2-7.1,14.3-11.5,20.9c-3.9,5.8-10.2,8.7-17,7.8c-14.8-1.9-29.6-4.5-44.4-6.9
-	c-2-0.4-3.9-0.9-6.3-1.5c-2.1,7.1-3.9,13.8-6,20.4c-6.8,21-14.6,27.2-36.4,28.4c-6.7,0.3-13.4-0.3-20-1.3
-	C152.5,276.7,144.7,271.3,141,261.6z M245.2,429.7l-88-38.6l18-51.8h151.1l16.5,47.5L245.2,429.7z M352,258.1
-	c-7.3,23.9-14.7,47.7-21.7,71.7c-1.3,4.5-3.8,4.4-7,4.4c-23.7,0-47.3,0-71,0c0,0.1,0,0.1,0,0.2c-23.9,0-47.8,0.1-71.6-0.2
-	c-2.3,0-5.1-1.7-6.3-3.7c-7-12.1-13.7-24.3-20.4-36.6c-2.6-4.7-0.6-7.8,4.9-7.5c5.9,0.3,11.6,1.3,17.5,1.6
-	c5.1,0.2,10.4,0.2,15.6-0.4c18.7-1.9,31.1-11.2,34.6-30.8c0.6-3.6,2-7,2.6-10.5c1.1-5.6,4-6.5,9.1-5.3c12,2.8,24,5.3,36.1,7.3
-	c12.2,1.9,21.3-3.6,28.6-13.4c8.3-11.1,8.7-11,15.7,0.4c2.9,4.8,6.9,7.8,12.4,8.5c4,0.5,7.9,1.3,11.9,1.6
-	C355.7,246,355.7,245.9,352,258.1z M377.5,177.2c-7,18.4-16.4,35.9-25.3,53.5c-1.4,2.8-6.3,4.9-9.8,5.2c-14.4,1-23.6-5.3-24.1-16
-	c-0.3-5.1-0.1-10.2-0.1-15.3c-0.6-19.3,4.4-37.4,11.8-54.6c5.7-13.6,17.1-17.6,31.3-11.7C376.2,144.5,383.2,161.9,377.5,177.2z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
+<line class="st0" x1="189" y1="342.2" x2="189" y2="342.2"/>
+<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M359.2,130.9l11-15.3c1.8-2.5,5.8-0.9,5.5,2.2
+	l-2,18.7c-0.2,2-2.3,3.3-4.1,2.5l-9-3.4C358.7,134.9,358,132.6,359.2,130.9z M291.8,106.6l7.5-18.8c1.2-2.9,5.4-2.4,5.9,0.7l3.2,20
+	c0.3,2-1.4,3.8-3.4,3.5l-10.7-1.2C292.3,110.6,291,108.5,291.8,106.6z M261.6,167.8c0-0.1,0-0.3,0-0.4c0.1-0.8,0.1-1.6,0.1-2.4
+	c0-0.3,0-0.6,0-0.9c0-2-0.1-3.7-0.1-5.3c0-0.6,0-1.2,0-1.8c1.1-9.5,1.6-17.4,2.8-25.1c1.6-10,7.5-15.7,17.4-17.4
+	c9.8-1.7,19.5-0.7,28.9,3c6.9,2.6,10.7,7.6,10.1,15c-0.9,10.4-2.1,20.6-4.2,30.8c-1.7,8.7-4.8,17.1-7.2,25.7
+	c-0.1,0.3-0.2,0.6-0.3,0.9c0,0.1,0,0.2-0.1,0.3c-0.1,0.2-0.1,0.4-0.2,0.6c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4
+	c-0.1,0.1-0.1,0.2-0.2,0.3c-0.1,0.1-0.1,0.3-0.2,0.4c-0.1,0.1-0.1,0.2-0.2,0.3c0,0.1-0.1,0.2-0.2,0.3c-0.1,0.2-0.1,0.2-0.2,0.3
+	c0,0.1-0.1,0.2-0.2,0.3c-0.1,0.1-0.1,0.1-0.2,0.2c-0.1,0.1-0.2,0.1-0.3,0.2c0,0-0.1,0-0.2,0.1c-0.1,0.1-0.2,0.1-0.3,0.2
+	c0,0-0.1,0-0.2,0.1c-0.2,0-0.3,0-0.4,0.1c0,0-0.1,0.1-0.2,0.1c-0.2,0-0.3,0.1-0.4,0.1c0,0.1-0.1,0.1-0.2,0.1c-0.1,0-0.3,0-0.4,0
+	c0,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.6-0.1c-0.1,0-0.1,0-0.2,0c-0.2-0.1-0.5-0.1-0.8-0.2c0,0-0.1-0.1-0.2-0.1c-0.2-0.1-0.4-0.1-0.6-0.2
+	c-0.2,0-0.3,0-0.4-0.1c-0.2-0.1-0.3-0.1-0.5-0.2c-11.4-5.3-22.7-10.5-34.2-15.6c-3.9-1.7-5.4-4.3-5.3-8.8
+	C261.5,168.8,261.6,168.3,261.6,167.8z M219.3,92.5l4.8-17.1c0.8-3,5-3,5.9,0l4.8,17.1c0.5,2-0.9,3.9-3,3.9h-9.5
+	C220.3,96.4,218.8,94.5,219.3,92.5z M228.2,98.9c16.4,0,21.8,4.8,25.1,21.1c3.1,15.2,2.2,30.4-0.2,45.5c-0.7,4.6-2.6,6.4-7.3,4.3
+	c-12.1-5.3-24.3-10.5-36.2-16c-2-0.9-4.2-3.6-4.5-5.8c-1.3-7.7-1.8-15.6-2.2-20.1C202.8,103.4,207.2,98.9,228.2,98.9z M147.7,83.4
+	l10,15.6c1.1,1.7,0.2,4-1.7,4.6l-9.6,2.9c-1.9,0.6-3.9-0.8-3.9-2.9l-0.3-18.5C142,82,146.1,80.7,147.7,83.4z M140.1,112
+	c8-3.4,16.4-6,24.8-8.1c7-1.8,12.3,1.6,15.2,8c6.5,14,9.8,28.8,10.9,44.1c0.2,1.9-1.6,4.4-3.2,5.7c-12.1,10.2-24.3,20.2-36.6,30
+	c-4.8,3.9-7.4,3.2-9.6-2.2c-7.3-17.6-12.1-36-13.4-57.3C127,124,130.6,116,140.1,112z M141,261.6c-4-10.4-7.8-21-10.8-31.7
+	c-0.7-2.4,1-6.9,3.1-8.6c22.1-19,44.3-37.6,66.7-56.1c1.7-1.5,5.4-2.1,7.5-1.2c27,11.5,54,23.3,81,35c4.4,1.8,8.8,3.7,12.9,6.2
+	c1.4,0.8,3.1,4.1,2.5,5.2c-3.5,7.2-7.1,14.3-11.5,20.9c-3.9,5.8-10.2,8.7-17,7.8c-14.8-1.9-29.6-4.5-44.4-6.9
+	c-2-0.4-3.9-0.9-6.3-1.5c-2.1,7.1-3.9,13.8-6,20.4c-6.8,21-14.6,27.2-36.4,28.4c-6.7,0.3-13.4-0.3-20-1.3
+	C152.5,276.7,144.7,271.3,141,261.6z M245.2,429.7l-88-38.6l18-51.8h151.1l16.5,47.5L245.2,429.7z M352,258.1
+	c-7.3,23.9-14.7,47.7-21.7,71.7c-1.3,4.5-3.8,4.4-7,4.4c-23.7,0-47.3,0-71,0c0,0.1,0,0.1,0,0.2c-23.9,0-47.8,0.1-71.6-0.2
+	c-2.3,0-5.1-1.7-6.3-3.7c-7-12.1-13.7-24.3-20.4-36.6c-2.6-4.7-0.6-7.8,4.9-7.5c5.9,0.3,11.6,1.3,17.5,1.6
+	c5.1,0.2,10.4,0.2,15.6-0.4c18.7-1.9,31.1-11.2,34.6-30.8c0.6-3.6,2-7,2.6-10.5c1.1-5.6,4-6.5,9.1-5.3c12,2.8,24,5.3,36.1,7.3
+	c12.2,1.9,21.3-3.6,28.6-13.4c8.3-11.1,8.7-11,15.7,0.4c2.9,4.8,6.9,7.8,12.4,8.5c4,0.5,7.9,1.3,11.9,1.6
+	C355.7,246,355.7,245.9,352,258.1z M377.5,177.2c-7,18.4-16.4,35.9-25.3,53.5c-1.4,2.8-6.3,4.9-9.8,5.2c-14.4,1-23.6-5.3-24.1-16
+	c-0.3-5.1-0.1-10.2-0.1-15.3c-0.6-19.3,4.4-37.4,11.8-54.6c5.7-13.6,17.1-17.6,31.3-11.7C376.2,144.5,383.2,161.9,377.5,177.2z"/>
+</svg>
diff --git a/src/svgs/troops.svg b/src/svgs/General/UnitType/troops.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/troops.svg
rename to src/svgs/General/UnitType/troops.svg
index fb08f5a..7c45962
--- a/src/svgs/troops.svg
+++ b/src/svgs/General/UnitType/troops.svg
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#FFFFFF;}
-</style>
-<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
-<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
-<g>
-	<polygon points="322.9,249.9 216.7,189.6 217.6,311.7 	"/>
-	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M156.7,415.2l0.9-330L443,250.9L156.7,415.2z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="605,250 252.5,604 -100,250 252.5,-104 "/>
+<path class="st1" d="M696.4,79c0,0.5,0.4,1,1,1s1-0.4,1-1c0-0.5-0.4-1-1-1C696.8,78,696.4,78.4,696.4,79z"/>
+<g>
+	<polygon points="322.9,249.9 216.7,189.6 217.6,311.7 	"/>
+	<path d="M353.5,0H146.5L0,146.5v207.1L146.5,500h207.1L500,353.5V146.5L353.5,0z M156.7,415.2l0.9-330L443,250.9L156.7,415.2z"/>
+</g>
+</svg>
diff --git a/src/svgs/bloodmaws.svg b/src/svgs/Imperium/SpaceWolves/bloodmaws.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/bloodmaws.svg
rename to src/svgs/Imperium/SpaceWolves/bloodmaws.svg
index d13b6c0..03a5f16
--- a/src/svgs/bloodmaws.svg
+++ b/src/svgs/Imperium/SpaceWolves/bloodmaws.svg
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="图层_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
-	 xml:space="preserve">
-<g>
-	<polygon points="291,217.9 321.7,168.9 273.1,204.1 	"/>
-	<polygon points="209,217.9 226.9,204.1 178.3,168.9 	"/>
-	<path d="M454.9,231.1c-29-9.6-56.5-23.9-76.9-54.1c4.2-1.8,14.9-3,30.7-3.8c-8.6-3.8-16.8-9.3-24.3-16.3
-		c60.4-29.7,83.7-66.8,73-110.7L320.4,94.1c-7.8-11.8-14.3-22.8-16.7-31.4c-2,7.7-7,13.5-12.8,18.9c-5.7-6-8.8-15.8-10.2-27.7
-		c-0.7,5.3-2.3,12.2-9,20.1c-8.4-8-15.5-19.8-21.8-34c-6.3,14.1-13.4,26-21.8,34c-6.7-8-8.2-14.8-9-20.1
-		c-1.5,11.9-4.5,21.6-10.2,27.7c-5.8-5.3-10.8-11.2-12.8-18.9c-2.3,8.6-8.8,19.6-16.7,31.4L42.5,46.3c-10.7,43.8,12.6,80.9,73,110.7
-		c-7.6,7-15.7,12.5-24.3,16.3c15.8,0.8,26.5,2,30.7,3.8c-20.3,30.2-47.8,44.5-76.9,54.1c19.7,2.5,37.2,5.3,46.1,8.8
-		c1,8.8-9.3,17.6-21.8,26.4c9.5,0.3,17,1.1,30.7-3.8c8.1-4.2,12.2-5.1,16.7-7.5c-1.2,8.5-4.9,17.3-10.2,26.4
-		c14.1-3.4,26.6-5.9,33.3-5c-1.6,4.9-4.2,9.9-7.7,15.1c5.3-3.7,10.4-8,16.7-8.8c4.5,0.3,6.6,0.8,7.7,1.3
-		c-1.4,7.6-6.4,15.1-12.8,22.6h29.5h1.3c9,10.7,18.7,20.3,26.9,25.1c-0.9,18.9,0.1,36.6,2.6,52.8c2.7,9.8,5.8,15.3,9,18.9
-		c7.8,6.2,8.7,5.2,11.5,6.3c5.8-14.7,12.1-28.4,25.6-28.9c13.5,0.5,19.8,14.2,25.6,28.9c2.8-1,3.7-0.1,11.5-6.3
-		c3.2-3.5,6.2-9,9-18.9c2.4-16.2,3.4-33.9,2.6-52.8c8.2-4.9,17.9-14.4,26.9-25.1h1.3h29.5c-6.4-7.5-11.4-15.1-12.8-22.6
-		c1.1-0.4,3.2-1,7.7-1.3c6.3,0.8,11.4,5.1,16.7,8.8c-3.5-5.2-6.1-10.2-7.7-15.1c6.8-0.8,19.2,1.6,33.3,5
-		c-5.4-9.1-9.1-17.9-10.2-26.4c4.8,2.5,9,4.8,16.7,8.8c14.1,5.5,21.2,2.6,30.7,2.5c-12.5-8.8-22.8-17.6-21.8-26.4
-		C417.8,236.4,435.2,233.7,454.9,231.1z M422,264c-9,0-14-1.2-27.3-6.5c-7.2-3.8-11.2-6.1-15.7-8.5c1.1,8,1.9,17.4,7,26
-		c-13.3-3.2-25.7-5.2-32.1-4.4c1.5,4.6,3.9,9.3,7.3,14.2c-5-3.5-9.8-7.5-15.7-8.3c-4.2,0.3-6.2,0.8-7.3,1.2
-		c1.3,7.1,4.1,15.3,13,26.4l-25.8-1c-36.7-22.9-61.3-53.4-75.4-90.6c-12.7,40.7-37.2,69.5-75,90.6l-27,2c6-7.1,12.4-20.2,13.8-27.3
-		c-1-0.4-3-0.9-7.3-1.2c-5.9,0.8-10.7,4.8-15.7,8.3c3.3-4.9,5.8-9.7,7.3-14.2c-6.4-0.8-18.1,1.5-31.4,4.7c5.1-8.6,6.1-17.3,7.3-25.3
-		c-4.5,2.4-6.4,2.5-12.8,5c-13.3,5.2-23,8.9-32,8.8c11.8-8.3,24.1-19.4,23.1-27.7c-8.4-3.3-27.5-3.9-46.1-6.3
-		c27.4-9,52.6-25.6,71.7-54.1c-4-1.7-13.3-3.1-28.2-3.8c8.2-3.6,18.4-7.5,25.5-14.2c-57-28-88.1-66.4-78.1-107.8l135.8,47.8
-		c7.4-11.1,13.2-23.3,15.4-31.4c1.9,7.2,8.6,13.8,14.1,18.9c5.4-5.7,7.6-14,9-25.1c0.7,5,2.7,10.1,9,17.6
-		C236.1,70.2,244,58.4,250,45c6,13.3,13.9,25.2,21.8,32.7c6.3-7.5,8.3-13.8,9-18.9c1.4,11.2,4.8,19.4,10.2,25.1
-		c5.5-5,10.9-9.1,12.8-16.3c2.2,8.1,8,17.8,15.4,28.9l135.8-45.3c10.1,41.4-18.6,77.6-75.6,105.6c7.2,6.6,16.2,11.5,24.3,15.1
-		c-14.9,0.7-25.5,2.1-29.5,3.8c19.2,28.5,44.3,45.1,71.7,54.1c-18.6,2.4-37.7,3-46.1,6.3C398.9,244.5,410.2,255.7,422,264z"/>
-	<path d="M152.3,372c-22,12.2-32.2,22.8-34.6,26.4c-10.8,15.6,3.7,17.7,21.9,13.7c17.9-7.4,26.1-36.2,29.5-59.8
-		C164.8,360.8,159.1,368.2,152.3,372z"/>
-	<path d="M347.7,372c-6.7-3.7-12.5-11.1-16.8-19.8c3.5,23.6,11.6,52.5,29.5,59.8c18.2,4,32.7,2,21.9-13.7
-		C379.8,394.7,369.7,384.2,347.7,372z"/>
-	<path d="M213.8,433.5c-14,7.7-20.5,14.4-22.1,16.7c-6.9,9.9,2.3,11.2,14,8.7c11.4-4.7,16.6-22.9,18.9-37.9
-		C221.8,426.5,218.1,431.1,213.8,433.5z"/>
-	<path d="M288.3,433.5c-4.3-2.4-8-7-10.7-12.5c2.2,15,7.4,33.2,18.9,37.9c11.6,2.5,20.9,1.2,14-8.7
-		C308.8,447.9,302.3,441.2,288.3,433.5z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="图层_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
+	 xml:space="preserve">
+<g>
+	<polygon points="291,217.9 321.7,168.9 273.1,204.1 	"/>
+	<polygon points="209,217.9 226.9,204.1 178.3,168.9 	"/>
+	<path d="M454.9,231.1c-29-9.6-56.5-23.9-76.9-54.1c4.2-1.8,14.9-3,30.7-3.8c-8.6-3.8-16.8-9.3-24.3-16.3
+		c60.4-29.7,83.7-66.8,73-110.7L320.4,94.1c-7.8-11.8-14.3-22.8-16.7-31.4c-2,7.7-7,13.5-12.8,18.9c-5.7-6-8.8-15.8-10.2-27.7
+		c-0.7,5.3-2.3,12.2-9,20.1c-8.4-8-15.5-19.8-21.8-34c-6.3,14.1-13.4,26-21.8,34c-6.7-8-8.2-14.8-9-20.1
+		c-1.5,11.9-4.5,21.6-10.2,27.7c-5.8-5.3-10.8-11.2-12.8-18.9c-2.3,8.6-8.8,19.6-16.7,31.4L42.5,46.3c-10.7,43.8,12.6,80.9,73,110.7
+		c-7.6,7-15.7,12.5-24.3,16.3c15.8,0.8,26.5,2,30.7,3.8c-20.3,30.2-47.8,44.5-76.9,54.1c19.7,2.5,37.2,5.3,46.1,8.8
+		c1,8.8-9.3,17.6-21.8,26.4c9.5,0.3,17,1.1,30.7-3.8c8.1-4.2,12.2-5.1,16.7-7.5c-1.2,8.5-4.9,17.3-10.2,26.4
+		c14.1-3.4,26.6-5.9,33.3-5c-1.6,4.9-4.2,9.9-7.7,15.1c5.3-3.7,10.4-8,16.7-8.8c4.5,0.3,6.6,0.8,7.7,1.3
+		c-1.4,7.6-6.4,15.1-12.8,22.6h29.5h1.3c9,10.7,18.7,20.3,26.9,25.1c-0.9,18.9,0.1,36.6,2.6,52.8c2.7,9.8,5.8,15.3,9,18.9
+		c7.8,6.2,8.7,5.2,11.5,6.3c5.8-14.7,12.1-28.4,25.6-28.9c13.5,0.5,19.8,14.2,25.6,28.9c2.8-1,3.7-0.1,11.5-6.3
+		c3.2-3.5,6.2-9,9-18.9c2.4-16.2,3.4-33.9,2.6-52.8c8.2-4.9,17.9-14.4,26.9-25.1h1.3h29.5c-6.4-7.5-11.4-15.1-12.8-22.6
+		c1.1-0.4,3.2-1,7.7-1.3c6.3,0.8,11.4,5.1,16.7,8.8c-3.5-5.2-6.1-10.2-7.7-15.1c6.8-0.8,19.2,1.6,33.3,5
+		c-5.4-9.1-9.1-17.9-10.2-26.4c4.8,2.5,9,4.8,16.7,8.8c14.1,5.5,21.2,2.6,30.7,2.5c-12.5-8.8-22.8-17.6-21.8-26.4
+		C417.8,236.4,435.2,233.7,454.9,231.1z M422,264c-9,0-14-1.2-27.3-6.5c-7.2-3.8-11.2-6.1-15.7-8.5c1.1,8,1.9,17.4,7,26
+		c-13.3-3.2-25.7-5.2-32.1-4.4c1.5,4.6,3.9,9.3,7.3,14.2c-5-3.5-9.8-7.5-15.7-8.3c-4.2,0.3-6.2,0.8-7.3,1.2
+		c1.3,7.1,4.1,15.3,13,26.4l-25.8-1c-36.7-22.9-61.3-53.4-75.4-90.6c-12.7,40.7-37.2,69.5-75,90.6l-27,2c6-7.1,12.4-20.2,13.8-27.3
+		c-1-0.4-3-0.9-7.3-1.2c-5.9,0.8-10.7,4.8-15.7,8.3c3.3-4.9,5.8-9.7,7.3-14.2c-6.4-0.8-18.1,1.5-31.4,4.7c5.1-8.6,6.1-17.3,7.3-25.3
+		c-4.5,2.4-6.4,2.5-12.8,5c-13.3,5.2-23,8.9-32,8.8c11.8-8.3,24.1-19.4,23.1-27.7c-8.4-3.3-27.5-3.9-46.1-6.3
+		c27.4-9,52.6-25.6,71.7-54.1c-4-1.7-13.3-3.1-28.2-3.8c8.2-3.6,18.4-7.5,25.5-14.2c-57-28-88.1-66.4-78.1-107.8l135.8,47.8
+		c7.4-11.1,13.2-23.3,15.4-31.4c1.9,7.2,8.6,13.8,14.1,18.9c5.4-5.7,7.6-14,9-25.1c0.7,5,2.7,10.1,9,17.6
+		C236.1,70.2,244,58.4,250,45c6,13.3,13.9,25.2,21.8,32.7c6.3-7.5,8.3-13.8,9-18.9c1.4,11.2,4.8,19.4,10.2,25.1
+		c5.5-5,10.9-9.1,12.8-16.3c2.2,8.1,8,17.8,15.4,28.9l135.8-45.3c10.1,41.4-18.6,77.6-75.6,105.6c7.2,6.6,16.2,11.5,24.3,15.1
+		c-14.9,0.7-25.5,2.1-29.5,3.8c19.2,28.5,44.3,45.1,71.7,54.1c-18.6,2.4-37.7,3-46.1,6.3C398.9,244.5,410.2,255.7,422,264z"/>
+	<path d="M152.3,372c-22,12.2-32.2,22.8-34.6,26.4c-10.8,15.6,3.7,17.7,21.9,13.7c17.9-7.4,26.1-36.2,29.5-59.8
+		C164.8,360.8,159.1,368.2,152.3,372z"/>
+	<path d="M347.7,372c-6.7-3.7-12.5-11.1-16.8-19.8c3.5,23.6,11.6,52.5,29.5,59.8c18.2,4,32.7,2,21.9-13.7
+		C379.8,394.7,369.7,384.2,347.7,372z"/>
+	<path d="M213.8,433.5c-14,7.7-20.5,14.4-22.1,16.7c-6.9,9.9,2.3,11.2,14,8.7c11.4-4.7,16.6-22.9,18.9-37.9
+		C221.8,426.5,218.1,431.1,213.8,433.5z"/>
+	<path d="M288.3,433.5c-4.3-2.4-8-7-10.7-12.5c2.2,15,7.4,33.2,18.9,37.9c11.6,2.5,20.9,1.2,14-8.7
+		C308.8,447.9,302.3,441.2,288.3,433.5z"/>
+</g>
+</svg>
diff --git a/src/svgs/air-caste.svg b/src/svgs/Xenos/TauEmpire/air-caste.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/air-caste.svg
rename to src/svgs/Xenos/TauEmpire/air-caste.svg
index 7995b26..cf97374
--- a/src/svgs/air-caste.svg
+++ b/src/svgs/Xenos/TauEmpire/air-caste.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<g>
-	<circle cx="250" cy="120" r="70"/>
-	<path d="M160,120c0-28.3,13-53.5,33.4-70h-149L235,470V208.7C192.4,201.6,160,164.5,160,120z"/>
-	<path d="M306.6,50C327,66.5,340,91.7,340,120c0,44.6-32.4,81.6-75,88.7V470L455.6,50H306.6z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<g>
+	<circle cx="250" cy="120" r="70"/>
+	<path d="M160,120c0-28.3,13-53.5,33.4-70h-149L235,470V208.7C192.4,201.6,160,164.5,160,120z"/>
+	<path d="M306.6,50C327,66.5,340,91.7,340,120c0,44.6-32.4,81.6-75,88.7V470L455.6,50H306.6z"/>
+</g>
+</svg>
diff --git a/src/svgs/autaal.svg b/src/svgs/Xenos/TauEmpire/autaal.svg
similarity index 100%
rename from src/svgs/autaal.svg
rename to src/svgs/Xenos/TauEmpire/autaal.svg
diff --git a/src/svgs/borkan.svg b/src/svgs/Xenos/TauEmpire/borkan.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/borkan.svg
rename to src/svgs/Xenos/TauEmpire/borkan.svg
index 586a5b8..65d6eb9
--- a/src/svgs/borkan.svg
+++ b/src/svgs/Xenos/TauEmpire/borkan.svg
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="图层_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
-	 xml:space="preserve">
-<g>
-	<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
-		S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
-	<circle cx="315" cy="137.4" r="70"/>
-	<path d="M265,224c-65.3-37.7-139.4-46.1-207.2-29.3C32.9,281,68.7,376.3,150,423.2s181.7,30.3,244-34.4
-		C374.6,321.7,330.3,261.7,265,224z"/>
-	<path d="M242.2,190.3c-20.2-27.9-23.4-66.2-5.1-97.9c11-19.1,27.9-32.5,47.1-39.6C203.8,38.9,119.9,75.3,76.8,150
-		c-4.2,7.3-8,14.8-11.2,22.5C123.5,160.7,185,166,242.2,190.3z"/>
-	<path d="M403.7,121.9c3.5,20.1,0.3,41.5-10.7,60.6c-18.3,31.7-53.1,48.1-87.3,44.5c49.7,37.3,84.9,88,103.7,144
-		c5-6.6,9.6-13.6,13.9-20.9C466.3,275.3,455.9,184.4,403.7,121.9z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="图层_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
+	 xml:space="preserve">
+<g>
+	<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
+		S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
+	<circle cx="315" cy="137.4" r="70"/>
+	<path d="M265,224c-65.3-37.7-139.4-46.1-207.2-29.3C32.9,281,68.7,376.3,150,423.2s181.7,30.3,244-34.4
+		C374.6,321.7,330.3,261.7,265,224z"/>
+	<path d="M242.2,190.3c-20.2-27.9-23.4-66.2-5.1-97.9c11-19.1,27.9-32.5,47.1-39.6C203.8,38.9,119.9,75.3,76.8,150
+		c-4.2,7.3-8,14.8-11.2,22.5C123.5,160.7,185,166,242.2,190.3z"/>
+	<path d="M403.7,121.9c3.5,20.1,0.3,41.5-10.7,60.6c-18.3,31.7-53.1,48.1-87.3,44.5c49.7,37.3,84.9,88,103.7,144
+		c5-6.6,9.6-13.6,13.9-20.9C466.3,275.3,455.9,184.4,403.7,121.9z"/>
+</g>
+</svg>
diff --git a/src/svgs/dalyth.svg b/src/svgs/Xenos/TauEmpire/dalyth.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/dalyth.svg
rename to src/svgs/Xenos/TauEmpire/dalyth.svg
index a062608..1f48b82
--- a/src/svgs/dalyth.svg
+++ b/src/svgs/Xenos/TauEmpire/dalyth.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="图层_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
-	 xml:space="preserve">
-<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
-	S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
-<circle cx="250" cy="120" r="70"/>
-<g>
-	<path d="M448.4,225C439.1,149.8,388,87.5,319,62.2c13.1,15.6,21,35.8,21,57.8c0,49.7-40.3,90-90,90s-90-40.3-90-90
-		c0-22,7.9-42.1,21-57.8C112,87.5,60.9,149.8,51.6,225H448.4z"/>
-	<path d="M64.5,325c5.8,14.2,13.1,27.6,21.8,40h327.3c8.7-12.4,16-25.8,21.8-40H64.5z"/>
-	<path d="M112.2,395c35.9,34.1,84.4,55,137.8,55s101.9-20.9,137.8-55H112.2z"/>
-	<path d="M50.1,255c0.3,13.7,2.1,27.1,5,40h389.8c3-12.9,4.7-26.3,5-40H50.1z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="图层_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
+	 xml:space="preserve">
+<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
+	S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
+<circle cx="250" cy="120" r="70"/>
+<g>
+	<path d="M448.4,225C439.1,149.8,388,87.5,319,62.2c13.1,15.6,21,35.8,21,57.8c0,49.7-40.3,90-90,90s-90-40.3-90-90
+		c0-22,7.9-42.1,21-57.8C112,87.5,60.9,149.8,51.6,225H448.4z"/>
+	<path d="M64.5,325c5.8,14.2,13.1,27.6,21.8,40h327.3c8.7-12.4,16-25.8,21.8-40H64.5z"/>
+	<path d="M112.2,395c35.9,34.1,84.4,55,137.8,55s101.9-20.9,137.8-55H112.2z"/>
+	<path d="M50.1,255c0.3,13.7,2.1,27.1,5,40h389.8c3-12.9,4.7-26.3,5-40H50.1z"/>
+</g>
+</svg>
diff --git a/src/svgs/dyanoi.svg b/src/svgs/Xenos/TauEmpire/dyanoi.svg
similarity index 100%
rename from src/svgs/dyanoi.svg
rename to src/svgs/Xenos/TauEmpire/dyanoi.svg
diff --git a/src/svgs/earth-caste.svg b/src/svgs/Xenos/TauEmpire/earth-caste.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/earth-caste.svg
rename to src/svgs/Xenos/TauEmpire/earth-caste.svg
index 1374cf3..58ffe6b
--- a/src/svgs/earth-caste.svg
+++ b/src/svgs/Xenos/TauEmpire/earth-caste.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<g>
-	<circle cx="250" cy="120" r="70"/>
-	<path d="M160,120c0-28.3,13-53.5,33.4-70H140v400h95V208.7C192.4,201.6,160,164.6,160,120z"/>
-	<path d="M306.6,50C327,66.5,340,91.7,340,120c0,44.6-32.4,81.6-75,88.7V450h95V50H306.6z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<g>
+	<circle cx="250" cy="120" r="70"/>
+	<path d="M160,120c0-28.3,13-53.5,33.4-70H140v400h95V208.7C192.4,201.6,160,164.6,160,120z"/>
+	<path d="M306.6,50C327,66.5,340,91.7,340,120c0,44.6-32.4,81.6-75,88.7V450h95V50H306.6z"/>
+</g>
+</svg>
diff --git a/src/svgs/elsyeir.svg b/src/svgs/Xenos/TauEmpire/elsyeir.svg
similarity index 100%
rename from src/svgs/elsyeir.svg
rename to src/svgs/Xenos/TauEmpire/elsyeir.svg
diff --git a/src/svgs/ethereal-caste.svg b/src/svgs/Xenos/TauEmpire/ethereal-caste.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/ethereal-caste.svg
rename to src/svgs/Xenos/TauEmpire/ethereal-caste.svg
index 64b201b..9836047
--- a/src/svgs/ethereal-caste.svg
+++ b/src/svgs/Xenos/TauEmpire/ethereal-caste.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<g>
-	<circle cx="250" cy="120" r="70"/>
-	<path d="M161.9,138.5L41.8,226.2L173,470h62V208.7C198.5,202.6,169.5,174.5,161.9,138.5z"/>
-	<path d="M338.1,138.5c-7.5,36-36.6,64.1-73.1,70.2V470h62l131.2-243.8L338.1,138.5z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<g>
+	<circle cx="250" cy="120" r="70"/>
+	<path d="M161.9,138.5L41.8,226.2L173,470h62V208.7C198.5,202.6,169.5,174.5,161.9,138.5z"/>
+	<path d="M338.1,138.5c-7.5,36-36.6,64.1-73.1,70.2V470h62l131.2-243.8L338.1,138.5z"/>
+</g>
+</svg>
diff --git a/src/svgs/falshia.svg b/src/svgs/Xenos/TauEmpire/falshia.svg
similarity index 100%
rename from src/svgs/falshia.svg
rename to src/svgs/Xenos/TauEmpire/falshia.svg
diff --git a/src/svgs/farsight-enclave.svg b/src/svgs/Xenos/TauEmpire/farsight-enclave.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/farsight-enclave.svg
rename to src/svgs/Xenos/TauEmpire/farsight-enclave.svg
index f6df04c..751ef8a
--- a/src/svgs/farsight-enclave.svg
+++ b/src/svgs/Xenos/TauEmpire/farsight-enclave.svg
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="图层_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
-	 xml:space="preserve">
-<g>
-	<ellipse fill="#8A0000" cx="250" cy="110.9" rx="83.9" ry="85.9"/>
-	<g>
-		<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
-			S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
-		<path d="M322.4,48.8c13.7,16.7,22,38.4,22,62c0,53.3-42.3,96.6-94.4,96.6s-94.4-43.2-94.4-96.6c0-23.6,8.3-45.2,22-62
-			C104.3,76.4,50.3,144.6,41.5,226.8h417C449.7,144.6,395.7,76.4,322.4,48.8z"/>
-		<path d="M292,252.5h-73.4c0,0.2,0,0.3,0,0.5c0,72.9-19.3,140.2-51.8,194.4c25.5,11.3,53.7,17.6,83.3,17.6
-			c32.8,0,63.8-7.7,91.5-21.4C310.3,390,291.9,324.1,291.9,253C291.9,252.8,292,252.7,292,252.5z"/>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="图层_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
+	 xml:space="preserve">
+<g>
+	<ellipse fill="#8A0000" cx="250" cy="110.9" rx="83.9" ry="85.9"/>
+	<g>
+		<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
+			S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
+		<path d="M322.4,48.8c13.7,16.7,22,38.4,22,62c0,53.3-42.3,96.6-94.4,96.6s-94.4-43.2-94.4-96.6c0-23.6,8.3-45.2,22-62
+			C104.3,76.4,50.3,144.6,41.5,226.8h417C449.7,144.6,395.7,76.4,322.4,48.8z"/>
+		<path d="M292,252.5h-73.4c0,0.2,0,0.3,0,0.5c0,72.9-19.3,140.2-51.8,194.4c25.5,11.3,53.7,17.6,83.3,17.6
+			c32.8,0,63.8-7.7,91.5-21.4C310.3,390,291.9,324.1,291.9,253C291.9,252.8,292,252.7,292,252.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/svgs/fesaan-sept.svg b/src/svgs/Xenos/TauEmpire/fesaan-sept.svg
similarity index 100%
rename from src/svgs/fesaan-sept.svg
rename to src/svgs/Xenos/TauEmpire/fesaan-sept.svg
diff --git a/src/svgs/fire-caste.svg b/src/svgs/Xenos/TauEmpire/fire-caste.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/fire-caste.svg
rename to src/svgs/Xenos/TauEmpire/fire-caste.svg
index f20b2bc..937fe6f
--- a/src/svgs/fire-caste.svg
+++ b/src/svgs/Xenos/TauEmpire/fire-caste.svg
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<g>
-	<circle cx="250" cy="120" r="70"/>
-	<path d="M160,120c0-22,7.9-42.1,21-57.8C104.5,90.3,50,163.8,50,250c0,105.4,81.5,191.8,185,199.4V208.7
-		C192.4,201.6,160,164.6,160,120z"/>
-	<path d="M319,62.2c13.1,15.6,21,35.8,21,57.8c0,44.6-32.4,81.6-75,88.7v240.7c103.5-7.7,185-94,185-199.4
-		C450,163.8,395.5,90.3,319,62.2z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<g>
+	<circle cx="250" cy="120" r="70"/>
+	<path d="M160,120c0-22,7.9-42.1,21-57.8C104.5,90.3,50,163.8,50,250c0,105.4,81.5,191.8,185,199.4V208.7
+		C192.4,201.6,160,164.6,160,120z"/>
+	<path d="M319,62.2c13.1,15.6,21,35.8,21,57.8c0,44.6-32.4,81.6-75,88.7v240.7c103.5-7.7,185-94,185-199.4
+		C450,163.8,395.5,90.3,319,62.2z"/>
+</g>
+</svg>
diff --git a/src/svgs/firios.svg b/src/svgs/Xenos/TauEmpire/firios.svg
similarity index 100%
rename from src/svgs/firios.svg
rename to src/svgs/Xenos/TauEmpire/firios.svg
diff --git a/src/svgs/kelshan.svg b/src/svgs/Xenos/TauEmpire/kelshan.svg
similarity index 100%
rename from src/svgs/kelshan.svg
rename to src/svgs/Xenos/TauEmpire/kelshan.svg
diff --git a/src/svgs/kortal-sept.svg b/src/svgs/Xenos/TauEmpire/kortal-sept.svg
similarity index 100%
rename from src/svgs/kortal-sept.svg
rename to src/svgs/Xenos/TauEmpire/kortal-sept.svg
diff --git a/src/svgs/ksimyen.svg b/src/svgs/Xenos/TauEmpire/ksimyen.svg
similarity index 100%
rename from src/svgs/ksimyen.svg
rename to src/svgs/Xenos/TauEmpire/ksimyen.svg
diff --git a/src/svgs/mugulath-bay.svg b/src/svgs/Xenos/TauEmpire/mugulath-bay.svg
similarity index 100%
rename from src/svgs/mugulath-bay.svg
rename to src/svgs/Xenos/TauEmpire/mugulath-bay.svg
diff --git a/src/svgs/ndras.svg b/src/svgs/Xenos/TauEmpire/ndras.svg
similarity index 100%
rename from src/svgs/ndras.svg
rename to src/svgs/Xenos/TauEmpire/ndras.svg
diff --git a/src/svgs/sacea.svg b/src/svgs/Xenos/TauEmpire/sacea.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/sacea.svg
rename to src/svgs/Xenos/TauEmpire/sacea.svg
index b916db7..603ad62
--- a/src/svgs/sacea.svg
+++ b/src/svgs/Xenos/TauEmpire/sacea.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="图层_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
-	 xml:space="preserve">
-<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
-	S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
-<circle cx="250" cy="120" r="70"/>
-<g>
-	<path d="M448.8,228C440.4,151.5,388.9,87.9,319,62.2c13.1,15.6,21,35.8,21,57.8c0,49.7-40.3,90-90,90s-90-40.3-90-90
-		c0-22,7.9-42.1,21-57.8C111.1,87.9,59.6,151.5,51.2,228H448.8z"/>
-	<path d="M50,252c0.9,95.9,69.3,175.6,160,194v-66h80v66c90.7-18.4,159-98.1,160-194H50z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="图层_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
+	 xml:space="preserve">
+<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
+	S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
+<circle cx="250" cy="120" r="70"/>
+<g>
+	<path d="M448.8,228C440.4,151.5,388.9,87.9,319,62.2c13.1,15.6,21,35.8,21,57.8c0,49.7-40.3,90-90,90s-90-40.3-90-90
+		c0-22,7.9-42.1,21-57.8C111.1,87.9,59.6,151.5,51.2,228H448.8z"/>
+	<path d="M50,252c0.9,95.9,69.3,175.6,160,194v-66h80v66c90.7-18.4,159-98.1,160-194H50z"/>
+</g>
+</svg>
diff --git a/src/svgs/tashvar.svg b/src/svgs/Xenos/TauEmpire/tashvar.svg
similarity index 100%
rename from src/svgs/tashvar.svg
rename to src/svgs/Xenos/TauEmpire/tashvar.svg
diff --git a/src/svgs/tau.svg b/src/svgs/Xenos/TauEmpire/tau.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/tau.svg
rename to src/svgs/Xenos/TauEmpire/tau.svg
index 21ee8a7..a3f1164
--- a/src/svgs/tau.svg
+++ b/src/svgs/Xenos/TauEmpire/tau.svg
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="图层_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
-	 xml:space="preserve">
-<g>
-	<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
-		S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
-	<path d="M319,62.2c13.1,15.6,21,35.8,21,57.8c0,49.7-40.3,90-90,90s-90-40.3-90-90c0-22,7.9-42.1,21-57.8
-		C104.5,90.3,50,163.8,50,250c0,110.5,89.5,200,200,200s200-89.5,200-200C450,163.8,395.5,90.3,319,62.2z"/>
-	<circle cx="250" cy="120" r="70"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="图层_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
+	 xml:space="preserve">
+<g>
+	<path d="M250,0C111.9,0,0,111.9,0,250s111.9,250,250,250s250-111.9,250-250S388.1,0,250,0z M250,485C120.2,485,15,379.8,15,250
+		S120.2,15,250,15s235,105.2,235,235S379.8,485,250,485z"/>
+	<path d="M319,62.2c13.1,15.6,21,35.8,21,57.8c0,49.7-40.3,90-90,90s-90-40.3-90-90c0-22,7.9-42.1,21-57.8
+		C104.5,90.3,50,163.8,50,250c0,110.5,89.5,200,200,200s200-89.5,200-200C450,163.8,395.5,90.3,319,62.2z"/>
+	<circle cx="250" cy="120" r="70"/>
+</g>
+</svg>
diff --git a/src/svgs/taun.svg b/src/svgs/Xenos/TauEmpire/taun.svg
similarity index 100%
rename from src/svgs/taun.svg
rename to src/svgs/Xenos/TauEmpire/taun.svg
diff --git a/src/svgs/tolku.svg b/src/svgs/Xenos/TauEmpire/tolku.svg
similarity index 100%
rename from src/svgs/tolku.svg
rename to src/svgs/Xenos/TauEmpire/tolku.svg
diff --git a/src/svgs/vashya.svg b/src/svgs/Xenos/TauEmpire/vashya.svg
similarity index 100%
rename from src/svgs/vashya.svg
rename to src/svgs/Xenos/TauEmpire/vashya.svg
diff --git a/src/svgs/viorla.svg b/src/svgs/Xenos/TauEmpire/viorla.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/viorla.svg
rename to src/svgs/Xenos/TauEmpire/viorla.svg
index dc61343..23161bf
--- a/src/svgs/viorla.svg
+++ b/src/svgs/Xenos/TauEmpire/viorla.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="图层_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
-	 xml:space="preserve">
-<g>
-	<path d="M375,33.5C255.4-35.5,102.5,5.4,33.5,125S5.4,397.5,125,466.5s272.5,28.1,341.5-91.5S494.6,102.5,375,33.5z M132.5,453.5
-		c-112.4-64.9-150.9-208.6-86-321s208.6-150.9,321-86s150.9,208.6,86,321C388.6,479.9,244.9,518.4,132.5,453.5z"/>
-	<circle cx="315" cy="137.4" r="70"/>
-	<circle cx="185" cy="362.6" r="70"/>
-	<path d="M221.1,280.1l40.6-70.2c-36.5-26.8-47.7-77.3-24.6-117.5c11-19,27.9-32.5,47.1-39.5C203.9,39,119.9,75.3,76.8,150
-		S44.2,315.5,96.4,378.1c-3.5-20.1-0.3-41.5,10.7-60.5C130.2,277.5,179.6,261.9,221.1,280.1z"/>
-	<path d="M403.6,121.9c3.5,20.1,0.3,41.5-10.7,60.5c-23.2,40.1-72.5,55.7-114,37.5l-40.6,70.2c36.5,26.8,47.7,77.3,24.6,117.5
-		c-11,19-27.9,32.5-47.1,39.5c80.3,13.9,164.2-22.5,207.3-97.1S455.8,184.5,403.6,121.9z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="图层_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 500 500"
+	 xml:space="preserve">
+<g>
+	<path d="M375,33.5C255.4-35.5,102.5,5.4,33.5,125S5.4,397.5,125,466.5s272.5,28.1,341.5-91.5S494.6,102.5,375,33.5z M132.5,453.5
+		c-112.4-64.9-150.9-208.6-86-321s208.6-150.9,321-86s150.9,208.6,86,321C388.6,479.9,244.9,518.4,132.5,453.5z"/>
+	<circle cx="315" cy="137.4" r="70"/>
+	<circle cx="185" cy="362.6" r="70"/>
+	<path d="M221.1,280.1l40.6-70.2c-36.5-26.8-47.7-77.3-24.6-117.5c11-19,27.9-32.5,47.1-39.5C203.9,39,119.9,75.3,76.8,150
+		S44.2,315.5,96.4,378.1c-3.5-20.1-0.3-41.5,10.7-60.5C130.2,277.5,179.6,261.9,221.1,280.1z"/>
+	<path d="M403.6,121.9c3.5,20.1,0.3,41.5-10.7,60.5c-23.2,40.1-72.5,55.7-114,37.5l-40.6,70.2c36.5,26.8,47.7,77.3,24.6,117.5
+		c-11,19-27.9,32.5-47.1,39.5c80.3,13.9,164.2-22.5,207.3-97.1S455.8,184.5,403.6,121.9z"/>
+</g>
+</svg>
diff --git a/src/svgs/water-caste.svg b/src/svgs/Xenos/TauEmpire/water-caste.svg
old mode 100755
new mode 100644
similarity index 98%
rename from src/svgs/water-caste.svg
rename to src/svgs/Xenos/TauEmpire/water-caste.svg
index dd9edd5..46b4903
--- a/src/svgs/water-caste.svg
+++ b/src/svgs/Xenos/TauEmpire/water-caste.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<g>
-	<circle cx="250" cy="120" r="70"/>
-	<path d="M336.4,145.3c-9.6,32.7-37.2,57.7-71.4,63.4V470l193.4-214.8L336.4,145.3z"/>
-	<path d="M163.6,145.3L41.5,255.2L234.9,470h0.1V208.7C200.8,203,173.2,178,163.6,145.3z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<g>
+	<circle cx="250" cy="120" r="70"/>
+	<path d="M336.4,145.3c-9.6,32.7-37.2,57.7-71.4,63.4V470l193.4-214.8L336.4,145.3z"/>
+	<path d="M163.6,145.3L41.5,255.2L234.9,470h0.1V208.7C200.8,203,173.2,178,163.6,145.3z"/>
+</g>
+</svg>
diff --git a/src/svgs/yovai-sept.svg b/src/svgs/Xenos/TauEmpire/yovai-sept.svg
similarity index 100%
rename from src/svgs/yovai-sept.svg
rename to src/svgs/Xenos/TauEmpire/yovai-sept.svg