diff --git a/kanji_mismatch/053a9-Jinmei.svg b/kanji/053a9-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/053a9-Jinmei.svg
rename to kanji/053a9-Jinmei.svg
diff --git a/kanji_mismatch/053a9-JinmeiKaisho.svg b/kanji/053a9-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/053a9-JinmeiKaisho.svg
rename to kanji/053a9-JinmeiKaisho.svg
diff --git a/kanji_mismatch/05634-KaishoHzFst.svg b/kanji/05634-KaishoHzFst.svg
similarity index 100%
rename from kanji_mismatch/05634-KaishoHzFst.svg
rename to kanji/05634-KaishoHzFst.svg
diff --git a/kanji_mismatch/056a2-Jinmei.svg b/kanji/056a2-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/056a2-Jinmei.svg
rename to kanji/056a2-Jinmei.svg
diff --git a/kanji/05ac2-MdFst2.svg b/kanji/05ac2-MdFst2.svg
new file mode 100644
index 000000000..3f0b58314
--- /dev/null
+++ b/kanji/05ac2-MdFst2.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2009/2010/2011 Ulrich Apel.
+This work is distributed under the conditions of the Creative Commons
+Attribution-Share Alike 3.0 Licence. This means you are free:
+* to Share - to copy, distribute and transmit the work
+* to Remix - to adapt the work
+
+Under the following conditions:
+* Attribution. You must attribute the work by stating your use of KanjiVG in
+  your own copyright header and linking to KanjiVG's website
+  (http://kanjivg.tagaini.net)
+* Share Alike. If you alter, transform, or build upon this work, you may
+  distribute the resulting work only under the same or similar license to this
+  one.
+
+See http://creativecommons.org/licenses/by-sa/3.0/ for more details.
+-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
+<!ATTLIST g
+xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
+kvg:element CDATA #IMPLIED
+kvg:variant CDATA #IMPLIED
+kvg:partial CDATA #IMPLIED
+kvg:original CDATA #IMPLIED
+kvg:part CDATA #IMPLIED
+kvg:number CDATA #IMPLIED
+kvg:tradForm CDATA #IMPLIED
+kvg:radicalForm CDATA #IMPLIED
+kvg:position CDATA #IMPLIED
+kvg:radical CDATA #IMPLIED
+kvg:phon CDATA #IMPLIED >
+<!ATTLIST path
+xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
+kvg:type CDATA #IMPLIED >
+]>
+<svg xmlns="http://www.w3.org/2000/svg" width="109" height="109" viewBox="0 0 109 109">
+<g id="kvg:StrokePaths_05ac2-MdFst2" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
+<g id="kvg:05ac2-MdFst2" kvg:element="嫂">
+	<g id="kvg:05ac2-MdFst2-g1" kvg:element="女" kvg:variant="true" kvg:position="left" kvg:radical="general">
+		<path id="kvg:05ac2-MdFst2-s1" kvg:type="㇛" d="M26.48,17.37c0.39,1.04,1.08,2.74,0.89,4.24C26.38,29,20.55,54.76,16.23,63.4c-0.89,1.77,0.4,2.46,0.89,2.63c9.38,3.22,18.38,10.62,23.63,18.25"/>
+		<path id="kvg:05ac2-MdFst2-s2" kvg:type="㇒" d="M38.25,36.89c0.08,1.27,0.14,4.34-0.16,6.18C35.68,57.91,28.73,78.96,11.5,90"/>
+		<path id="kvg:05ac2-MdFst2-s3" kvg:type="㇀/㇐" d="M8.5,46.72c0.75,0.94,1.75,1.62,3.75,1.39c2.15-0.24,21.34-4.35,30.25-6.73"/>
+	</g>
+	<g id="kvg:05ac2-MdFst2-g2" kvg:element="叟" kvg:position="right">
+		<g id="kvg:05ac2-MdFst2-g3" kvg:position="top">
+			<g id="kvg:05ac2-MdFst2-g4" kvg:element="臼" kvg:variant="true">
+				<path id="kvg:05ac2-MdFst2-s4" kvg:type="㇒" d="M58.14,16.4c0.03,0.2-0.16,0.97-0.35,1.19c-2.49,2.83-4.8,4.96-10.47,7.21"/>
+				<path id="kvg:05ac2-MdFst2-s5" kvg:type="㇑" d="M45.85,23.1c0.6,0.71,1.35,2.29,1.5,3.74c0.55,5.3,1.91,16.61,2.46,23.77"/>
+				<path id="kvg:05ac2-MdFst2-s6" kvg:type="㇕" d="M48.39,35.18c2.99-0.32,9.3-2.08,10.01-2.08c0.71,0,1.71,0,2.27,0"/>
+				<path id="kvg:05ac2-MdFst2-s7" kvg:type="㇐" d="M73.51,17.74c0.71,0.16,1.28,0.48,2.27,0.48s10.8-1.93,11.94-2.09c1.14-0.16,2.08,0.8,1.99,1.77c-0.85,9.34-3.7,29.4-3.84,30.05"/>
+				<path id="kvg:05ac2-MdFst2-s8" kvg:type="㇐" d="M72.94,31.48c0.71,0.16,1.28,0.48,2.27,0.48c0.99,0,11.73-0.82,12.87-0.98"/>
+				<path id="kvg:05ac2-MdFst2-s9" kvg:type="㇐" d="M49.95,48.81c3.56-0.57,31.21-2.63,35.56-2.67"/>
+				<path id="kvg:05ac2-MdFst2-s10" kvg:type="㇐" d="M65.39,11.75c0.89,0.47,1.43,2.12,1.61,3.07c0.18,0.94,0,38.91-0.18,44.81"/>
+			</g>
+			<g id="kvg:05ac2-MdFst2-g5" kvg:element="丨">
+				<path id="kvg:05ac2-MdFst2-s11" kvg:type="㇑" d="M47.02,62.21c1.68,0.27,1.91,0.86,5.24,0.27c5.24-0.94,27.45-3.88,29.76-4.28c2.31-0.4,3.3,2.54,2.31,3.89C72.38,78.3,56.82,89.44,37.96,96"/>
+			</g>
+		</g>
+		<g id="kvg:05ac2-MdFst2-g6" kvg:element="又" kvg:position="bottom">
+			<path id="kvg:05ac2-MdFst2-s12" kvg:type="㇇" d="M51.41,67.44c6.17,0.16,24.17,18.16,38.46,25.33c2.23,1.12,3.85,1.86,5.92,2.23"/>
+			<path id="kvg:05ac2-MdFst2-s13" kvg:type="㇏" d=""/>
+		</g>
+	</g>
+</g>
+</g>
+<g id="kvg:StrokeNumbers_05ac2-MdFst2" style="font-size:8;fill:#808080">
+	<text transform="matrix(1 0 0 1 19.50 16.63)">1</text>
+	<text transform="matrix(1 0 0 1 31.50 32.50)">2</text>
+	<text transform="matrix(1 0 0 1 0.50 47.50)">3</text>
+	<text transform="matrix(1 0 0 1 50.50 15.40)">4</text>
+	<text transform="matrix(1 0 0 1 39.50 30.58)">5</text>
+	<text transform="matrix(1 0 0 1 52.50 31.18)">6</text>
+	<text transform="matrix(1 0 0 1 71.50 14.50)">7</text>
+	<text transform="matrix(1 0 0 1 71.50 28.60)">8</text>
+	<text transform="matrix(1 0 0 1 52.50 45.78)">9</text>
+	<text transform="matrix(1 0 0 1 58.00 8.45)">10</text>
+	<text transform="matrix(1 0 0 1 42.50 59.50)">11</text>
+	<text transform="matrix(1 0 0 1 44.50 74.05)">12</text>
+</g>
+</svg>
diff --git a/kanji_mismatch/06372-Jinmei.svg b/kanji/06372-Jinmei.svg
similarity index 98%
rename from kanji_mismatch/06372-Jinmei.svg
rename to kanji/06372-Jinmei.svg
index 5866bd985..985ed7213 100644
--- a/kanji_mismatch/06372-Jinmei.svg
+++ b/kanji/06372-Jinmei.svg
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 		<g id="kvg:06372-Jinmei-g8" kvg:element="己" kvg:position="bottom">
 			<path id="kvg:06372-Jinmei-s10" kvg:type="㇕c" d="M55.07,62.62c0.54,0.06,1.99,0.18,3.08,0.05c4.25-0.52,17.4-2.42,18.83-2.83c2.14-0.62,3.63,0.68,3.65,2.69c0.04,3.41-2,11.12-4.56,16.68c-1.87,4.06-4.31,0.79-5.32-0.48"/>
 			<path id="kvg:06372-Jinmei-s11" kvg:type="㇐" d="M57.05,63.23c0,2.02,0.08,3.28,0.08,5.16c0,11.22,0.21,10.54,0.21,16.25c0,11.47,1.97,11.82,16.92,11.82c15.53,0,17.55-0.96,17.55-9.35"/>
