diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml
index 5a0fbc0..69120f0 100644
--- a/grc/gsm_block_tree.xml
+++ b/grc/gsm_block_tree.xml
@@ -61,6 +61,7 @@
       <block>gsm_controlled_fractional_resampler_cc</block>
       <block>gsm_message_printer</block>
       <block>gsm_clock_offset_corrector_tagged</block>
+      <block>gsm_msg_to_tag.xml</block>
       <block>gsm_tmsi_dumper</block>
     </cat>
   </cat>
diff --git a/include/grgsm/controlled_fractional_resampler_cc.h b/include/grgsm/misc_utils/controlled_fractional_resampler_cc.h
similarity index 100%
rename from include/grgsm/controlled_fractional_resampler_cc.h
rename to include/grgsm/misc_utils/controlled_fractional_resampler_cc.h
diff --git a/include/grgsm/msg_to_tag.h b/include/grgsm/misc_utils/msg_to_tag.h
similarity index 100%
rename from include/grgsm/msg_to_tag.h
rename to include/grgsm/misc_utils/msg_to_tag.h
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
index 3233e18..f823287 100644
--- a/swig/grgsm_swig.i
+++ b/swig/grgsm_swig.i
@@ -36,8 +36,8 @@
 #include "grgsm/qa_utils/message_sink.h"
 #include "grgsm/misc_utils/message_file_sink.h"
 #include "grgsm/misc_utils/message_file_source.h"
-#include "grgsm/msg_to_tag.h"
-#include "grgsm/controlled_fractional_resampler_cc.h"
+#include "grgsm/misc_utils/msg_to_tag.h"
+#include "grgsm/misc_utils/controlled_fractional_resampler_cc.h"
 %}
 
 %include "grgsm/receiver/receiver.h"
@@ -93,6 +93,11 @@
 GR_SWIG_BLOCK_MAGIC2(gsm, message_file_sink);
 %include "grgsm/misc_utils/message_file_source.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, message_file_source);
+%include "grgsm/misc_utils/msg_to_tag.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, msg_to_tag);
+%include "grgsm/misc_utils/controlled_fractional_resampler_cc.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc);
+
 
 %include "grgsm/qa_utils/burst_sink.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink);
@@ -102,7 +107,3 @@
 GR_SWIG_BLOCK_MAGIC2(gsm, message_source);
 %include "grgsm/qa_utils/message_sink.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, message_sink);
-%include "grgsm/msg_to_tag.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, msg_to_tag);
-%include "grgsm/controlled_fractional_resampler_cc.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc);