diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a8cb1d710..681559a37b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ if(${BUILD_TEST})
     enable_testing()
 endif(${BUILD_TEST})
 add_subdirectory(source)
+add_subdirectory(tools)
 
 # docs 
 add_subdirectory(docs)
diff --git a/src/kit/CMakeLists.txt b/tools/CMakeLists.txt
similarity index 100%
rename from src/kit/CMakeLists.txt
rename to tools/CMakeLists.txt
diff --git a/src/kit/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt
similarity index 100%
rename from src/kit/shell/CMakeLists.txt
rename to tools/shell/CMakeLists.txt
diff --git a/src/kit/shell/inc/shell.h b/tools/shell/inc/shell.h
similarity index 100%
rename from src/kit/shell/inc/shell.h
rename to tools/shell/inc/shell.h
diff --git a/src/kit/shell/inc/shellCommand.h b/tools/shell/inc/shellCommand.h
similarity index 100%
rename from src/kit/shell/inc/shellCommand.h
rename to tools/shell/inc/shellCommand.h
diff --git a/src/kit/shell/inc/tnettest.h b/tools/shell/inc/tnettest.h
similarity index 100%
rename from src/kit/shell/inc/tnettest.h
rename to tools/shell/inc/tnettest.h
diff --git a/src/kit/shell/src/shellCheck.c b/tools/shell/src/shellCheck.c
similarity index 100%
rename from src/kit/shell/src/shellCheck.c
rename to tools/shell/src/shellCheck.c
diff --git a/src/kit/shell/src/shellCommand.c b/tools/shell/src/shellCommand.c
similarity index 100%
rename from src/kit/shell/src/shellCommand.c
rename to tools/shell/src/shellCommand.c
diff --git a/src/kit/shell/src/shellDarwin.c b/tools/shell/src/shellDarwin.c
similarity index 100%
rename from src/kit/shell/src/shellDarwin.c
rename to tools/shell/src/shellDarwin.c
diff --git a/src/kit/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
similarity index 100%
rename from src/kit/shell/src/shellEngine.c
rename to tools/shell/src/shellEngine.c
diff --git a/src/kit/shell/src/shellImport.c b/tools/shell/src/shellImport.c
similarity index 100%
rename from src/kit/shell/src/shellImport.c
rename to tools/shell/src/shellImport.c
diff --git a/src/kit/shell/src/shellLinux.c b/tools/shell/src/shellLinux.c
similarity index 100%
rename from src/kit/shell/src/shellLinux.c
rename to tools/shell/src/shellLinux.c
diff --git a/src/kit/shell/src/shellMain.c b/tools/shell/src/shellMain.c
similarity index 100%
rename from src/kit/shell/src/shellMain.c
rename to tools/shell/src/shellMain.c
diff --git a/src/kit/shell/src/shellWindows.c b/tools/shell/src/shellWindows.c
similarity index 100%
rename from src/kit/shell/src/shellWindows.c
rename to tools/shell/src/shellWindows.c
diff --git a/src/kit/shell/src/tnettest.c b/tools/shell/src/tnettest.c
similarity index 100%
rename from src/kit/shell/src/tnettest.c
rename to tools/shell/src/tnettest.c