diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/grgsm/misc_utils/CMakeLists.txt
index 1f640a2..eb75bb3 100644
--- a/include/grgsm/misc_utils/CMakeLists.txt
+++ b/include/grgsm/misc_utils/CMakeLists.txt
@@ -25,5 +25,6 @@
     extract_system_info.h
     controlled_rotator_cc.h
     controlled_const_source_f.h
-    message_printer.h DESTINATION include/grgsm/misc_utils
+    message_printer.h 
+    tmsi_dumper.h DESTINATION include/grgsm/misc_utils
 )
diff --git a/include/gsm/tmsi_dumper.h b/include/grgsm/misc_utils/tmsi_dumper.h
similarity index 100%
rename from include/gsm/tmsi_dumper.h
rename to include/grgsm/misc_utils/tmsi_dumper.h
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e941ddd..c89bf26 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -39,8 +39,8 @@
     misc_utils/controlled_rotator_cc_impl.cc
     misc_utils/controlled_const_source_f_impl.cc
     misc_utils/message_printer_impl.cc
+    misc_utils/tmsi_dumper_impl.cc
     decryption/decryption_impl.cc
-    tmsi_dumper_impl.cc
 )
 
 add_library(gnuradio-gsm SHARED ${gsm_sources})
diff --git a/lib/tmsi_dumper_impl.cc b/lib/misc_utils/tmsi_dumper_impl.cc
similarity index 100%
rename from lib/tmsi_dumper_impl.cc
rename to lib/misc_utils/tmsi_dumper_impl.cc
diff --git a/lib/tmsi_dumper_impl.h b/lib/misc_utils/tmsi_dumper_impl.h
similarity index 100%
rename from lib/tmsi_dumper_impl.h
rename to lib/misc_utils/tmsi_dumper_impl.h