-			<path id="kvg:06372-Jinmei-s12" kvg:type="㇟"/>
+			<path id="kvg:06372-Jinmei-s12" kvg:type="㇟" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/064d2-Kaisho.svg b/kanji/064d2-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/064d2-Kaisho.svg
rename to kanji/064d2-Kaisho.svg
index cede84a42..cd869fc59 100644
--- a/kanji_mismatch/064d2-Kaisho.svg
+++ b/kanji/064d2-Kaisho.svg
@@ -69,7 +69,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:064d2-Kaisho-s13" kvg:type="㇆" d="M46.2,72.92c6.87-0.49,41.73-3.47,43-3.7c2.71-0.5,4.51,1.21,4.41,2.68c-0.24,3.53-2.63,18.7-4.77,23.19c-2.67,5.6-3.64,3.45-6.04-0.04"/>
 				<path id="kvg:064d2-Kaisho-s14" kvg:type="㇑" d="M66.82,64.44c0.31,0.37,0.53,1.35,0.31,1.81c-3.37,6.99-6.9,14.68-11.07,18.9c-1.32,1.34-1.32,1.64,0.61,1.34c4.05-0.62,13.5-3.2,21.53-4.47"/>
 				<path id="kvg:064d2-Kaisho-s15" kvg:type="㇐" d="M73.33,76.32c2.66,1.8,6.88,7.38,7.54,10.18"/>
-				<path id="kvg:064d2-Kaisho-s16" kvg:type="㇔"/>
+				<path id="kvg:064d2-Kaisho-s16" kvg:type="㇔" d=""/>
 			</g>
 		</g>
 	</g>
diff --git a/kanji_mismatch/064e0-KaishoVt12.svg b/kanji/064e0-KaishoVt12.svg
similarity index 98%
rename from kanji_mismatch/064e0-KaishoVt12.svg
rename to kanji/064e0-KaishoVt12.svg
index cc37db3fa..d20f0d789 100644
--- a/kanji_mismatch/064e0-KaishoVt12.svg
+++ b/kanji/064e0-KaishoVt12.svg
@@ -64,7 +64,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:064e0-KaishoVt12-s16" kvg:type="㇐" d="M59.86,67.09c0.82-0.08,1.7-0.16,2.6-0.25c5.79-0.54,11.58-1.07,17.37-1.58c0.88-0.08,1.72-0.15,2.5-0.22"/>
 				<path id="kvg:064e0-KaishoVt12-s17" kvg:type="㇐" d="M58.7,78.7c0.8-0.06,1.65-0.12,2.53-0.19c5.8-0.43,11.6-0.88,17.4-1.3c0.91-0.07,1.79-0.13,2.63-0.19"/>
 			</g>
-			<path id="kvg:064e0-KaishoVt12-s18" kvg:type="㇑"/>
+			<path id="kvg:064e0-KaishoVt12-s18" kvg:type="㇑" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/065c6-Kaisho.svg b/kanji/065c6-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/065c6-Kaisho.svg
rename to kanji/065c6-Kaisho.svg
diff --git a/kanji_mismatch/06666-Jinmei.svg b/kanji/06666-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/06666-Jinmei.svg
rename to kanji/06666-Jinmei.svg
diff --git a/kanji_mismatch/06666-JinmeiKaisho.svg b/kanji/06666-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/06666-JinmeiKaisho.svg
rename to kanji/06666-JinmeiKaisho.svg
diff --git a/kanji_mismatch/06840-Kaisho.svg b/kanji/06840-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/06840-Kaisho.svg
rename to kanji/06840-Kaisho.svg
diff --git a/kanji_mismatch/0685d-Kaisho.svg b/kanji/0685d-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/0685d-Kaisho.svg
rename to kanji/0685d-Kaisho.svg
diff --git a/kanji_mismatch/06a8e-Kaisho.svg b/kanji/06a8e-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/06a8e-Kaisho.svg
rename to kanji/06a8e-Kaisho.svg
index 15f2e0247..d336abb6c 100644
--- a/kanji_mismatch/06a8e-Kaisho.svg
+++ b/kanji/06a8e-Kaisho.svg
@@ -70,7 +70,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:06a8e-Kaisho-s14" kvg:type="㇆" d="M47.75,70.62c6.94-0.52,39.73-4.09,41.01-4.34c2.74-0.53,4.55,1.28,4.45,2.82c-0.24,3.73-2.66,19.51-4.81,24.24c-2.69,5.92-3.67,3.64-6.09-0.04"/>
 				<path id="kvg:06a8e-Kaisho-s15" kvg:type="㇑" d="M66.57,61.49c0.5,1.2,0.4,2.32-0.17,3.44c-3.33,6.55-6.35,10.45-10.03,15.94c-1.49,2.24-0.31,3.39,2.12,2.75C63.9,82.21,70.67,80.33,78,79"/>
 				<path id="kvg:06a8e-Kaisho-s16" kvg:type="㇐" d="M75.29,72.92c2.21,1.9,5.7,7.8,6.25,10.75"/>
-				<path id="kvg:06a8e-Kaisho-s17" kvg:type="㇔"/>
+				<path id="kvg:06a8e-Kaisho-s17" kvg:type="㇔" d=""/>
 			</g>
 		</g>
 	</g>
diff --git a/kanji_mismatch/06adb-Jinmei.svg b/kanji/06adb-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/06adb-Jinmei.svg
rename to kanji/06adb-Jinmei.svg
diff --git a/kanji_mismatch/06adb-JinmeiKaisho.svg b/kanji/06adb-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/06adb-JinmeiKaisho.svg
rename to kanji/06adb-JinmeiKaisho.svg
diff --git a/kanji_mismatch/06e08-KaishoVt6.svg b/kanji/06e08-KaishoVt6.svg
similarity index 98%
rename from kanji_mismatch/06e08-KaishoVt6.svg
rename to kanji/06e08-KaishoVt6.svg
index 627b31154..e97cb0b30 100644
--- a/kanji_mismatch/06e08-KaishoVt6.svg
+++ b/kanji/06e08-KaishoVt6.svg
@@ -63,7 +63,7 @@ kvg:type CDATA #IMPLIED >
 					<path id="kvg:06e08-KaishoVt6-s10" kvg:type="㇐" d="M88.77,14.33c0.98,0.92,1.67,1.99,1.76,5.02c0.4,14.55-0.26,63.66-0.26,68.62c0,13.14-7.21,1.5-8.71,0.25"/>
 				</g>
 			</g>
