diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40bb141..26756ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,74 +37,74 @@ configure_file(
 include_directories("${CMAKE_BINARY_DIR}")
 
 add_library(sj3lib
-    sj3lib/level1.c
-    sj3lib/sj.c
-    sj3lib/string.c
+    lib/sj3lib/level1.c
+    lib/sj3lib/sj.c
+    lib/sj3lib/string.c
 )
 target_include_directories(sj3lib
     PRIVATE include
 )
 
 add_library(kanakan
-    kanakan/adddic.c
-    kanakan/addelcmn.c
-    kanakan/alloc.c
-    kanakan/charsize.c
-    kanakan/chrtbl.c
-    kanakan/cl2knj.c
-    kanakan/clstudy.c
-    kanakan/cmpstr.c
-    kanakan/conjunc.c
-    kanakan/connect.c
-    kanakan/cvtclknj.c
-    kanakan/cvtdict.c
-    kanakan/cvtkanji.c
-    kanakan/deldic.c
-    kanakan/depend.c
-    kanakan/dict.c
-    kanakan/functbl.c
-    kanakan/fuzoku.c
-    kanakan/fzkyomi.c
-    kanakan/getkanji.c
-    kanakan/getrank.c
-    kanakan/global.c
-    kanakan/hzstrlen.c
-    kanakan/init.c
-    kanakan/istrcmp.c
-    kanakan/memory.c
-    kanakan/mk2claus.c
-    kanakan/mkbunset.c
-    kanakan/mkjiritu.c
-    kanakan/mkkouho.c
-    kanakan/mknumber.c
-    kanakan/mvmemd.c
-    kanakan/mvmemi.c
-    kanakan/peepdic.c
-    kanakan/ph2knj.c
-    kanakan/ph_khtbl.c
-    kanakan/priority.c
-    kanakan/prtytbl.c
-    kanakan/s2ctbl.c
-    kanakan/selclrec.c
-    kanakan/selsuuji.c
-    kanakan/setconj.c
-    kanakan/setjrec.c
-    kanakan/setkouho.c
-    kanakan/setubi.c
-    kanakan/sj2code.c
-    kanakan/skiphblk.c
-    kanakan/skipkstr.c
-    kanakan/srchdict.c
-    kanakan/srchhead.c
-    kanakan/srchidx.c
-    kanakan/srchnum.c
-    kanakan/stbtbl.c
-    kanakan/stttbl.c
-    kanakan/study.c
-    kanakan/suujitbl.c
-    kanakan/terminat.c
-    kanakan/termtbl.c
-    kanakan/wakachi.c
+    lib/kanakan/adddic.c
+    lib/kanakan/addelcmn.c
+    lib/kanakan/alloc.c
+    lib/kanakan/charsize.c
+    lib/kanakan/chrtbl.c
+    lib/kanakan/cl2knj.c
+    lib/kanakan/clstudy.c
+    lib/kanakan/cmpstr.c
+    lib/kanakan/conjunc.c
+    lib/kanakan/connect.c
+    lib/kanakan/cvtclknj.c
+    lib/kanakan/cvtdict.c
+    lib/kanakan/cvtkanji.c
+    lib/kanakan/deldic.c
+    lib/kanakan/depend.c
+    lib/kanakan/dict.c
+    lib/kanakan/functbl.c
+    lib/kanakan/fuzoku.c
+    lib/kanakan/fzkyomi.c
+    lib/kanakan/getkanji.c
+    lib/kanakan/getrank.c
+    lib/kanakan/global.c
+    lib/kanakan/hzstrlen.c
+    lib/kanakan/init.c
+    lib/kanakan/istrcmp.c
+    lib/kanakan/memory.c
+    lib/kanakan/mk2claus.c
+    lib/kanakan/mkbunset.c
+    lib/kanakan/mkjiritu.c
+    lib/kanakan/mkkouho.c
+    lib/kanakan/mknumber.c
+    lib/kanakan/mvmemd.c
+    lib/kanakan/mvmemi.c
+    lib/kanakan/peepdic.c
+    lib/kanakan/ph2knj.c
+    lib/kanakan/ph_khtbl.c
+    lib/kanakan/priority.c
+    lib/kanakan/prtytbl.c
+    lib/kanakan/s2ctbl.c
+    lib/kanakan/selclrec.c
+    lib/kanakan/selsuuji.c
+    lib/kanakan/setconj.c
+    lib/kanakan/setjrec.c
+    lib/kanakan/setkouho.c
+    lib/kanakan/setubi.c
+    lib/kanakan/sj2code.c
+    lib/kanakan/skiphblk.c
+    lib/kanakan/skipkstr.c
+    lib/kanakan/srchdict.c
+    lib/kanakan/srchhead.c
+    lib/kanakan/srchidx.c
+    lib/kanakan/srchnum.c
+    lib/kanakan/stbtbl.c
+    lib/kanakan/stttbl.c
+    lib/kanakan/study.c
+    lib/kanakan/suujitbl.c
+    lib/kanakan/terminat.c
+    lib/kanakan/termtbl.c
+    lib/kanakan/wakachi.c
 )
 target_include_directories(kanakan
     PRIVATE include
@@ -122,7 +122,7 @@ add_executable(sj3serv
 #    sj3serv/sj3serv.c
 #)
 target_include_directories(sj3serv
-    PRIVATE include sj3lib
+    PRIVATE include lib/sj3lib
 )
 target_link_libraries(sj3serv
     sj3lib kanakan
@@ -138,7 +138,7 @@ add_executable(sj3dic
     sj3dic/sjrc.c
 )
 target_include_directories(sj3dic
-    PRIVATE include sj3lib
+    PRIVATE include lib/sj3lib
 )
 target_link_libraries(sj3dic
     sj3lib
@@ -160,7 +160,7 @@ add_executable(sj3mkdic
     sj3mkdic/string.c
 )
 target_include_directories(sj3mkdic
-    PRIVATE sj3mkdic include sj3lib
+    PRIVATE sj3mkdic include lib/sj3lib
 )
 target_link_libraries(sj3mkdic
     sj3lib
diff --git a/kanakan/adddic.c b/lib/kanakan/adddic.c
similarity index 100%
rename from kanakan/adddic.c
rename to lib/kanakan/adddic.c
diff --git a/kanakan/addelcmn.c b/lib/kanakan/addelcmn.c
similarity index 100%
rename from kanakan/addelcmn.c
rename to lib/kanakan/addelcmn.c
diff --git a/kanakan/alloc.c b/lib/kanakan/alloc.c
similarity index 100%
rename from kanakan/alloc.c
rename to lib/kanakan/alloc.c
diff --git a/kanakan/charsize.c b/lib/kanakan/charsize.c
similarity index 100%
rename from kanakan/charsize.c
rename to lib/kanakan/charsize.c
diff --git a/kanakan/chrtbl.c b/lib/kanakan/chrtbl.c
similarity index 100%
rename from kanakan/chrtbl.c
rename to lib/kanakan/chrtbl.c
diff --git a/kanakan/cl2knj.c b/lib/kanakan/cl2knj.c
similarity index 100%
rename from kanakan/cl2knj.c
rename to lib/kanakan/cl2knj.c
diff --git a/kanakan/clstudy.c b/lib/kanakan/clstudy.c
similarity index 100%
rename from kanakan/clstudy.c
rename to lib/kanakan/clstudy.c
diff --git a/kanakan/cmpstr.c b/lib/kanakan/cmpstr.c
similarity index 100%
rename from kanakan/cmpstr.c
rename to lib/kanakan/cmpstr.c
diff --git a/kanakan/conjunc.c b/lib/kanakan/conjunc.c
similarity index 100%
rename from kanakan/conjunc.c
rename to lib/kanakan/conjunc.c
diff --git a/kanakan/connect.c b/lib/kanakan/connect.c
similarity index 100%
rename from kanakan/connect.c
rename to lib/kanakan/connect.c
diff --git a/kanakan/cvtclknj.c b/lib/kanakan/cvtclknj.c
similarity index 100%
rename from kanakan/cvtclknj.c
rename to lib/kanakan/cvtclknj.c
diff --git a/kanakan/cvtdict.c b/lib/kanakan/cvtdict.c
similarity index 100%
rename from kanakan/cvtdict.c
rename to lib/kanakan/cvtdict.c
diff --git a/kanakan/cvtkanji.c b/lib/kanakan/cvtkanji.c
similarity index 100%
rename from kanakan/cvtkanji.c
rename to lib/kanakan/cvtkanji.c
diff --git a/kanakan/deldic.c b/lib/kanakan/deldic.c
similarity index 100%
rename from kanakan/deldic.c
rename to lib/kanakan/deldic.c
diff --git a/kanakan/depend.c b/lib/kanakan/depend.c
similarity index 100%
rename from kanakan/depend.c
rename to lib/kanakan/depend.c
diff --git a/kanakan/dict.c b/lib/kanakan/dict.c
similarity index 100%
rename from kanakan/dict.c
rename to lib/kanakan/dict.c
diff --git a/kanakan/functbl.c b/lib/kanakan/functbl.c
similarity index 100%
rename from kanakan/functbl.c
rename to lib/kanakan/functbl.c
diff --git a/kanakan/fuzoku.c b/lib/kanakan/fuzoku.c
similarity index 100%
rename from kanakan/fuzoku.c
rename to lib/kanakan/fuzoku.c
diff --git a/kanakan/fzkyomi.c b/lib/kanakan/fzkyomi.c
similarity index 100%
rename from kanakan/fzkyomi.c
rename to lib/kanakan/fzkyomi.c
diff --git a/kanakan/getkanji.c b/lib/kanakan/getkanji.c
similarity index 100%
rename from kanakan/getkanji.c
rename to lib/kanakan/getkanji.c
diff --git a/kanakan/getrank.c b/lib/kanakan/getrank.c
similarity index 100%
rename from kanakan/getrank.c
rename to lib/kanakan/getrank.c
diff --git a/kanakan/global.c b/lib/kanakan/global.c
similarity index 100%
rename from kanakan/global.c
rename to lib/kanakan/global.c
diff --git a/kanakan/hzstrlen.c b/lib/kanakan/hzstrlen.c
similarity index 100%
rename from kanakan/hzstrlen.c
rename to lib/kanakan/hzstrlen.c
diff --git a/kanakan/init.c b/lib/kanakan/init.c
similarity index 100%
rename from kanakan/init.c
rename to lib/kanakan/init.c
diff --git a/kanakan/istrcmp.c b/lib/kanakan/istrcmp.c
similarity index 100%
rename from kanakan/istrcmp.c
rename to lib/kanakan/istrcmp.c
diff --git a/kanakan/memory.c b/lib/kanakan/memory.c
similarity index 100%
rename from kanakan/memory.c
rename to lib/kanakan/memory.c
diff --git a/kanakan/mk2claus.c b/lib/kanakan/mk2claus.c
similarity index 100%
rename from kanakan/mk2claus.c
rename to lib/kanakan/mk2claus.c
diff --git a/kanakan/mkbunset.c b/lib/kanakan/mkbunset.c
similarity index 100%
rename from kanakan/mkbunset.c
rename to lib/kanakan/mkbunset.c
diff --git a/kanakan/mkjiritu.c b/lib/kanakan/mkjiritu.c
similarity index 100%
rename from kanakan/mkjiritu.c
rename to lib/kanakan/mkjiritu.c
diff --git a/kanakan/mkkouho.c b/lib/kanakan/mkkouho.c
similarity index 100%
rename from kanakan/mkkouho.c
rename to lib/kanakan/mkkouho.c
diff --git a/kanakan/mknumber.c b/lib/kanakan/mknumber.c
similarity index 100%
rename from kanakan/mknumber.c
rename to lib/kanakan/mknumber.c
diff --git a/kanakan/mvmemd.c b/lib/kanakan/mvmemd.c
similarity index 100%
rename from kanakan/mvmemd.c
rename to lib/kanakan/mvmemd.c
diff --git a/kanakan/mvmemi.c b/lib/kanakan/mvmemi.c
similarity index 100%
rename from kanakan/mvmemi.c
rename to lib/kanakan/mvmemi.c
diff --git a/kanakan/peepdic.c b/lib/kanakan/peepdic.c
similarity index 100%
rename from kanakan/peepdic.c
rename to lib/kanakan/peepdic.c
diff --git a/kanakan/ph2knj.c b/lib/kanakan/ph2knj.c
similarity index 100%
rename from kanakan/ph2knj.c
rename to lib/kanakan/ph2knj.c
diff --git a/kanakan/ph_khtbl.c b/lib/kanakan/ph_khtbl.c
similarity index 100%
rename from kanakan/ph_khtbl.c
rename to lib/kanakan/ph_khtbl.c
diff --git a/kanakan/priority.c b/lib/kanakan/priority.c
similarity index 100%
rename from kanakan/priority.c
rename to lib/kanakan/priority.c
diff --git a/kanakan/prtytbl.c b/lib/kanakan/prtytbl.c
similarity index 100%
rename from kanakan/prtytbl.c
rename to lib/kanakan/prtytbl.c
diff --git a/kanakan/s2ctbl.c b/lib/kanakan/s2ctbl.c
similarity index 100%
rename from kanakan/s2ctbl.c
rename to lib/kanakan/s2ctbl.c
diff --git a/kanakan/selclrec.c b/lib/kanakan/selclrec.c
similarity index 100%
rename from kanakan/selclrec.c
rename to lib/kanakan/selclrec.c
diff --git a/kanakan/selsuuji.c b/lib/kanakan/selsuuji.c
similarity index 100%
rename from kanakan/selsuuji.c
rename to lib/kanakan/selsuuji.c
diff --git a/kanakan/setconj.c b/lib/kanakan/setconj.c
similarity index 100%
rename from kanakan/setconj.c
rename to lib/kanakan/setconj.c
diff --git a/kanakan/setjrec.c b/lib/kanakan/setjrec.c
similarity index 100%
rename from kanakan/setjrec.c
rename to lib/kanakan/setjrec.c
diff --git a/kanakan/setkouho.c b/lib/kanakan/setkouho.c
similarity index 100%
rename from kanakan/setkouho.c
rename to lib/kanakan/setkouho.c
diff --git a/kanakan/setubi.c b/lib/kanakan/setubi.c
similarity index 100%
rename from kanakan/setubi.c
rename to lib/kanakan/setubi.c
diff --git a/kanakan/sj2code.c b/lib/kanakan/sj2code.c
similarity index 100%
rename from kanakan/sj2code.c
rename to lib/kanakan/sj2code.c
diff --git a/kanakan/skiphblk.c b/lib/kanakan/skiphblk.c
similarity index 100%
rename from kanakan/skiphblk.c
rename to lib/kanakan/skiphblk.c
diff --git a/kanakan/skipkstr.c b/lib/kanakan/skipkstr.c
similarity index 100%
rename from kanakan/skipkstr.c
rename to lib/kanakan/skipkstr.c
diff --git a/kanakan/srchdict.c b/lib/kanakan/srchdict.c
similarity index 100%
rename from kanakan/srchdict.c
rename to lib/kanakan/srchdict.c
diff --git a/kanakan/srchhead.c b/lib/kanakan/srchhead.c
similarity index 100%
rename from kanakan/srchhead.c
rename to lib/kanakan/srchhead.c
diff --git a/kanakan/srchidx.c b/lib/kanakan/srchidx.c
similarity index 100%
rename from kanakan/srchidx.c
rename to lib/kanakan/srchidx.c
diff --git a/kanakan/srchnum.c b/lib/kanakan/srchnum.c
similarity index 100%
rename from kanakan/srchnum.c
rename to lib/kanakan/srchnum.c
diff --git a/kanakan/stbtbl.c b/lib/kanakan/stbtbl.c
similarity index 100%
rename from kanakan/stbtbl.c
rename to lib/kanakan/stbtbl.c
diff --git a/kanakan/stttbl.c b/lib/kanakan/stttbl.c
similarity index 100%
rename from kanakan/stttbl.c
rename to lib/kanakan/stttbl.c
diff --git a/kanakan/study.c b/lib/kanakan/study.c
similarity index 100%
rename from kanakan/study.c
rename to lib/kanakan/study.c
diff --git a/kanakan/suujitbl.c b/lib/kanakan/suujitbl.c
similarity index 100%
rename from kanakan/suujitbl.c
rename to lib/kanakan/suujitbl.c
diff --git a/kanakan/terminat.c b/lib/kanakan/terminat.c
similarity index 100%
rename from kanakan/terminat.c
rename to lib/kanakan/terminat.c
diff --git a/kanakan/termtbl.c b/lib/kanakan/termtbl.c
similarity index 100%
rename from kanakan/termtbl.c
rename to lib/kanakan/termtbl.c
diff --git a/kanakan/wakachi.c b/lib/kanakan/wakachi.c
similarity index 100%
rename from kanakan/wakachi.c
rename to lib/kanakan/wakachi.c
diff --git a/sj3lib/level1.c b/lib/sj3lib/level1.c
similarity index 100%
rename from sj3lib/level1.c
rename to lib/sj3lib/level1.c
diff --git a/sj3lib/sj.c b/lib/sj3lib/sj.c
similarity index 100%
rename from sj3lib/sj.c
rename to lib/sj3lib/sj.c
diff --git a/sj3lib/sj3lib.h b/lib/sj3lib/sj3lib.h
similarity index 100%
rename from sj3lib/sj3lib.h
rename to lib/sj3lib/sj3lib.h
diff --git a/sj3lib/sj_string.h b/lib/sj3lib/sj_string.h
similarity index 100%
rename from sj3lib/sj_string.h
rename to lib/sj3lib/sj_string.h
diff --git a/sj3lib/string.c b/lib/sj3lib/string.c
similarity index 100%
rename from sj3lib/string.c
rename to lib/sj3lib/string.c