diff --git a/include/gsm/CMakeLists.txt b/include/gsm/CMakeLists.txt
index c704e26..3173e3d 100644
--- a/include/gsm/CMakeLists.txt
+++ b/include/gsm/CMakeLists.txt
@@ -22,13 +22,13 @@
 ########################################################################
 install(FILES
     api.h
-    receiver.h
-    bursts_printer.h
-    get_bcch_or_ccch_bursts.h
-    control_channels_decoder.h 
+    receiver/receiver.h
+    misc_utils/bursts_printer.h
+    demapping/get_bcch_or_ccch_bursts.h
+    decoding/control_channels_decoder.h 
     gsmtap.h
-    extract_system_info.h
-    controlled_rotator_cc.h
-    controlled_const_source_f.h
-    message_printer.h DESTINATION include/gsm
+    misc_utils/extract_system_info.h
+    misc_utils/controlled_rotator_cc.h
+    misc_utils/controlled_const_source_f.h
+    misc_utils/message_printer.h DESTINATION include/gsm
 )
diff --git a/include/gsm/control_channels_decoder.h b/include/gsm/decoding/control_channels_decoder.h
similarity index 99%
rename from include/gsm/control_channels_decoder.h
rename to include/gsm/decoding/control_channels_decoder.h
index a44f43e..49a8e35 100644
--- a/include/gsm/control_channels_decoder.h
+++ b/include/gsm/decoding/control_channels_decoder.h
@@ -47,6 +47,7 @@
        * creating new instances.
        */
       static sptr make();
+
     };
 
   } // namespace gsm
diff --git a/include/gsm/get_bcch_or_ccch_bursts.h b/include/gsm/demapping/get_bcch_or_ccch_bursts.h
similarity index 100%
rename from include/gsm/get_bcch_or_ccch_bursts.h
rename to include/gsm/demapping/get_bcch_or_ccch_bursts.h
diff --git a/include/gsm/bursts_printer.h b/include/gsm/misc_utils/bursts_printer.h
similarity index 100%
rename from include/gsm/bursts_printer.h
rename to include/gsm/misc_utils/bursts_printer.h
diff --git a/include/gsm/controlled_const_source_f.h b/include/gsm/misc_utils/controlled_const_source_f.h
similarity index 100%
rename from include/gsm/controlled_const_source_f.h
rename to include/gsm/misc_utils/controlled_const_source_f.h
diff --git a/include/gsm/controlled_rotator_cc.h b/include/gsm/misc_utils/controlled_rotator_cc.h
similarity index 100%
rename from include/gsm/controlled_rotator_cc.h
rename to include/gsm/misc_utils/controlled_rotator_cc.h
diff --git a/include/gsm/extract_system_info.h b/include/gsm/misc_utils/extract_system_info.h
similarity index 100%
rename from include/gsm/extract_system_info.h
rename to include/gsm/misc_utils/extract_system_info.h
diff --git a/include/gsm/message_printer.h b/include/gsm/misc_utils/message_printer.h
similarity index 100%
rename from include/gsm/message_printer.h
rename to include/gsm/misc_utils/message_printer.h
diff --git a/include/gsm/receiver.h b/include/gsm/receiver/receiver.h
similarity index 99%
rename from include/gsm/receiver.h
rename to include/gsm/receiver/receiver.h
index 5aaca67..bf4580c 100644
--- a/include/gsm/receiver.h
+++ b/include/gsm/receiver/receiver.h
@@ -53,9 +53,9 @@
       virtual void set_arfcn(int arfcn) = 0;
       virtual void reset() = 0;
     };
-
+   
   } // namespace gsm
 } // namespace gr
 
 #endif /* INCLUDED_GSM_RECEIVER_H */
-
+