-			<path id="kvg:06e08-KaishoVt6-s11" kvg:type="㇑"/>
+			<path id="kvg:06e08-KaishoVt6-s11" kvg:type="㇑" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/06fdf-KaishoVt12.svg b/kanji/06fdf-KaishoVt12.svg
similarity index 98%
rename from kanji_mismatch/06fdf-KaishoVt12.svg
rename to kanji/06fdf-KaishoVt12.svg
index 5c239019e..725cd8a39 100644
--- a/kanji_mismatch/06fdf-KaishoVt12.svg
+++ b/kanji/06fdf-KaishoVt12.svg
@@ -64,7 +64,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:06fdf-KaishoVt12-s16" kvg:type="㇐" d="M52.48,69.59c0.81-0.08,1.67-0.16,2.56-0.25c5.72-0.54,11.44-1.07,17.16-1.58c0.87-0.08,1.69-0.15,2.47-0.22"/>
 				<path id="kvg:06fdf-KaishoVt12-s17" kvg:type="㇐" d="M51.19,79.62c0.83-0.07,1.72-0.14,2.65-0.22c6.09-0.51,12.18-1.06,18.27-1.57c0.95-0.08,1.87-0.16,2.74-0.23"/>
 			</g>
-			<path id="kvg:06fdf-KaishoVt12-s18" kvg:type="㇑"/>
+			<path id="kvg:06fdf-KaishoVt12-s18" kvg:type="㇑" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07015-Jinmei.svg b/kanji/07015-Jinmei.svg
similarity index 99%
rename from kanji_mismatch/07015-Jinmei.svg
rename to kanji/07015-Jinmei.svg
index f5b9bf96b..cd639121c 100644
--- a/kanji_mismatch/07015-Jinmei.svg
+++ b/kanji/07015-Jinmei.svg
@@ -78,7 +78,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 				<g id="kvg:07015-Jinmei-g13" kvg:position="bottom">
 					<path id="kvg:07015-Jinmei-s19" kvg:type="㇒" d="M86.27,83.88c5.06,3.37,11.04,9.49,12.42,12.44"/>
-					<path id="kvg:07015-Jinmei-s20" kvg:type="㇔"/>
+					<path id="kvg:07015-Jinmei-s20" kvg:type="㇔" d=""/>
 				</g>
 			</g>
 		</g>
diff --git a/kanji_mismatch/07015-JinmeiKaisho.svg b/kanji/07015-JinmeiKaisho.svg
similarity index 98%
rename from kanji_mismatch/07015-JinmeiKaisho.svg
rename to kanji/07015-JinmeiKaisho.svg
index ccb55202a..c6deb66d5 100644
--- a/kanji_mismatch/07015-JinmeiKaisho.svg
+++ b/kanji/07015-JinmeiKaisho.svg
@@ -78,7 +78,7 @@ kvg:type CDATA #IMPLIED >
 				</g>
 				<g id="kvg:07015-JinmeiKaisho-g13" kvg:position="bottom">
 					<path id="kvg:07015-JinmeiKaisho-s19" kvg:type="㇒" d="M86.27,83.88c5.06,3.37,11.04,9.49,12.42,12.44"/>
-					<path id="kvg:07015-JinmeiKaisho-s20" kvg:type="㇔"/>
+					<path id="kvg:07015-JinmeiKaisho-s20" kvg:type="㇔" d=""/>
 				</g>
 			</g>
 		</g>
diff --git a/kanji_mismatch/07058-Jinmei.svg b/kanji/07058-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/07058-Jinmei.svg
rename to kanji/07058-Jinmei.svg
diff --git a/kanji_mismatch/07149-Jinmei.svg b/kanji/07149-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/07149-Jinmei.svg
rename to kanji/07149-Jinmei.svg
diff --git a/kanji_mismatch/07483-Kaisho.svg b/kanji/07483-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/07483-Kaisho.svg
rename to kanji/07483-Kaisho.svg
index 70078d551..43d98a8f9 100644
--- a/kanji_mismatch/07483-Kaisho.svg
+++ b/kanji/07483-Kaisho.svg
@@ -65,7 +65,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07483-Kaisho-s12" kvg:type="㇆" d="M46.38,66.21c6.68-0.76,45.19-5.46,46.52-5.46c1.93,0,3.16,0.57,3.16,2.27c0,3.59-3.07,22.36-4.35,27.72c-2.06,8.65-5.45,3.74-7.24,1.94"/>
 			<path id="kvg:07483-Kaisho-s13" kvg:type="㇑" d="M68.29,53.5c0.29,0.5,0.37,2.46,0.1,3.08C64.5,65.5,61.1,73.93,57.12,79.65c-1.26,1.81-1.25,2.36,0.58,1.81c4.46-1.33,14.28-4.32,20.49-6.56"/>
 			<path id="kvg:07483-Kaisho-s14" kvg:type="㇐" d="M74.58,69.31c2.82,2.19,7.28,9,7.98,12.41"/>
-			<path id="kvg:07483-Kaisho-s15" kvg:type="㇔"/>
+			<path id="kvg:07483-Kaisho-s15" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07483-KaishoVtLst.svg b/kanji/07483-KaishoVtLst.svg
similarity index 98%
rename from kanji_mismatch/07483-KaishoVtLst.svg
rename to kanji/07483-KaishoVtLst.svg
index 30913abb6..d8bc3f0a9 100644
--- a/kanji_mismatch/07483-KaishoVtLst.svg
+++ b/kanji/07483-KaishoVtLst.svg
@@ -65,7 +65,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07483-KaishoVtLst-s12" kvg:type="㇆" d="M46.38,66.21c6.68-0.76,45.19-5.46,46.52-5.46c1.93,0,3.16,0.57,3.16,2.27c0,3.59-3.07,22.36-4.35,27.72c-2.06,8.65-5.45,3.74-7.24,1.94"/>
 			<path id="kvg:07483-KaishoVtLst-s13" kvg:type="㇑" d="M68.29,53.5c0.29,0.5,0.37,2.46,0.1,3.08C64.5,65.5,61.1,73.93,57.12,79.65c-1.26,1.81-1.25,2.36,0.58,1.81c4.46-1.33,14.28-4.32,20.49-6.56"/>
 			<path id="kvg:07483-KaishoVtLst-s14" kvg:type="㇐" d="M74.58,69.31c2.82,2.19,7.28,9,7.98,12.41"/>
-			<path id="kvg:07483-KaishoVtLst-s15" kvg:type="㇔"/>
+			<path id="kvg:07483-KaishoVtLst-s15" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/074f8-Kaisho.svg b/kanji/074f8-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/074f8-Kaisho.svg
rename to kanji/074f8-Kaisho.svg
index 1f8bc9d4b..88be14b00 100644
--- a/kanji_mismatch/074f8-Kaisho.svg
+++ b/kanji/074f8-Kaisho.svg
@@ -58,7 +58,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:074f8-Kaisho-s8" kvg:type="㇑" d="M58.16,35.12c2.64-0.19,23.75-2.17,26.15-2.39c2-0.19,3.29,1.25,3.14,2.36c-0.31,2.24-0.61,30.39-0.86,42.32"/>
 				<path id="kvg:074f8-Kaisho-s9" kvg:type="㇕a" d="M58.77,54.34c5.15-0.4,10.3-0.85,15.45-1.21c1.19-0.08,2.35-0.16,3.46-0.23"/>
 				<path id="kvg:074f8-Kaisho-s10" kvg:type="㇐a" d="M59.29,76.01c8.67-0.74,18.9-1.39,27.05-1.41"/>
-				<path id="kvg:074f8-Kaisho-s11" kvg:type="㇐a"/>
+				<path id="kvg:074f8-Kaisho-s11" kvg:type="㇐a" d=""/>
 			</g>
 		</g>
 	</g>
