diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a07a876..931e0c1 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -27,8 +27,8 @@
 list(APPEND gsm_sources
     receiver/receiver_impl.cc
     receiver/receiver_config.cc 
-    viterbi_detector.cc 
-    sch.c
+    receiver/viterbi_detector.cc 
+    receiver/sch.c
     burst_printer/bursts_printer_impl.cc
     )
 
diff --git a/lib/gsmtap.h b/lib/receiver/gsmtap.h
similarity index 100%
rename from lib/gsmtap.h
rename to lib/receiver/gsmtap.h
diff --git a/lib/sch.c b/lib/receiver/sch.c
similarity index 100%
rename from lib/sch.c
rename to lib/receiver/sch.c
diff --git a/lib/sch.h b/lib/receiver/sch.h
similarity index 100%
rename from lib/sch.h
rename to lib/receiver/sch.h
diff --git a/lib/viterbi_detector.cc b/lib/receiver/viterbi_detector.cc
similarity index 100%
rename from lib/viterbi_detector.cc
rename to lib/receiver/viterbi_detector.cc
diff --git a/lib/viterbi_detector.h b/lib/receiver/viterbi_detector.h
similarity index 100%
rename from lib/viterbi_detector.h
rename to lib/receiver/viterbi_detector.h