diff --git a/Ccs/convert_nctrs.py b/Ccs/tools/convert_nctrs.py
similarity index 100%
rename from Ccs/convert_nctrs.py
rename to Ccs/tools/convert_nctrs.py
diff --git a/Ccs/convert_ssf.py b/Ccs/tools/convert_ssf.py
similarity index 99%
rename from Ccs/convert_ssf.py
rename to Ccs/tools/convert_ssf.py
index 21f87fb595dda07765c4e279fe8e79c763d1f0b4..8af7b4780f5788fc476129b7d28b5c29df9428ab 100755
--- a/Ccs/convert_ssf.py
+++ b/Ccs/tools/convert_ssf.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
+sys.path.insert(0, '..')
 
 from database.tm_db import scoped_session_maker
 
diff --git a/Ccs/hvs_spw_gw_router.py b/Ccs/tools/hvs_spw_gw_router.py
similarity index 97%
rename from Ccs/hvs_spw_gw_router.py
rename to Ccs/tools/hvs_spw_gw_router.py
index ae10f07fdc1ed503aead9e52134d7c3ac177fdd5..ed6590d7bc1c3a09517a57daa56095c6f1173366 100755
--- a/Ccs/hvs_spw_gw_router.py
+++ b/Ccs/tools/hvs_spw_gw_router.py
@@ -5,6 +5,8 @@ Routing packets from and to HVS SpW gateway
 """
 
 import sys
+sys.path.insert(0, '..')
+
 from ccs_function_lib import setup_gw_spw_routing
 
 if __name__ == "__main__":
diff --git a/Ccs/tm_converters.py b/Ccs/tools/tm_converters.py
similarity index 99%
rename from Ccs/tm_converters.py
rename to Ccs/tools/tm_converters.py
index 018400d8abb567adf72845e0a3d10440ea22a9ef..07c342bb2d7035821289591771dc19bbeedca919 100644
--- a/Ccs/tm_converters.py
+++ b/Ccs/tools/tm_converters.py
@@ -1,7 +1,9 @@
 #! /usr/bin/env python3
 
 import io
-import struct
+import sys
+sys.path.insert(0, '..')
+
 from database.tm_db import connect_to_db
 
 dbcon = connect_to_db()