diff --git a/kanji_mismatch/07503-Kaisho.svg b/kanji/07503-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/07503-Kaisho.svg
rename to kanji/07503-Kaisho.svg
index 0cd75376e..b34754b46 100644
--- a/kanji_mismatch/07503-Kaisho.svg
+++ b/kanji/07503-Kaisho.svg
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:07503-Kaisho-s12" kvg:type="㇀" d="M41.24,70.04c0.87,0.21,2.28,0.62,3.14,0.5C52,69.5,63.5,67.75,68.65,67.25c1.34-0.13,3.38,1.67,2.66,3.03C70,72.75,68,78.25,67.25,83.75c-1.42,10.4,2.75,12.5,12.5,12.5C91.5,96.25,93,95,93,86.75"/>
 		<path id="kvg:07503-Kaisho-s13" kvg:type="㇈" d="M45.1,75.08c3.15,1.39,8.15,5.72,8.94,7.88"/>
 		<g id="kvg:07503-Kaisho-g7" kvg:element="丶">
-			<path id="kvg:07503-Kaisho-s14" kvg:type="㇔"/>
+			<path id="kvg:07503-Kaisho-s14" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07505-Kaisho.svg b/kanji/07505-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/07505-Kaisho.svg
rename to kanji/07505-Kaisho.svg
index 467e68e40..f1f6d1bd6 100644
--- a/kanji_mismatch/07505-Kaisho.svg
+++ b/kanji/07505-Kaisho.svg
@@ -58,7 +58,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:07505-Kaisho-s11" kvg:type="㇐a" d="M72.39,33.32c0.19,0.72,0.74,1.69,0.76,3.13c0.14,10.04,0.05,37.34,0.05,40.17"/>
 			<path id="kvg:07505-Kaisho-s12" kvg:type="㇑a" d="M59.62,65.89c0.52,0.18,1.48,0.2,2,0.18c5.44-0.21,16.91-2.07,23.65-2.11c0.87,0,1.4,0.09,1.83,0.18"/>
 			<path id="kvg:07505-Kaisho-s13" kvg:type="㇐" d="M54.59,79.17c0.76,0.29,2.16,0.33,2.92,0.29c7.91-0.48,23.79-2.18,33.21-2.16c1.26,0,2.03,0.14,2.66,0.28"/>
-			<path id="kvg:07505-Kaisho-s14" kvg:type="㇐"/>
+			<path id="kvg:07505-Kaisho-s14" kvg:type="㇐" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07511-Kaisho.svg b/kanji/07511-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/07511-Kaisho.svg
rename to kanji/07511-Kaisho.svg
index f1da40a2e..a318c6529 100644
--- a/kanji_mismatch/07511-Kaisho.svg
+++ b/kanji/07511-Kaisho.svg
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:07511-Kaisho-s14" kvg:type="㇀" d="M66.74,43.04c0.87,0.21,1.79,0.69,2.64,0.5c2.39-0.54,11.94-3.04,14.27-3.79c1-0.32,2.35,1.5,2.16,3.03c-0.57,4.49-2.44,20.71-4.24,31.51c-2.56,15.38-3.07,20.2,5.66,20.52c4.76,0.17,8.08-0.31,8.25-10.04"/>
 		<path id="kvg:07511-Kaisho-s15" kvg:type="㇈" d="M65.85,55.83c3.15,2.36,8.15,9.71,8.94,13.38"/>
 		<g id="kvg:07511-Kaisho-g6" kvg:element="丶">
-			<path id="kvg:07511-Kaisho-s16" kvg:type="㇔"/>
+			<path id="kvg:07511-Kaisho-s16" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07513-Kaisho.svg b/kanji/07513-Kaisho.svg
similarity index 99%
rename from kanji_mismatch/07513-Kaisho.svg
rename to kanji/07513-Kaisho.svg
index b5e1e5c83..961125707 100644
--- a/kanji_mismatch/07513-Kaisho.svg
+++ b/kanji/07513-Kaisho.svg
@@ -76,7 +76,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:07513-Kaisho-s16" kvg:type="㇀" d="M42.24,72.04c0.87,0.21,2.27,0.05,3.14,0c8.87-0.54,20.12-2.29,26.27-3.29c1.33-0.22,3.25,1.6,2.66,3.03c-2.56,6.22-3.25,8.98-4.06,14.47c-1,6.75,1.25,11.5,12.5,11c9.24-0.41,11.75-1.5,11.75-9"/>
 		<path id="kvg:07513-Kaisho-s17" kvg:type="㇈" d="M47.85,77.83c2.71,1.17,7.01,4.81,7.69,6.63"/>
 		<g id="kvg:07513-Kaisho-g12" kvg:element="丶">
-			<path id="kvg:07513-Kaisho-s18" kvg:type="㇔"/>
+			<path id="kvg:07513-Kaisho-s18" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07515-Kaisho.svg b/kanji/07515-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/07515-Kaisho.svg
rename to kanji/07515-Kaisho.svg
index 57175f0ec..d3e18bba7 100644
--- a/kanji_mismatch/07515-Kaisho.svg
+++ b/kanji/07515-Kaisho.svg
@@ -68,7 +68,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:07515-Kaisho-s16" kvg:type="㇀" d="M43.74,76.54c0.87,0.21,2.27,0.06,3.14,0c7.37-0.54,16.59-2.28,22.27-2.29c1.35,0,2.85,1.5,2.66,3.03c-0.57,4.49-1.97,6.45-2.56,11.97c-0.75,7-0.75,9.5,12.5,9.5c9.25,0,10.75-1.5,10.75-9"/>
 		<path id="kvg:07515-Kaisho-s17" kvg:type="㇈" d="M47.1,82.33c2.62,0.99,6.78,4.09,7.44,5.63"/>
 		<g id="kvg:07515-Kaisho-g8" kvg:element="丶">
-			<path id="kvg:07515-Kaisho-s18" kvg:type="㇔"/>
+			<path id="kvg:07515-Kaisho-s18" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07725-Kaisho.svg b/kanji/07725-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/07725-Kaisho.svg
rename to kanji/07725-Kaisho.svg
diff --git a/kanji_mismatch/07725-KaishoHzFst.svg b/kanji/07725-KaishoHzFst.svg
similarity index 100%
rename from kanji_mismatch/07725-KaishoHzFst.svg
rename to kanji/07725-KaishoHzFst.svg
diff --git a/kanji_mismatch/07726-Kaisho.svg b/kanji/07726-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/07726-Kaisho.svg
rename to kanji/07726-Kaisho.svg
diff --git a/kanji_mismatch/07726-KaishoHzFst.svg b/kanji/07726-KaishoHzFst.svg
similarity index 100%
rename from kanji_mismatch/07726-KaishoHzFst.svg
rename to kanji/07726-KaishoHzFst.svg
diff --git a/kanji_mismatch/079bd-Kaisho.svg b/kanji/079bd-Kaisho.svg
similarity index 98%
rename from kanji_mismatch/079bd-Kaisho.svg
rename to kanji/079bd-Kaisho.svg
index f7e41dc24..c1dd0d960 100644
--- a/kanji_mismatch/079bd-Kaisho.svg
+++ b/kanji/079bd-Kaisho.svg
@@ -63,7 +63,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:079bd-Kaisho-s10" kvg:type="㇆" d="M26.89,70.29C35.5,69.75,79.21,67,80.8,66.75c3.4-0.55,5.65,1.34,5.53,2.96c-0.3,3.92-3.3,20.72-5.98,25.69c-3.34,6.21-4.56,3.82-7.57-0.05"/>
 			<path id="kvg:079bd-Kaisho-s11" kvg:type="㇑" d="M52.63,62.5c0.38,0.39,0.6,1.4,0.38,1.91c-2.76,6.35-8.52,12.85-13.67,17.31c-1.63,1.41-1.63,1.73,0.75,1.41c5.01-0.66,17.91-3.38,27.83-4.72"/>
 			<path id="kvg:079bd-Kaisho-s12" kvg:type="㇐" d="M61.29,71.34c3.72,2.36,9.62,9.71,10.55,13.38"/>
