diff --git a/k5viewer/README.md b/tools/k5viewer/README.md
similarity index 100%
rename from k5viewer/README.md
rename to tools/k5viewer/README.md
diff --git a/k5viewer/k5viewer.py b/tools/k5viewer/k5viewer.py
similarity index 100%
rename from k5viewer/k5viewer.py
rename to tools/k5viewer/k5viewer.py
diff --git a/utils/clean.bat b/tools/misc/clean.bat
similarity index 100%
rename from utils/clean.bat
rename to tools/misc/clean.bat
diff --git a/utils/main.cpp b/tools/misc/main.cpp
similarity index 100%
rename from utils/main.cpp
rename to tools/misc/main.cpp
diff --git a/utils/misc.bpf b/tools/misc/misc.bpf
similarity index 100%
rename from utils/misc.bpf
rename to tools/misc/misc.bpf
diff --git a/utils/misc.bpr b/tools/misc/misc.bpr
similarity index 100%
rename from utils/misc.bpr
rename to tools/misc/misc.bpr
diff --git a/utils/misc.exe b/tools/misc/misc.exe
similarity index 100%
rename from utils/misc.exe
rename to tools/misc/misc.exe
diff --git a/utils/misc.res b/tools/misc/misc.res
similarity index 100%
rename from utils/misc.res
rename to tools/misc/misc.res
diff --git a/utils/uv-k5_small.bin b/tools/misc/uv-k5_small.bin
similarity index 100%
rename from utils/uv-k5_small.bin
rename to tools/misc/uv-k5_small.bin
diff --git a/utils/uv-k5_small.fon b/tools/misc/uv-k5_small.fon
similarity index 100%
rename from utils/uv-k5_small.fon
rename to tools/misc/uv-k5_small.fon
diff --git a/utils/uv-k5_small_bold.bin b/tools/misc/uv-k5_small_bold.bin
similarity index 100%
rename from utils/uv-k5_small_bold.bin
rename to tools/misc/uv-k5_small_bold.bin
diff --git a/utils/uv-k5_small_bold.fon b/tools/misc/uv-k5_small_bold.fon
similarity index 100%
rename from utils/uv-k5_small_bold.fon
rename to tools/misc/uv-k5_small_bold.fon
diff --git a/serialtool/__init__.py b/tools/serialtool/__init__.py
similarity index 100%
rename from serialtool/__init__.py
rename to tools/serialtool/__init__.py
diff --git a/serialtool/_dump.py b/tools/serialtool/_dump.py
similarity index 100%
rename from serialtool/_dump.py
rename to tools/serialtool/_dump.py
diff --git a/serialtool/_prog.py b/tools/serialtool/_prog.py
similarity index 100%
rename from serialtool/_prog.py
rename to tools/serialtool/_prog.py
diff --git a/serialtool/_restore.py b/tools/serialtool/_restore.py
similarity index 100%
rename from serialtool/_restore.py
rename to tools/serialtool/_restore.py
diff --git a/serialtool/cli.py b/tools/serialtool/cli.py
similarity index 100%
rename from serialtool/cli.py
rename to tools/serialtool/cli.py
diff --git a/serialtool/msg.py b/tools/serialtool/msg.py
similarity index 100%
rename from serialtool/msg.py
rename to tools/serialtool/msg.py