diff --git a/NotoSansCJKjp-hinted/NotoSansCJKjp-Black.otf b/src/NotoSansCJKjp-Black.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansCJKjp-Black.otf
rename to src/NotoSansCJKjp-Black.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansCJKjp-Bold.otf b/src/NotoSansCJKjp-Bold.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansCJKjp-Bold.otf
rename to src/NotoSansCJKjp-Bold.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansCJKjp-DemiLight.otf b/src/NotoSansCJKjp-DemiLight.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansCJKjp-DemiLight.otf
rename to src/NotoSansCJKjp-DemiLight.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansCJKjp-Light.otf b/src/NotoSansCJKjp-Light.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansCJKjp-Light.otf
rename to src/NotoSansCJKjp-Light.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansCJKjp-Medium.otf b/src/NotoSansCJKjp-Medium.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansCJKjp-Medium.otf
rename to src/NotoSansCJKjp-Medium.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansCJKjp-Regular.otf b/src/NotoSansCJKjp-Regular.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansCJKjp-Regular.otf
rename to src/NotoSansCJKjp-Regular.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansCJKjp-Thin.otf b/src/NotoSansCJKjp-Thin.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansCJKjp-Thin.otf
rename to src/NotoSansCJKjp-Thin.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansMonoCJKjp-Bold.otf b/src/NotoSansMonoCJKjp-Bold.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansMonoCJKjp-Bold.otf
rename to src/NotoSansMonoCJKjp-Bold.otf
diff --git a/NotoSansCJKjp-hinted/NotoSansMonoCJKjp-Regular.otf b/src/NotoSansMonoCJKjp-Regular.otf
similarity index 100%
rename from NotoSansCJKjp-hinted/NotoSansMonoCJKjp-Regular.otf
rename to src/NotoSansMonoCJKjp-Regular.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Black.eot b/webfonts/NotoSansCJKjp-Black.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Black.eot
rename to webfonts/NotoSansCJKjp-Black.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Black.otf b/webfonts/NotoSansCJKjp-Black.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Black.otf
rename to webfonts/NotoSansCJKjp-Black.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Black.woff b/webfonts/NotoSansCJKjp-Black.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Black.woff
rename to webfonts/NotoSansCJKjp-Black.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Bold.eot b/webfonts/NotoSansCJKjp-Bold.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Bold.eot
rename to webfonts/NotoSansCJKjp-Bold.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Bold.otf b/webfonts/NotoSansCJKjp-Bold.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Bold.otf
rename to webfonts/NotoSansCJKjp-Bold.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Bold.woff b/webfonts/NotoSansCJKjp-Bold.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Bold.woff
rename to webfonts/NotoSansCJKjp-Bold.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-DemiLight.eot b/webfonts/NotoSansCJKjp-DemiLight.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-DemiLight.eot
rename to webfonts/NotoSansCJKjp-DemiLight.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-DemiLight.otf b/webfonts/NotoSansCJKjp-DemiLight.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-DemiLight.otf
rename to webfonts/NotoSansCJKjp-DemiLight.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-DemiLight.woff b/webfonts/NotoSansCJKjp-DemiLight.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-DemiLight.woff
rename to webfonts/NotoSansCJKjp-DemiLight.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Light.eot b/webfonts/NotoSansCJKjp-Light.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Light.eot
rename to webfonts/NotoSansCJKjp-Light.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Light.otf b/webfonts/NotoSansCJKjp-Light.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Light.otf
rename to webfonts/NotoSansCJKjp-Light.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Light.woff b/webfonts/NotoSansCJKjp-Light.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Light.woff
rename to webfonts/NotoSansCJKjp-Light.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Medium.eot b/webfonts/NotoSansCJKjp-Medium.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Medium.eot
rename to webfonts/NotoSansCJKjp-Medium.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Medium.otf b/webfonts/NotoSansCJKjp-Medium.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Medium.otf
rename to webfonts/NotoSansCJKjp-Medium.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Medium.woff b/webfonts/NotoSansCJKjp-Medium.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Medium.woff
rename to webfonts/NotoSansCJKjp-Medium.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Regular.eot b/webfonts/NotoSansCJKjp-Regular.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Regular.eot
rename to webfonts/NotoSansCJKjp-Regular.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Regular.otf b/webfonts/NotoSansCJKjp-Regular.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Regular.otf
rename to webfonts/NotoSansCJKjp-Regular.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Regular.woff b/webfonts/NotoSansCJKjp-Regular.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Regular.woff
rename to webfonts/NotoSansCJKjp-Regular.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Thin.eot b/webfonts/NotoSansCJKjp-Thin.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Thin.eot
rename to webfonts/NotoSansCJKjp-Thin.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Thin.otf b/webfonts/NotoSansCJKjp-Thin.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Thin.otf
rename to webfonts/NotoSansCJKjp-Thin.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansCJKjp-Thin.woff b/webfonts/NotoSansCJKjp-Thin.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansCJKjp-Thin.woff
rename to webfonts/NotoSansCJKjp-Thin.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Bold.eot b/webfonts/NotoSansMonoCJKjp-Bold.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Bold.eot
rename to webfonts/NotoSansMonoCJKjp-Bold.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Bold.otf b/webfonts/NotoSansMonoCJKjp-Bold.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Bold.otf
rename to webfonts/NotoSansMonoCJKjp-Bold.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Bold.woff b/webfonts/NotoSansMonoCJKjp-Bold.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Bold.woff
rename to webfonts/NotoSansMonoCJKjp-Bold.woff
diff --git a/NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Regular.eot b/webfonts/NotoSansMonoCJKjp-Regular.eot
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Regular.eot
rename to webfonts/NotoSansMonoCJKjp-Regular.eot
diff --git a/NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Regular.otf b/webfonts/NotoSansMonoCJKjp-Regular.otf
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Regular.otf
rename to webfonts/NotoSansMonoCJKjp-Regular.otf
diff --git a/NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Regular.woff b/webfonts/NotoSansMonoCJKjp-Regular.woff
similarity index 100%
rename from NotoSansCJKjp-webfonts/NotoSansMonoCJKjp-Regular.woff
rename to webfonts/NotoSansMonoCJKjp-Regular.woff