-			<path id="kvg:079bd-Kaisho-s13" kvg:type="㇔"/>
+			<path id="kvg:079bd-Kaisho-s13" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/07b08-Jinmei.svg b/kanji/07b08-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/07b08-Jinmei.svg
rename to kanji/07b08-Jinmei.svg
diff --git a/kanji_mismatch/07baa-JinmeiKaisho.svg b/kanji/07baa-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/07baa-JinmeiKaisho.svg
rename to kanji/07baa-JinmeiKaisho.svg
diff --git a/kanji_mismatch/07c2a-Kaisho.svg b/kanji/07c2a-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/07c2a-Kaisho.svg
rename to kanji/07c2a-Kaisho.svg
diff --git a/kanji_mismatch/07dfb-Kaisho.svg b/kanji/07dfb-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/07dfb-Kaisho.svg
rename to kanji/07dfb-Kaisho.svg
diff --git a/kanji_mismatch/07dfb-KaishoVtFst.svg b/kanji/07dfb-KaishoVtFst.svg
similarity index 100%
rename from kanji_mismatch/07dfb-KaishoVtFst.svg
rename to kanji/07dfb-KaishoVtFst.svg
diff --git a/kanji_mismatch/07e4d-JinmeiKaisho.svg b/kanji/07e4d-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/07e4d-JinmeiKaisho.svg
rename to kanji/07e4d-JinmeiKaisho.svg
diff --git a/kanji_mismatch/07e6d-Kaisho.svg b/kanji/07e6d-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/07e6d-Kaisho.svg
rename to kanji/07e6d-Kaisho.svg
diff --git a/kanji_mismatch/07e94-Kaisho.svg b/kanji/07e94-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/07e94-Kaisho.svg
rename to kanji/07e94-Kaisho.svg
diff --git a/kanji_mismatch/081cd-KaishoVt12.svg b/kanji/081cd-KaishoVt12.svg
similarity index 98%
rename from kanji_mismatch/081cd-KaishoVt12.svg
rename to kanji/081cd-KaishoVt12.svg
index 3e71984e0..4aa878ba8 100644
--- a/kanji_mismatch/081cd-KaishoVt12.svg
+++ b/kanji/081cd-KaishoVt12.svg
@@ -66,7 +66,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:081cd-KaishoVt12-s18" kvg:type="㇐" d="M59.06,72.13c0.69-0.04,1.42-0.08,2.19-0.12c5.03-0.27,10.05-0.55,15.08-0.82c0.79-0.04,1.55-0.08,2.27-0.12"/>
 			</g>
 		</g>
-		<path id="kvg:081cd-KaishoVt12-s19" kvg:type="㇑"/>
+		<path id="kvg:081cd-KaishoVt12-s19" kvg:type="㇑" d=""/>
 	</g>
 </g>
 </g>
diff --git a/kanji/08207-LeFst.svg b/kanji/08207-LeFst.svg
index dc4c0c222..3f8eb10a8 100644
--- a/kanji/08207-LeFst.svg
+++ b/kanji/08207-LeFst.svg
@@ -38,29 +38,29 @@ kvg:type CDATA #IMPLIED >
 <g id="kvg:StrokePaths_08207-LeFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
 <g id="kvg:08207-LeFst" kvg:element="與">
 	<g id="kvg:08207-LeFst-g1" kvg:position="top">
-		<g id="kvg:08207-LeFst-g3" kvg:element="𦥑" kvg:variant="true" kvg:original="臼" kvg:radical="tradit">
+		<g id="kvg:08207-LeFst-g2" kvg:element="𦥑" kvg:variant="true" kvg:original="臼" kvg:radical="tradit">
 			<path id="kvg:08207-LeFst-s1" kvg:type="㇐" d="M39.35,16.25c0.03,0.23,0.13,0.65-0.07,0.9c-2.42,3.17-5.99,6.08-12.29,8.64"/>
 			<path id="kvg:08207-LeFst-s2" kvg:type="㇇" d="M22.12,26.5c1.09,0.5,1.82,2.24,1.96,3.25c0.42,3,2.17,33,2.92,42.25"/>
 			<path id="kvg:08207-LeFst-s3" kvg:type="㇑" d="M25,40.75c3.48-0.52,8.94-1.53,11.78-2.09c1.25-0.25,2.78-0.41,3.47-0.41"/>
 			<path id="kvg:08207-LeFst-s4" kvg:type="㇒" d="M26.75,55.75c4-0.5,6.97-1.34,10.02-1.61C37.85,54.05,39.28,54,40,54"/>
 		</g>
-		<g id="kvg:08207-LeFst-g2" kvg:phon="与V">
+		<g id="kvg:08207-LeFst-g3" kvg:phon="与V">
 			<path id="kvg:08207-LeFst-s5" kvg:type="㇑" d="M49.54,20.78c4.86-0.3,10.54-2.02,13.75-2.32c0.91-0.08,1.75,0.11,2.21,0.22"/>
 			<path id="kvg:08207-LeFst-s6" kvg:type="㇐" d="M50.27,12.8c0.79,0.98,0.67,3.63,0.16,5.18c-0.59,1.77-2.26,12.03-2.66,12.96c-1.01,2.32,0.24,3.07,2.6,2.43c1.68-0.45,5.14-1.15,9.37-1.66c1.77-0.21,3.18,0.91,2.87,2.67c-1.58,9.05-3.85,24.37-5.11,35.42"/>
 			<path id="kvg:08207-LeFst-s7" kvg:type="㇐" d="M46.62,45.5c1.09,0.5,2.15,2.24,1.96,3.25c-0.33,1.75-1.33,12.5-2.58,21"/>
-</g>
-		<g id="kvg:08207-LeFst-g3" kvg:element="𦥑" kvg:variant="true" kvg:original="臼" kvg:radical="tradit">
+		</g>
+		<g id="kvg:08207-LeFst-g4" kvg:element="𦥑" kvg:variant="true" kvg:original="臼" kvg:radical="tradit">
 			<path id="kvg:08207-LeFst-s8" kvg:type="㇕" d="M71.85,21.23c1.4,0.02,2.34,0.54,4.23,0.12c4.93-1.1,10.02-1.5,10.59-1.5c1.61,0,2.45,1.19,2.1,2.75c-1.52,6.9-4.02,36.15-5.02,45.65"/>
 			<path id="kvg:08207-LeFst-s9" kvg:type="㇐" d="M70.75,35.75c0.71,0.16,2.17,0.71,3.25,0.68c3.87-0.11,11.27-0.68,12.25-0.68"/>
 			<path id="kvg:08207-LeFst-s10" kvg:type="㇐" d="M69.25,52c0.62,0.13,2.3,0.7,3,0.73c3.27,0.13,10-0.48,13-0.73"/>
 		</g>
 		<path id="kvg:08207-LeFst-s11" kvg:type="㇐" d="M13,72.45c1.52,0.54,4.3,0.64,5.82,0.54c11.93-0.74,53.43-3.74,72.61-4.23c2.53-0.06,4.05,0.26,5.31,0.53"/>
 	</g>
-	<g id="kvg:08207-LeFst-g4" kvg:element="八" kvg:position="bottom" kvg:radical="nelson">
-		<g id="kvg:08207-LeFst-g5" kvg:position="left">
+	<g id="kvg:08207-LeFst-g5" kvg:element="八" kvg:position="bottom" kvg:radical="nelson">
+		<g id="kvg:08207-LeFst-g6" kvg:position="left">
 			<path id="kvg:08207-LeFst-s12" kvg:type="㇒" d="M37.5,79.14c0.06,0.43,0.12,1.11-0.12,1.73c-1.43,3.66-9.62,11.68-20.82,16.59"/>
 		</g>
