diff --git a/lib/decoding/control_channels_decoder_impl.h b/lib/decoding/control_channels_decoder_impl.h
index 41404fa..5af9500 100644
--- a/lib/decoding/control_channels_decoder_impl.h
+++ b/lib/decoding/control_channels_decoder_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
 #define INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
 
-#include <gsm/control_channels_decoder.h>
+#include <gsm/decoding/control_channels_decoder.h>
 #include "fire_crc.h"
 #include "cch.h"
 
diff --git a/lib/demapping/get_bcch_or_ccch_bursts_impl.h b/lib/demapping/get_bcch_or_ccch_bursts_impl.h
index 73cfb52..ad49649 100644
--- a/lib/demapping/get_bcch_or_ccch_bursts_impl.h
+++ b/lib/demapping/get_bcch_or_ccch_bursts_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
 #define INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
 
-#include <gsm/get_bcch_or_ccch_bursts.h>
+#include <gsm/demapping/get_bcch_or_ccch_bursts.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/bursts_printer_impl.h b/lib/misc_utils/bursts_printer_impl.h
index 1a6368a..57bd208 100644
--- a/lib/misc_utils/bursts_printer_impl.h
+++ b/lib/misc_utils/bursts_printer_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 #define INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 
-#include <gsm/bursts_printer.h>
+#include <gsm/misc_utils/bursts_printer.h>
 #include <set>
 
 namespace gr {
diff --git a/lib/misc_utils/controlled_const_source_f_impl.h b/lib/misc_utils/controlled_const_source_f_impl.h
index 2abe812..28fb0ca 100644
--- a/lib/misc_utils/controlled_const_source_f_impl.h
+++ b/lib/misc_utils/controlled_const_source_f_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 
-#include <gsm/controlled_const_source_f.h>
+#include <gsm/misc_utils/controlled_const_source_f.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/controlled_rotator_cc_impl.h b/lib/misc_utils/controlled_rotator_cc_impl.h
index 2dbad6c..da39a7f 100644
--- a/lib/misc_utils/controlled_rotator_cc_impl.h
+++ b/lib/misc_utils/controlled_rotator_cc_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 
-#include <gsm/controlled_rotator_cc.h>
+#include <gsm/misc_utils/controlled_rotator_cc.h>
 #include <gnuradio/blocks/rotator.h>
 
 namespace gr {
diff --git a/lib/misc_utils/extract_system_info_impl.h b/lib/misc_utils/extract_system_info_impl.h
index 288a75d..cabe64c 100644
--- a/lib/misc_utils/extract_system_info_impl.h
+++ b/lib/misc_utils/extract_system_info_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 #define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 
-#include <gsm/extract_system_info.h>
+#include <gsm/misc_utils/extract_system_info.h>
 
 
 
diff --git a/lib/misc_utils/message_printer_impl.h b/lib/misc_utils/message_printer_impl.h
index 625a1e6..06a10da 100644
--- a/lib/misc_utils/message_printer_impl.h
+++ b/lib/misc_utils/message_printer_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 #define INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 
-#include <gsm/message_printer.h>
+#include <gsm/misc_utils/message_printer.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/receiver/receiver_impl.h b/lib/receiver/receiver_impl.h
index 6657e3d..3e962c7 100644
--- a/lib/receiver/receiver_impl.h
+++ b/lib/receiver/receiver_impl.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GSM_RECEIVER_IMPL_H
 #define INCLUDED_GSM_RECEIVER_IMPL_H
 
-#include <gsm/receiver.h>
+#include <gsm/receiver/receiver.h>
 #include <gsm/gsmtap.h>
 #include <gsm_constants.h>
 #include <receiver_config.h>