diff --git a/src/stub/util/armpe/Makefile b/src/stub/tools/armpe/Makefile
similarity index 100%
rename from src/stub/util/armpe/Makefile
rename to src/stub/tools/armpe/Makefile
diff --git a/src/stub/util/armpe/armpe_tester.c b/src/stub/tools/armpe/armpe_tester.c
similarity index 100%
rename from src/stub/util/armpe/armpe_tester.c
rename to src/stub/tools/armpe/armpe_tester.c
diff --git a/src/stub/util/sstrip/Makefile b/src/stub/tools/sstrip/Makefile
similarity index 100%
rename from src/stub/util/sstrip/Makefile
rename to src/stub/tools/sstrip/Makefile
diff --git a/src/stub/util/sstrip/README b/src/stub/tools/sstrip/README
similarity index 100%
rename from src/stub/util/sstrip/README
rename to src/stub/tools/sstrip/README
diff --git a/src/stub/util/sstrip/README.1ST b/src/stub/tools/sstrip/README.1ST
similarity index 100%
rename from src/stub/util/sstrip/README.1ST
rename to src/stub/tools/sstrip/README.1ST
diff --git a/src/stub/util/sstrip/sstrip.c b/src/stub/tools/sstrip/sstrip.c
similarity index 100%
rename from src/stub/util/sstrip/sstrip.c
rename to src/stub/tools/sstrip/sstrip.c