-		<g id="kvg:08207-LeFst-g6" kvg:position="right">
+		<g id="kvg:08207-LeFst-g7" kvg:position="right">
 			<path id="kvg:08207-LeFst-s13" kvg:type="㇏" d="M67.27,79.33c7.16,3.11,18.5,12.79,20.29,17.63"/>
 		</g>
 	</g>
diff --git a/kanji_mismatch/08258-MdFst.svg b/kanji/08258-MdFst.svg
similarity index 98%
rename from kanji_mismatch/08258-MdFst.svg
rename to kanji/08258-MdFst.svg
index 4aa5b6c78..5bcc4eba2 100644
--- a/kanji_mismatch/08258-MdFst.svg
+++ b/kanji/08258-MdFst.svg
@@ -62,7 +62,7 @@ kvg:type CDATA #IMPLIED >
 		</g>
 		<g id="kvg:08258-MdFst-g6" kvg:element="又" kvg:position="bottom">
 			<path id="kvg:08258-MdFst-s15" kvg:type="㇇" d="M50.75,66.58c3.92,0.11,28.9,22.22,39.38,27.85c2.24,1.21,3.88,2.01,5.97,2.41"/>
-			<path id="kvg:08258-MdFst-s16" kvg:type="㇏"/>
+			<path id="kvg:08258-MdFst-s16" kvg:type="㇏" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/0854b-HzFst.svg b/kanji/0854b-HzFst.svg
similarity index 98%
rename from kanji_mismatch/0854b-HzFst.svg
rename to kanji/0854b-HzFst.svg
index 2ac9c926f..ee03b77ba 100644
--- a/kanji_mismatch/0854b-HzFst.svg
+++ b/kanji/0854b-HzFst.svg
@@ -66,7 +66,7 @@ kvg:type CDATA #IMPLIED >
 					<path id="kvg:0854b-HzFst-s13" kvg:type="㇑" d="M57.45,67.21c0.95,0.46,1.51,2.08,1.7,3.01c0.19,0.93,0,19.4-0.19,25.19"/>
 				</g>
 				<path id="kvg:0854b-HzFst-s14" kvg:type="㇑" d="M46,96.33c0.64,0.16,2.36,0.53,4.08,0.47c9.24-0.31,26.74-2.58,38.49-2.58c1.72,0,4.7,0.31,5.68,0.47"/>
-				<path id="kvg:0854b-HzFst-s15" kvg:type="㇐"/>
+				<path id="kvg:0854b-HzFst-s15" kvg:type="㇐" d=""/>
 			</g>
 		</g>
 	</g>
diff --git a/kanji_mismatch/085ba-KaishoVt12.svg b/kanji/085ba-KaishoVt12.svg
similarity index 98%
rename from kanji_mismatch/085ba-KaishoVt12.svg
rename to kanji/085ba-KaishoVt12.svg
index 9eaf3fd7f..0b3f01de1 100644
--- a/kanji_mismatch/085ba-KaishoVt12.svg
+++ b/kanji/085ba-KaishoVt12.svg
@@ -65,7 +65,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:085ba-KaishoVt12-s17" kvg:type="㇐" d="M76.08,61.33c0.64,0.47,1.68,2.26,1.68,3.18c0,3.66-0.02,33-0.09,35.62"/>
 			</g>
 		</g>
-		<path id="kvg:085ba-KaishoVt12-s18" kvg:type="㇑"/>
+		<path id="kvg:085ba-KaishoVt12-s18" kvg:type="㇑" d=""/>
 	</g>
 </g>
 </g>
diff --git a/kanji_mismatch/08749-JinmeiKaisho.svg b/kanji/08749-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/08749-JinmeiKaisho.svg
rename to kanji/08749-JinmeiKaisho.svg
diff --git a/kanji_mismatch/08836-Kaisho.svg b/kanji/08836-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/08836-Kaisho.svg
rename to kanji/08836-Kaisho.svg
diff --git a/kanji_mismatch/08956-Jinmei.svg b/kanji/08956-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/08956-Jinmei.svg
rename to kanji/08956-Jinmei.svg
diff --git a/kanji_mismatch/089dc-Kaisho.svg b/kanji/089dc-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/089dc-Kaisho.svg
rename to kanji/089dc-Kaisho.svg
diff --git a/kanji_mismatch/089dc-KaishoHzFst.svg b/kanji/089dc-KaishoHzFst.svg
similarity index 100%
rename from kanji_mismatch/089dc-KaishoHzFst.svg
rename to kanji/089dc-KaishoHzFst.svg
diff --git a/kanji_mismatch/08cb2-Kaisho.svg b/kanji/08cb2-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/08cb2-Kaisho.svg
rename to kanji/08cb2-Kaisho.svg
diff --git a/kanji_mismatch/08cb2-KaishoHzFst.svg b/kanji/08cb2-KaishoHzFst.svg
similarity index 100%
rename from kanji_mismatch/08cb2-KaishoHzFst.svg
rename to kanji/08cb2-KaishoHzFst.svg
diff --git a/kanji_mismatch/08e8b-KaishoVt12.svg b/kanji/08e8b-KaishoVt12.svg
similarity index 99%
rename from kanji_mismatch/08e8b-KaishoVt12.svg
rename to kanji/08e8b-KaishoVt12.svg
index cafd6300b..e35e60ba5 100644
--- a/kanji_mismatch/08e8b-KaishoVt12.svg
+++ b/kanji/08e8b-KaishoVt12.svg
@@ -71,7 +71,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:08e8b-KaishoVt12-s21" kvg:type="㇐" d="M59.76,74.7c0.78-0.06,1.61-0.12,2.48-0.19c5.7-0.43,11.4-0.87,17.09-1.3c0.89-0.07,1.75-0.13,2.56-0.19"/>
 			</g>
 		</g>
-		<path id="kvg:08e8b-KaishoVt12-s22" kvg:type="㇑"/>
+		<path id="kvg:08e8b-KaishoVt12-s22" kvg:type="㇑" d=""/>
 	</g>
 </g>
 </g>
diff --git a/kanji_mismatch/0973d-KaishoVt12.svg b/kanji/0973d-KaishoVt12.svg
similarity index 99%
rename from kanji_mismatch/0973d-KaishoVt12.svg
rename to kanji/0973d-KaishoVt12.svg
index 17a466be2..85cfe5933 100644
--- a/kanji_mismatch/0973d-KaishoVt12.svg
+++ b/kanji/0973d-KaishoVt12.svg
@@ -70,7 +70,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:0973d-KaishoVt12-s22" kvg:type="㇐" d="M73.74,69.42c0.64,0.42,1.7,2.05,1.7,2.89c0,3.32-0.02,26.95-0.08,29.33"/>
 			</g>
 		</g>
-		<path id="kvg:0973d-KaishoVt12-s23" kvg:type="㇑"/>
+		<path id="kvg:0973d-KaishoVt12-s23" kvg:type="㇑" d=""/>
 	</g>
 </g>
 </g>
diff --git a/kanji_mismatch/097d3-Kaisho.svg b/kanji/097d3-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/097d3-Kaisho.svg
rename to kanji/097d3-Kaisho.svg
diff --git a/kanji_mismatch/097dc-HzFst.svg b/kanji/097dc-HzFst.svg
similarity index 100%
rename from kanji_mismatch/097dc-HzFst.svg
rename to kanji/097dc-HzFst.svg
diff --git a/kanji_mismatch/0982c-Jinmei.svg b/kanji/0982c-Jinmei.svg
similarity index 100%
rename from kanji_mismatch/0982c-Jinmei.svg
rename to kanji/0982c-Jinmei.svg
diff --git a/kanji_mismatch/0982c-JinmeiKaisho.svg b/kanji/0982c-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/0982c-JinmeiKaisho.svg
rename to kanji/0982c-JinmeiKaisho.svg
diff --git a/kanji_mismatch/0985b-JinmeiKaisho.svg b/kanji/0985b-JinmeiKaisho.svg
similarity index 92%
rename from kanji_mismatch/0985b-JinmeiKaisho.svg
rename to kanji/0985b-JinmeiKaisho.svg
index e3407c6e4..f5cebcabe 100644
--- a/kanji_mismatch/0985b-JinmeiKaisho.svg
+++ b/kanji/0985b-JinmeiKaisho.svg
@@ -78,19 +78,19 @@ kvg:type CDATA #IMPLIED >
 	<g id="kvg:0985b-JinmeiKaisho-g11" kvg:element="頁" kvg:position="right" kvg:radical="general">
 		<g id="kvg:0985b-JinmeiKaisho-g12" kvg:position="top">
 			<path id="kvg:0985b-JinmeiKaisho-s19" kvg:type="㇐" d="M84.32,84.62c4.78,3.51,10.43,9.89,11.73,12.96"/>
-			<path id="kvg:0985b-JinmeiKaisho-s20" kvg:type="㇒"/>
+			<path id="kvg:0985b-JinmeiKaisho-s20" kvg:type="㇒" d=""/>
 		</g>
 		<g id="kvg:0985b-JinmeiKaisho-g13" kvg:element="貝" kvg:position="bottom">
 			<g id="kvg:0985b-JinmeiKaisho-g14" kvg:element="目" kvg:position="top">
-				<path id="kvg:0985b-JinmeiKaisho-s21" kvg:type="㇑"/>
-				<path id="kvg:0985b-JinmeiKaisho-s22" kvg:type="㇕a"/>
-				<path id="kvg:0985b-JinmeiKaisho-s23" kvg:type="㇐a"/>
-				<path id="kvg:0985b-JinmeiKaisho-s24" kvg:type="㇐a"/>
-				<path id="kvg:0985b-JinmeiKaisho-s25" kvg:type="㇐a"/>
+				<path id="kvg:0985b-JinmeiKaisho-s21" kvg:type="㇑" d=""/>
+				<path id="kvg:0985b-JinmeiKaisho-s22" kvg:type="㇕a" d=""/>
+				<path id="kvg:0985b-JinmeiKaisho-s23" kvg:type="㇐a" d=""/>
+				<path id="kvg:0985b-JinmeiKaisho-s24" kvg:type="㇐a" d=""/>
+				<path id="kvg:0985b-JinmeiKaisho-s25" kvg:type="㇐a" d=""/>
 			</g>
 			<g id="kvg:0985b-JinmeiKaisho-g15" kvg:position="bottom">
-				<path id="kvg:0985b-JinmeiKaisho-s26" kvg:type="㇒"/>
-				<path id="kvg:0985b-JinmeiKaisho-s27" kvg:type="㇔"/>
+				<path id="kvg:0985b-JinmeiKaisho-s26" kvg:type="㇒" d=""/>
+				<path id="kvg:0985b-JinmeiKaisho-s27" kvg:type="㇔" d=""/>
 			</g>
 		</g>
 	</g>
diff --git a/kanji_mismatch/09957-JinmeiKaisho.svg b/kanji/09957-JinmeiKaisho.svg
similarity index 100%
rename from kanji_mismatch/09957-JinmeiKaisho.svg
rename to kanji/09957-JinmeiKaisho.svg
diff --git a/kanji_mismatch/09b51-Kaisho.svg b/kanji/09b51-Kaisho.svg
similarity index 99%
rename from kanji_mismatch/09b51-Kaisho.svg
rename to kanji/09b51-Kaisho.svg
index 27c8231e6..0d65eab8b 100644
--- a/kanji_mismatch/09b51-Kaisho.svg
+++ b/kanji/09b51-Kaisho.svg
@@ -82,7 +82,7 @@ kvg:type CDATA #IMPLIED >
 		<path id="kvg:09b51-Kaisho-s18" kvg:type="㇆" d="M57.08,56.98c5.07-0.64,29.81-4.09,30.83-4.09c1.47,0,2.4,0.48,2.4,1.91c0,3.02,0.19,19.96,0.2,25.31c0.01,7.44-4.64,3.14-6,1.63"/>
 		<path id="kvg:09b51-Kaisho-s19" kvg:type="㇑" d="M72.72,47.79c0.22,0.42,0.28,2.07,0.07,2.59c-2.95,7.5-4.53,13.09-7.56,17.9c-0.96,1.52-0.95,1.98,0.44,1.52c3.39-1.12,9.84-2.13,14.56-4.01"/>
 		<path id="kvg:09b51-Kaisho-s20" kvg:type="㇐" d="M77,59.08c2.14,2.11,5.53,8.66,6.06,11.94"/>
-		<path id="kvg:09b51-Kaisho-s21" kvg:type="㇔"/>
+		<path id="kvg:09b51-Kaisho-s21" kvg:type="㇔" d=""/>
 	</g>
 </g>
 </g>
diff --git a/kanji_mismatch/09c57-Kaisho.svg b/kanji/09c57-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/09c57-Kaisho.svg
rename to kanji/09c57-Kaisho.svg
diff --git a/kanji_mismatch/09e9f-Kaisho.svg b/kanji/09e9f-Kaisho.svg
similarity index 100%
rename from kanji_mismatch/09e9f-Kaisho.svg
rename to kanji/09e9f-Kaisho.svg
diff --git a/kanji_mismatch/09ed0-Kaisho.svg b/kanji/09ed0-Kaisho.svg
similarity index 99%
rename from kanji_mismatch/09ed0-Kaisho.svg
rename to kanji/09ed0-Kaisho.svg
index b69d19c81..46e4cb7ba 100644
--- a/kanji_mismatch/09ed0-Kaisho.svg
+++ b/kanji/09ed0-Kaisho.svg
@@ -83,7 +83,7 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:09ed0-Kaisho-s20" kvg:type="㇆" d="M54.47,62.06c5.79-0.67,36.19-4.35,37.36-4.35c1.67,0,2.74,0.5,2.74,2.01c0,3.18-0.27,25.03-0.27,31.59c0,9.69-4.72,3.32-6.28,1.72"/>
 			<path id="kvg:09ed0-Kaisho-s21" kvg:type="㇑" d="M73.97,49.78c0.25,0.51,0.32,2.49,0.08,3.11c-3.37,9.02-6.32,17.55-9.78,23.33c-1.09,1.83-0.09,2.88,1.51,2.33c3.87-1.35,10.89-3.36,16.27-5.63"/>
 			<path id="kvg:09ed0-Kaisho-s22" kvg:type="㇐" d="M78.43,66.55c2.44,2.43,6.31,9.98,6.92,13.76"/>
-			<path id="kvg:09ed0-Kaisho-s23" kvg:type="㇔"/>
+			<path id="kvg:09ed0-Kaisho-s23" kvg:type="㇔" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/09f4e-KaishoVt12.svg b/kanji/09f4e-KaishoVt12.svg
similarity index 99%
rename from kanji_mismatch/09f4e-KaishoVt12.svg
rename to kanji/09f4e-KaishoVt12.svg
index becf77773..3c9f5b49e 100644
--- a/kanji_mismatch/09f4e-KaishoVt12.svg
+++ b/kanji/09f4e-KaishoVt12.svg
@@ -75,7 +75,7 @@ kvg:type CDATA #IMPLIED >
 				<path id="kvg:09f4e-KaishoVt12-s21" kvg:type="㇔" d="M59.57,90.77c4.04,2.31,8.81,6.49,9.91,8.51"/>
 			</g>
 		</g>
-		<path id="kvg:09f4e-KaishoVt12-s22" kvg:type="㇑"/>
+		<path id="kvg:09f4e-KaishoVt12-s22" kvg:type="㇑" d=""/>
 	</g>
 </g>
 </g>
diff --git a/kanji_mismatch/09f4f-KaishoVt12.svg b/kanji/09f4f-KaishoVt12.svg
similarity index 99%
rename from kanji_mismatch/09f4f-KaishoVt12.svg
rename to kanji/09f4f-KaishoVt12.svg
index ca7295445..f18ee620a 100644
--- a/kanji_mismatch/09f4f-KaishoVt12.svg
+++ b/kanji/09f4f-KaishoVt12.svg
@@ -78,7 +78,7 @@ kvg:type CDATA #IMPLIED >
 			</g>
 		</g>
 		<g id="kvg:09f4f-KaishoVt12-g10" kvg:element="一">
-			<path id="kvg:09f4f-KaishoVt12-s24" kvg:type="㇐"/>
+			<path id="kvg:09f4f-KaishoVt12-s24" kvg:type="㇐" d=""/>
 		</g>
 	</g>
 </g>
diff --git a/kanji_mismatch/26951-HzFst.svg b/kanji/26951-HzFst.svg
similarity index 100%
rename from kanji_mismatch/26951-HzFst.svg
rename to kanji/26951-HzFst.svg
diff --git a/kanji_mismatch/05ac2-MdFst.svg b/kanji_mismatch/05ac2-MdFst.svg
deleted file mode 100644
index c236c4f59..000000000
--- a/kanji_mismatch/05ac2-MdFst.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2009/2010/2011 Ulrich Apel.
-This work is distributed under the conditions of the Creative Commons
-Attribution-Share Alike 3.0 Licence. This means you are free:
-* to Share - to copy, distribute and transmit the work
-* to Remix - to adapt the work
-
-Under the following conditions:
-* Attribution. You must attribute the work by stating your use of KanjiVG in
-  your own copyright header and linking to KanjiVG's website
-  (http://kanjivg.tagaini.net)
-* Share Alike. If you alter, transform, or build upon this work, you may
-  distribute the resulting work only under the same or similar license to this
-  one.
-
-See http://creativecommons.org/licenses/by-sa/3.0/ for more details.
--->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
-<!ATTLIST g
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-kvg:element CDATA #IMPLIED
-kvg:variant CDATA #IMPLIED
-kvg:partial CDATA #IMPLIED
-kvg:original CDATA #IMPLIED
-kvg:part CDATA #IMPLIED
-kvg:number CDATA #IMPLIED
-kvg:tradForm CDATA #IMPLIED
-kvg:radicalForm CDATA #IMPLIED
-kvg:position CDATA #IMPLIED
-kvg:radical CDATA #IMPLIED
-kvg:phon CDATA #IMPLIED >
-<!ATTLIST path
-xmlns:kvg CDATA #FIXED "http://kanjivg.tagaini.net"
-kvg:type CDATA #IMPLIED >
-]>
-<svg xmlns="http://www.w3.org/2000/svg" width="109" height="109" viewBox="0 0 109 109">
-<g id="kvg:StrokePaths_05ac2-MdFst" style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;">
-<g id="kvg:05ac2-MdFst" kvg:element="嫂">
-	<g id="kvg:05ac2-MdFst-g1" kvg:element="女" kvg:variant="true" kvg:position="left" kvg:radical="general">
-		<path id="kvg:05ac2-MdFst-s1" kvg:type="㇛" d="M26.48,17.37c0.39,1.04,1.08,2.74,0.89,4.24C26.38,29,20.55,54.76,16.23,63.4c-0.89,1.77,0.4,2.46,0.89,2.63c9.38,3.22,18.38,10.62,23.63,18.25"/>
-		<path id="kvg:05ac2-MdFst-s2" kvg:type="㇒" d="M38.25,36.89c0.08,1.27,0.14,4.34-0.16,6.18C35.68,57.91,28.73,78.96,11.5,90"/>
-		<path id="kvg:05ac2-MdFst-s3" kvg:type="㇀/㇐" d="M8.5,46.72c0.75,0.94,1.75,1.62,3.75,1.39c2.15-0.24,21.34-4.35,30.25-6.73"/>
-	</g>
-	<g id="kvg:05ac2-MdFst-g2" kvg:element="叟" kvg:position="right">
-		<g id="kvg:05ac2-MdFst-g3" kvg:position="top">
-			<g id="kvg:05ac2-MdFst-g4" kvg:element="臼" kvg:variant="true">
-				<path id="kvg:05ac2-MdFst-s4" kvg:type="㇒" d="M58.14,16.4c0.03,0.2-0.16,0.97-0.35,1.19c-2.49,2.83-4.8,4.96-10.47,7.21"/>
-				<path id="kvg:05ac2-MdFst-s5" kvg:type="㇑" d="M45.85,23.1c0.6,0.71,1.35,2.29,1.5,3.74c0.55,5.3,1.91,16.61,2.46,23.77"/>
-				<path id="kvg:05ac2-MdFst-s6" kvg:type="㇕" d="M48.39,35.18c2.99-0.32,9.3-2.08,10.01-2.08c0.71,0,1.71,0,2.27,0"/>
-				<path id="kvg:05ac2-MdFst-s7" kvg:type="㇐" d="M73.51,17.74c0.71,0.16,1.28,0.48,2.27,0.48s10.8-1.93,11.94-2.09c1.14-0.16,2.08,0.8,1.99,1.77c-0.85,9.34-3.7,29.4-3.84,30.05"/>
-				<path id="kvg:05ac2-MdFst-s8" kvg:type="㇐" d="M72.94,31.48c0.71,0.16,1.28,0.48,2.27,0.48c0.99,0,11.73-0.82,12.87-0.98"/>
-				<path id="kvg:05ac2-MdFst-s9" kvg:type="㇐" d="M49.95,48.81c3.56-0.57,31.21-2.63,35.56-2.67"/>
-				<path id="kvg:05ac2-MdFst-s10" kvg:type="㇐" d="M65.39,11.75c0.89,0.47,1.43,2.12,1.61,3.07c0.18,0.94,0,38.91-0.18,44.81"/>
-			</g>
-			<g id="kvg:05ac2-MdFst-g5" kvg:element="丨">
-				<path id="kvg:05ac2-MdFst-s11" kvg:type="㇑" d="M47.02,62.21c1.68,0.27,1.91,0.86,5.24,0.27c5.24-0.94,27.45-3.88,29.76-4.28c2.31-0.4,3.3,2.54,2.31,3.89C72.38,78.3,56.82,89.44,37.96,96"/>
-			</g>
-		</g>
-		<g id="kvg:05ac2-MdFst-g6" kvg:element="又" kvg:position="bottom">
-			<path id="kvg:05ac2-MdFst-s12" kvg:type="㇇" d="M51.41,67.44c6.17,0.16,24.17,18.16,38.46,25.33c2.23,1.12,3.85,1.86,5.92,2.23"/>
-			<path id="kvg:05ac2-MdFst-s13" kvg:type="㇏"/>
-		</g>
-	</g>
-</g>
-</g>
-<g id="kvg:StrokeNumbers_05ac2-MdFst" style="font-size:8;fill:#808080">
-	<text transform="matrix(1 0 0 1 19.50 16.63)">1</text>
-	<text transform="matrix(1 0 0 1 31.50 32.50)">2</text>
-	<text transform="matrix(1 0 0 1 0.50 47.50)">3</text>
-	<text transform="matrix(1 0 0 1 50.50 15.40)">4</text>
-	<text transform="matrix(1 0 0 1 39.50 30.58)">5</text>
-	<text transform="matrix(1 0 0 1 52.50 31.18)">6</text>
-	<text transform="matrix(1 0 0 1 71.50 14.50)">7</text>
-	<text transform="matrix(1 0 0 1 71.50 28.60)">8</text>
-	<text transform="matrix(1 0 0 1 52.50 45.78)">9</text>
-	<text transform="matrix(1 0 0 1 58.00 8.45)">10</text>
-	<text transform="matrix(1 0 0 1 42.50 59.50)">11</text>
-	<text transform="matrix(1 0 0 1 44.50 74.05)">12</text>
-</g>
-</svg>