diff --git a/srslte/lib/CMakeLists.txt b/srslte/lib/CMakeLists.txt
index 8a2e86b17..cb0d1d8eb 100644
--- a/srslte/lib/CMakeLists.txt
+++ b/srslte/lib/CMakeLists.txt
@@ -18,101 +18,6 @@
 # and at http://www.gnu.org/licenses/.
 #
 
-add_subdirectory(agc)
-add_subdirectory(ch_estimation)
-add_subdirectory(common)
-add_subdirectory(fec)
-add_subdirectory(mimo)
-add_subdirectory(phch)
-add_subdirectory(rf)
-add_subdirectory(sync)
-add_subdirectory(utils)
-add_subdirectory(channel)
-add_subdirectory(dft)
-add_subdirectory(io)
-add_subdirectory(modem)
-add_subdirectory(resampling)
-add_subdirectory(scrambling)
-add_subdirectory(ue)
-add_subdirectory(enb)
-
-set(srslte_srcs     version.c
-                    $<TARGET_OBJECTS:srslte_agc>
-                    $<TARGET_OBJECTS:srslte_ch_estimation>
-                    $<TARGET_OBJECTS:srslte_common>
-                    $<TARGET_OBJECTS:srslte_fec>
-                    $<TARGET_OBJECTS:srslte_mimo>
-                    $<TARGET_OBJECTS:srslte_phch>
-                    $<TARGET_OBJECTS:srslte_sync>
-                    $<TARGET_OBJECTS:srslte_utils>
-                    $<TARGET_OBJECTS:srslte_channel>
-                    $<TARGET_OBJECTS:srslte_dft>
-                    $<TARGET_OBJECTS:srslte_io>
-                    $<TARGET_OBJECTS:srslte_modem>
-                    $<TARGET_OBJECTS:srslte_resampling>
-                    $<TARGET_OBJECTS:srslte_scrambling>
-                    $<TARGET_OBJECTS:srslte_ue>
-                    $<TARGET_OBJECTS:srslte_enb>
-)
-
-add_library(srslte SHARED ${srslte_srcs})
-target_link_libraries(srslte pthread m)
-set_target_properties(srslte  PROPERTIES
-                              VERSION ${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR})
-
-if(NOT DisableMEX)
-  add_library(srslte_static STATIC ${srslte_srcs})
-endif(NOT DisableMEX)
-
-if(MKL_FOUND)
-  if(StaticMKL)
-    target_link_libraries(srslte ${MKL_STATIC_LIBRARIES})
-    if(NOT DisableMEX)
-      target_link_libraries(srslte_static ${MKL_STATIC_LIBRARIES})
-    endif(NOT DisableMEX)
-  else(StaticMKL)
-    target_link_libraries(srslte ${MKL_LIBRARIES})
-    if(NOT DisableMEX)
-      target_link_libraries(srslte_static ${MKL_LIBRARIES})
-    endif(NOT DisableMEX)
-  endif(StaticMKL)
-else(MKL_FOUND)
-  target_link_libraries(srslte ${FFTW3F_LIBRARIES})
-  if(NOT DisableMEX)
-    target_link_libraries(srslte_static ${FFTW3F_LIBRARIES})
-  endif(NOT DisableMEX)
-endif(MKL_FOUND)
-
-## This linkage is required for the examples and tests only
-if(RF_FOUND)
-
-  target_link_libraries(srslte srslte_rf)
-
-  if(UHD_FOUND)
-    target_link_libraries(srslte ${UHD_LIBRARIES})
-  endif(UHD_FOUND)
-
-  if(BLADERF_FOUND)
-    target_link_libraries(srslte ${BLADERF_LIBRARIES})
-  endif(BLADERF_FOUND)
-
-  if(LIMESDR_FOUND)
-    target_link_libraries(srslte ${LIMESDR_LIBRARIES})
-  endif(LIMESDR_FOUND)
-
-  if(SOAPYSDR_FOUND)
-    target_link_libraries(srslte ${SOAPYSDR_LIBRARIES})
-  endif(SOAPYSDR_FOUND)
-
-endif(RF_FOUND)
-
-if(VOLK_FOUND)
-  target_link_libraries(srslte ${VOLK_LIBRARIES})
-  if(NOT DisableMEX)
-    target_link_libraries(srslte_static ${VOLK_LIBRARIES})
-  endif(NOT DisableMEX)
-endif(VOLK_FOUND)
-
-INSTALL(TARGETS srslte DESTINATION ${LIBRARY_DIR})
-SRSLTE_SET_PIC(srslte)
+add_library(srslte_version OBJECT version.c)
 
+add_subdirectory(phy)
diff --git a/srslte/lib/phy/CMakeLists.txt b/srslte/lib/phy/CMakeLists.txt
new file mode 100644
index 000000000..dfd8f875f
--- /dev/null
+++ b/srslte/lib/phy/CMakeLists.txt
@@ -0,0 +1,117 @@
+#
+# Copyright 2013-2015 Software Radio Systems Limited
+#
+# This file is part of the srsLTE library.
+#
+# srsLTE is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# srsLTE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# A copy of the GNU Affero General Public License can be found in
+# the LICENSE file in the top-level directory of this distribution
+# and at http://www.gnu.org/licenses/.
+#
+
+add_subdirectory(agc)
+add_subdirectory(ch_estimation)
+add_subdirectory(common)
+add_subdirectory(fec)
+add_subdirectory(mimo)
+add_subdirectory(phch)
+add_subdirectory(rf)
+add_subdirectory(sync)
+add_subdirectory(utils)
+add_subdirectory(channel)
+add_subdirectory(dft)
+add_subdirectory(io)
+add_subdirectory(modem)
+add_subdirectory(resampling)
+add_subdirectory(scrambling)
+add_subdirectory(ue)
+add_subdirectory(enb)
+
+set(srslte_srcs     $<TARGET_OBJECTS:srslte_agc>
+                    $<TARGET_OBJECTS:srslte_ch_estimation>
+                    $<TARGET_OBJECTS:srslte_common>
+                    $<TARGET_OBJECTS:srslte_fec>
+                    $<TARGET_OBJECTS:srslte_mimo>
+                    $<TARGET_OBJECTS:srslte_phch>
+                    $<TARGET_OBJECTS:srslte_sync>
+                    $<TARGET_OBJECTS:srslte_utils>
+                    $<TARGET_OBJECTS:srslte_channel>
+                    $<TARGET_OBJECTS:srslte_dft>
+                    $<TARGET_OBJECTS:srslte_io>
+                    $<TARGET_OBJECTS:srslte_modem>
+                    $<TARGET_OBJECTS:srslte_resampling>
+                    $<TARGET_OBJECTS:srslte_scrambling>
+                    $<TARGET_OBJECTS:srslte_ue>
+                    $<TARGET_OBJECTS:srslte_enb>
+)
+
+add_library(srslte SHARED ${srslte_srcs})
+target_link_libraries(srslte pthread m)
+set_target_properties(srslte  PROPERTIES
+                              VERSION ${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR})
+
+if(NOT DisableMEX)
+  add_library(srslte_static STATIC ${srslte_srcs})
+endif(NOT DisableMEX)
+
+if(MKL_FOUND)
+  if(StaticMKL)
+    target_link_libraries(srslte ${MKL_STATIC_LIBRARIES})
+    if(NOT DisableMEX)
+      target_link_libraries(srslte_static ${MKL_STATIC_LIBRARIES})
+    endif(NOT DisableMEX)
+  else(StaticMKL)
+    target_link_libraries(srslte ${MKL_LIBRARIES})
+    if(NOT DisableMEX)
+      target_link_libraries(srslte_static ${MKL_LIBRARIES})
+    endif(NOT DisableMEX)
+  endif(StaticMKL)
+else(MKL_FOUND)
+  target_link_libraries(srslte ${FFTW3F_LIBRARIES})
+  if(NOT DisableMEX)
+    target_link_libraries(srslte_static ${FFTW3F_LIBRARIES})
+  endif(NOT DisableMEX)
+endif(MKL_FOUND)
+
+## This linkage is required for the examples and tests only
+if(RF_FOUND)
+
+  target_link_libraries(srslte srslte_rf)
+
+  if(UHD_FOUND)
+    target_link_libraries(srslte ${UHD_LIBRARIES})
+  endif(UHD_FOUND)
+
+  if(BLADERF_FOUND)
+    target_link_libraries(srslte ${BLADERF_LIBRARIES})
+  endif(BLADERF_FOUND)
+
+  if(LIMESDR_FOUND)
+    target_link_libraries(srslte ${LIMESDR_LIBRARIES})
+  endif(LIMESDR_FOUND)
+
+  if(SOAPYSDR_FOUND)
+    target_link_libraries(srslte ${SOAPYSDR_LIBRARIES})
+  endif(SOAPYSDR_FOUND)
+
+endif(RF_FOUND)
+
+if(VOLK_FOUND)
+  target_link_libraries(srslte ${VOLK_LIBRARIES})
+  if(NOT DisableMEX)
+    target_link_libraries(srslte_static ${VOLK_LIBRARIES})
+  endif(NOT DisableMEX)
+endif(VOLK_FOUND)
+
+INSTALL(TARGETS srslte DESTINATION ${LIBRARY_DIR})
+SRSLTE_SET_PIC(srslte)
+
diff --git a/srslte/lib/agc/CMakeLists.txt b/srslte/lib/phy/agc/CMakeLists.txt
similarity index 100%
rename from srslte/lib/agc/CMakeLists.txt
rename to srslte/lib/phy/agc/CMakeLists.txt
diff --git a/srslte/lib/agc/agc.c b/srslte/lib/phy/agc/agc.c
similarity index 100%
rename from srslte/lib/agc/agc.c
rename to srslte/lib/phy/agc/agc.c
diff --git a/srslte/lib/ch_estimation/CMakeLists.txt b/srslte/lib/phy/ch_estimation/CMakeLists.txt
similarity index 100%
rename from srslte/lib/ch_estimation/CMakeLists.txt
rename to srslte/lib/phy/ch_estimation/CMakeLists.txt
diff --git a/srslte/lib/ch_estimation/chest_common.c b/srslte/lib/phy/ch_estimation/chest_common.c
similarity index 100%
rename from srslte/lib/ch_estimation/chest_common.c
rename to srslte/lib/phy/ch_estimation/chest_common.c
diff --git a/srslte/lib/ch_estimation/chest_dl.c b/srslte/lib/phy/ch_estimation/chest_dl.c
similarity index 100%
rename from srslte/lib/ch_estimation/chest_dl.c
rename to srslte/lib/phy/ch_estimation/chest_dl.c
diff --git a/srslte/lib/ch_estimation/chest_ul.c b/srslte/lib/phy/ch_estimation/chest_ul.c
similarity index 100%
rename from srslte/lib/ch_estimation/chest_ul.c
rename to srslte/lib/phy/ch_estimation/chest_ul.c
diff --git a/srslte/lib/ch_estimation/refsignal_dl.c b/srslte/lib/phy/ch_estimation/refsignal_dl.c
similarity index 100%
rename from srslte/lib/ch_estimation/refsignal_dl.c
rename to srslte/lib/phy/ch_estimation/refsignal_dl.c
diff --git a/srslte/lib/ch_estimation/refsignal_ul.c b/srslte/lib/phy/ch_estimation/refsignal_ul.c
similarity index 100%
rename from srslte/lib/ch_estimation/refsignal_ul.c
rename to srslte/lib/phy/ch_estimation/refsignal_ul.c
diff --git a/srslte/lib/ch_estimation/test/CMakeLists.txt b/srslte/lib/phy/ch_estimation/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/ch_estimation/test/CMakeLists.txt
rename to srslte/lib/phy/ch_estimation/test/CMakeLists.txt
diff --git a/srslte/lib/ch_estimation/test/chest_test_dl.c b/srslte/lib/phy/ch_estimation/test/chest_test_dl.c
similarity index 100%
rename from srslte/lib/ch_estimation/test/chest_test_dl.c
rename to srslte/lib/phy/ch_estimation/test/chest_test_dl.c
diff --git a/srslte/lib/ch_estimation/test/chest_test_dl_mex.c b/srslte/lib/phy/ch_estimation/test/chest_test_dl_mex.c
similarity index 100%
rename from srslte/lib/ch_estimation/test/chest_test_dl_mex.c
rename to srslte/lib/phy/ch_estimation/test/chest_test_dl_mex.c
diff --git a/srslte/lib/ch_estimation/test/chest_test_dl_mex.mexa64 b/srslte/lib/phy/ch_estimation/test/chest_test_dl_mex.mexa64
similarity index 100%
rename from srslte/lib/ch_estimation/test/chest_test_dl_mex.mexa64
rename to srslte/lib/phy/ch_estimation/test/chest_test_dl_mex.mexa64
diff --git a/srslte/lib/ch_estimation/test/chest_test_ul.c b/srslte/lib/phy/ch_estimation/test/chest_test_ul.c
similarity index 100%
rename from srslte/lib/ch_estimation/test/chest_test_ul.c
rename to srslte/lib/phy/ch_estimation/test/chest_test_ul.c
diff --git a/srslte/lib/ch_estimation/test/chest_test_ul_mex.c b/srslte/lib/phy/ch_estimation/test/chest_test_ul_mex.c
similarity index 100%
rename from srslte/lib/ch_estimation/test/chest_test_ul_mex.c
rename to srslte/lib/phy/ch_estimation/test/chest_test_ul_mex.c
diff --git a/srslte/lib/ch_estimation/test/refsignal_pusch_mex.c b/srslte/lib/phy/ch_estimation/test/refsignal_pusch_mex.c
similarity index 100%
rename from srslte/lib/ch_estimation/test/refsignal_pusch_mex.c
rename to srslte/lib/phy/ch_estimation/test/refsignal_pusch_mex.c
diff --git a/srslte/lib/ch_estimation/test/refsignal_srs_mex.c b/srslte/lib/phy/ch_estimation/test/refsignal_srs_mex.c
similarity index 100%
rename from srslte/lib/ch_estimation/test/refsignal_srs_mex.c
rename to srslte/lib/phy/ch_estimation/test/refsignal_srs_mex.c
diff --git a/srslte/lib/ch_estimation/test/refsignal_ul_test.c b/srslte/lib/phy/ch_estimation/test/refsignal_ul_test.c
similarity index 100%
rename from srslte/lib/ch_estimation/test/refsignal_ul_test.c
rename to srslte/lib/phy/ch_estimation/test/refsignal_ul_test.c
diff --git a/srslte/lib/ch_estimation/ul_rs_tables.h b/srslte/lib/phy/ch_estimation/ul_rs_tables.h
similarity index 100%
rename from srslte/lib/ch_estimation/ul_rs_tables.h
rename to srslte/lib/phy/ch_estimation/ul_rs_tables.h
diff --git a/srslte/lib/channel/CMakeLists.txt b/srslte/lib/phy/channel/CMakeLists.txt
similarity index 100%
rename from srslte/lib/channel/CMakeLists.txt
rename to srslte/lib/phy/channel/CMakeLists.txt
diff --git a/srslte/lib/channel/ch_awgn.c b/srslte/lib/phy/channel/ch_awgn.c
similarity index 100%
rename from srslte/lib/channel/ch_awgn.c
rename to srslte/lib/phy/channel/ch_awgn.c
diff --git a/srslte/lib/channel/gauss.c b/srslte/lib/phy/channel/gauss.c
similarity index 100%
rename from srslte/lib/channel/gauss.c
rename to srslte/lib/phy/channel/gauss.c
diff --git a/srslte/lib/channel/gauss.h b/srslte/lib/phy/channel/gauss.h
similarity index 100%
rename from srslte/lib/channel/gauss.h
rename to srslte/lib/phy/channel/gauss.h
diff --git a/srslte/lib/common/CMakeLists.txt b/srslte/lib/phy/common/CMakeLists.txt
similarity index 100%
rename from srslte/lib/common/CMakeLists.txt
rename to srslte/lib/phy/common/CMakeLists.txt
diff --git a/srslte/lib/common/phy_common.c b/srslte/lib/phy/common/phy_common.c
similarity index 100%
rename from srslte/lib/common/phy_common.c
rename to srslte/lib/phy/common/phy_common.c
diff --git a/srslte/lib/common/sequence.c b/srslte/lib/phy/common/sequence.c
similarity index 100%
rename from srslte/lib/common/sequence.c
rename to srslte/lib/phy/common/sequence.c
diff --git a/srslte/lib/common/timestamp.c b/srslte/lib/phy/common/timestamp.c
similarity index 100%
rename from srslte/lib/common/timestamp.c
rename to srslte/lib/phy/common/timestamp.c
diff --git a/srslte/lib/dft/CMakeLists.txt b/srslte/lib/phy/dft/CMakeLists.txt
similarity index 100%
rename from srslte/lib/dft/CMakeLists.txt
rename to srslte/lib/phy/dft/CMakeLists.txt
diff --git a/srslte/lib/dft/dft_fftw.c b/srslte/lib/phy/dft/dft_fftw.c
similarity index 100%
rename from srslte/lib/dft/dft_fftw.c
rename to srslte/lib/phy/dft/dft_fftw.c
diff --git a/srslte/lib/dft/dft_precoding.c b/srslte/lib/phy/dft/dft_precoding.c
similarity index 100%
rename from srslte/lib/dft/dft_precoding.c
rename to srslte/lib/phy/dft/dft_precoding.c
diff --git a/srslte/lib/dft/ofdm.c b/srslte/lib/phy/dft/ofdm.c
similarity index 100%
rename from srslte/lib/dft/ofdm.c
rename to srslte/lib/phy/dft/ofdm.c
diff --git a/srslte/lib/dft/test/CMakeLists.txt b/srslte/lib/phy/dft/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/dft/test/CMakeLists.txt
rename to srslte/lib/phy/dft/test/CMakeLists.txt
diff --git a/srslte/lib/dft/test/ofdm_test.c b/srslte/lib/phy/dft/test/ofdm_test.c
similarity index 100%
rename from srslte/lib/dft/test/ofdm_test.c
rename to srslte/lib/phy/dft/test/ofdm_test.c
diff --git a/srslte/lib/enb/CMakeLists.txt b/srslte/lib/phy/enb/CMakeLists.txt
similarity index 100%
rename from srslte/lib/enb/CMakeLists.txt
rename to srslte/lib/phy/enb/CMakeLists.txt
diff --git a/srslte/lib/enb/enb_dl.c b/srslte/lib/phy/enb/enb_dl.c
similarity index 100%
rename from srslte/lib/enb/enb_dl.c
rename to srslte/lib/phy/enb/enb_dl.c
diff --git a/srslte/lib/enb/enb_ul.c b/srslte/lib/phy/enb/enb_ul.c
similarity index 100%
rename from srslte/lib/enb/enb_ul.c
rename to srslte/lib/phy/enb/enb_ul.c
diff --git a/srslte/lib/fec/CMakeLists.txt b/srslte/lib/phy/fec/CMakeLists.txt
similarity index 100%
rename from srslte/lib/fec/CMakeLists.txt
rename to srslte/lib/phy/fec/CMakeLists.txt
diff --git a/srslte/lib/fec/cbsegm.c b/srslte/lib/phy/fec/cbsegm.c
similarity index 100%
rename from srslte/lib/fec/cbsegm.c
rename to srslte/lib/phy/fec/cbsegm.c
diff --git a/srslte/lib/fec/convcoder.c b/srslte/lib/phy/fec/convcoder.c
similarity index 100%
rename from srslte/lib/fec/convcoder.c
rename to srslte/lib/phy/fec/convcoder.c
diff --git a/srslte/lib/fec/crc.c b/srslte/lib/phy/fec/crc.c
similarity index 100%
rename from srslte/lib/fec/crc.c
rename to srslte/lib/phy/fec/crc.c
diff --git a/srslte/lib/fec/parity.c b/srslte/lib/phy/fec/parity.c
similarity index 100%
rename from srslte/lib/fec/parity.c
rename to srslte/lib/phy/fec/parity.c
diff --git a/srslte/lib/fec/parity.h b/srslte/lib/phy/fec/parity.h
similarity index 100%
rename from srslte/lib/fec/parity.h
rename to srslte/lib/phy/fec/parity.h
diff --git a/srslte/lib/fec/rm_conv.c b/srslte/lib/phy/fec/rm_conv.c
similarity index 100%
rename from srslte/lib/fec/rm_conv.c
rename to srslte/lib/phy/fec/rm_conv.c
diff --git a/srslte/lib/fec/rm_turbo.c b/srslte/lib/phy/fec/rm_turbo.c
similarity index 100%
rename from srslte/lib/fec/rm_turbo.c
rename to srslte/lib/phy/fec/rm_turbo.c
diff --git a/srslte/lib/fec/softbuffer.c b/srslte/lib/phy/fec/softbuffer.c
similarity index 100%
rename from srslte/lib/fec/softbuffer.c
rename to srslte/lib/phy/fec/softbuffer.c
diff --git a/srslte/lib/fec/tc_interl_lte.c b/srslte/lib/phy/fec/tc_interl_lte.c
similarity index 100%
rename from srslte/lib/fec/tc_interl_lte.c
rename to srslte/lib/phy/fec/tc_interl_lte.c
diff --git a/srslte/lib/fec/tc_interl_umts.c b/srslte/lib/phy/fec/tc_interl_umts.c
similarity index 100%
rename from srslte/lib/fec/tc_interl_umts.c
rename to srslte/lib/phy/fec/tc_interl_umts.c
diff --git a/srslte/lib/fec/test/CMakeLists.txt b/srslte/lib/phy/fec/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/fec/test/CMakeLists.txt
rename to srslte/lib/phy/fec/test/CMakeLists.txt
diff --git a/srslte/lib/fec/test/crc_test.c b/srslte/lib/phy/fec/test/crc_test.c
similarity index 100%
rename from srslte/lib/fec/test/crc_test.c
rename to srslte/lib/phy/fec/test/crc_test.c
diff --git a/srslte/lib/fec/test/crc_test.h b/srslte/lib/phy/fec/test/crc_test.h
similarity index 100%
rename from srslte/lib/fec/test/crc_test.h
rename to srslte/lib/phy/fec/test/crc_test.h
diff --git a/srslte/lib/fec/test/rm_conv_test.c b/srslte/lib/phy/fec/test/rm_conv_test.c
similarity index 100%
rename from srslte/lib/fec/test/rm_conv_test.c
rename to srslte/lib/phy/fec/test/rm_conv_test.c
diff --git a/srslte/lib/fec/test/rm_turbo_rx_mex.c b/srslte/lib/phy/fec/test/rm_turbo_rx_mex.c
similarity index 100%
rename from srslte/lib/fec/test/rm_turbo_rx_mex.c
rename to srslte/lib/phy/fec/test/rm_turbo_rx_mex.c
diff --git a/srslte/lib/fec/test/rm_turbo_test.c b/srslte/lib/phy/fec/test/rm_turbo_test.c
similarity index 100%
rename from srslte/lib/fec/test/rm_turbo_test.c
rename to srslte/lib/phy/fec/test/rm_turbo_test.c
diff --git a/srslte/lib/fec/test/turbocoder_test.c b/srslte/lib/phy/fec/test/turbocoder_test.c
similarity index 100%
rename from srslte/lib/fec/test/turbocoder_test.c
rename to srslte/lib/phy/fec/test/turbocoder_test.c
diff --git a/srslte/lib/fec/test/turbodecoder_test.c b/srslte/lib/phy/fec/test/turbodecoder_test.c
similarity index 100%
rename from srslte/lib/fec/test/turbodecoder_test.c
rename to srslte/lib/phy/fec/test/turbodecoder_test.c
diff --git a/srslte/lib/fec/test/turbodecoder_test.h b/srslte/lib/phy/fec/test/turbodecoder_test.h
similarity index 100%
rename from srslte/lib/fec/test/turbodecoder_test.h
rename to srslte/lib/phy/fec/test/turbodecoder_test.h
diff --git a/srslte/lib/fec/test/turbodecoder_test_mex.c b/srslte/lib/phy/fec/test/turbodecoder_test_mex.c
similarity index 100%
rename from srslte/lib/fec/test/turbodecoder_test_mex.c
rename to srslte/lib/phy/fec/test/turbodecoder_test_mex.c
diff --git a/srslte/lib/fec/test/viterbi_test.c b/srslte/lib/phy/fec/test/viterbi_test.c
similarity index 100%
rename from srslte/lib/fec/test/viterbi_test.c
rename to srslte/lib/phy/fec/test/viterbi_test.c
diff --git a/srslte/lib/fec/test/viterbi_test.h b/srslte/lib/phy/fec/test/viterbi_test.h
similarity index 100%
rename from srslte/lib/fec/test/viterbi_test.h
rename to srslte/lib/phy/fec/test/viterbi_test.h
diff --git a/srslte/lib/fec/test/viterbi_test_mex.c b/srslte/lib/phy/fec/test/viterbi_test_mex.c
similarity index 100%
rename from srslte/lib/fec/test/viterbi_test_mex.c
rename to srslte/lib/phy/fec/test/viterbi_test_mex.c
diff --git a/srslte/lib/fec/turbocoder.c b/srslte/lib/phy/fec/turbocoder.c
similarity index 100%
rename from srslte/lib/fec/turbocoder.c
rename to srslte/lib/phy/fec/turbocoder.c
diff --git a/srslte/lib/fec/turbodecoder.c b/srslte/lib/phy/fec/turbodecoder.c
similarity index 100%
rename from srslte/lib/fec/turbodecoder.c
rename to srslte/lib/phy/fec/turbodecoder.c
diff --git a/srslte/lib/fec/turbodecoder_gen.c b/srslte/lib/phy/fec/turbodecoder_gen.c
similarity index 100%
rename from srslte/lib/fec/turbodecoder_gen.c
rename to srslte/lib/phy/fec/turbodecoder_gen.c
diff --git a/srslte/lib/fec/turbodecoder_sse.c b/srslte/lib/phy/fec/turbodecoder_sse.c
similarity index 100%
rename from srslte/lib/fec/turbodecoder_sse.c
rename to srslte/lib/phy/fec/turbodecoder_sse.c
diff --git a/srslte/lib/fec/viterbi.c b/srslte/lib/phy/fec/viterbi.c
similarity index 100%
rename from srslte/lib/fec/viterbi.c
rename to srslte/lib/phy/fec/viterbi.c
diff --git a/srslte/lib/fec/viterbi37.h b/srslte/lib/phy/fec/viterbi37.h
similarity index 100%
rename from srslte/lib/fec/viterbi37.h
rename to srslte/lib/phy/fec/viterbi37.h
diff --git a/srslte/lib/fec/viterbi37_neon.c b/srslte/lib/phy/fec/viterbi37_neon.c
similarity index 100%
rename from srslte/lib/fec/viterbi37_neon.c
rename to srslte/lib/phy/fec/viterbi37_neon.c
diff --git a/srslte/lib/fec/viterbi37_port.c b/srslte/lib/phy/fec/viterbi37_port.c
similarity index 100%
rename from srslte/lib/fec/viterbi37_port.c
rename to srslte/lib/phy/fec/viterbi37_port.c
diff --git a/srslte/lib/fec/viterbi37_sse.c b/srslte/lib/phy/fec/viterbi37_sse.c
similarity index 100%
rename from srslte/lib/fec/viterbi37_sse.c
rename to srslte/lib/phy/fec/viterbi37_sse.c
diff --git a/srslte/lib/io/CMakeLists.txt b/srslte/lib/phy/io/CMakeLists.txt
similarity index 100%
rename from srslte/lib/io/CMakeLists.txt
rename to srslte/lib/phy/io/CMakeLists.txt
diff --git a/srslte/lib/io/binsource.c b/srslte/lib/phy/io/binsource.c
similarity index 100%
rename from srslte/lib/io/binsource.c
rename to srslte/lib/phy/io/binsource.c
diff --git a/srslte/lib/io/filesink.c b/srslte/lib/phy/io/filesink.c
similarity index 100%
rename from srslte/lib/io/filesink.c
rename to srslte/lib/phy/io/filesink.c
diff --git a/srslte/lib/io/filesource.c b/srslte/lib/phy/io/filesource.c
similarity index 100%
rename from srslte/lib/io/filesource.c
rename to srslte/lib/phy/io/filesource.c
diff --git a/srslte/lib/io/netsink.c b/srslte/lib/phy/io/netsink.c
similarity index 100%
rename from srslte/lib/io/netsink.c
rename to srslte/lib/phy/io/netsink.c
diff --git a/srslte/lib/io/netsource.c b/srslte/lib/phy/io/netsource.c
similarity index 100%
rename from srslte/lib/io/netsource.c
rename to srslte/lib/phy/io/netsource.c
diff --git a/srslte/lib/mimo/CMakeLists.txt b/srslte/lib/phy/mimo/CMakeLists.txt
similarity index 100%
rename from srslte/lib/mimo/CMakeLists.txt
rename to srslte/lib/phy/mimo/CMakeLists.txt
diff --git a/srslte/lib/mimo/layermap.c b/srslte/lib/phy/mimo/layermap.c
similarity index 100%
rename from srslte/lib/mimo/layermap.c
rename to srslte/lib/phy/mimo/layermap.c
diff --git a/srslte/lib/mimo/precoding.c b/srslte/lib/phy/mimo/precoding.c
similarity index 100%
rename from srslte/lib/mimo/precoding.c
rename to srslte/lib/phy/mimo/precoding.c
diff --git a/srslte/lib/mimo/test/CMakeLists.txt b/srslte/lib/phy/mimo/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/mimo/test/CMakeLists.txt
rename to srslte/lib/phy/mimo/test/CMakeLists.txt
diff --git a/srslte/lib/mimo/test/layermap_test.c b/srslte/lib/phy/mimo/test/layermap_test.c
similarity index 100%
rename from srslte/lib/mimo/test/layermap_test.c
rename to srslte/lib/phy/mimo/test/layermap_test.c
diff --git a/srslte/lib/mimo/test/precoder_mex.c b/srslte/lib/phy/mimo/test/precoder_mex.c
similarity index 100%
rename from srslte/lib/mimo/test/precoder_mex.c
rename to srslte/lib/phy/mimo/test/precoder_mex.c
diff --git a/srslte/lib/mimo/test/precoder_test.c b/srslte/lib/phy/mimo/test/precoder_test.c
similarity index 100%
rename from srslte/lib/mimo/test/precoder_test.c
rename to srslte/lib/phy/mimo/test/precoder_test.c
diff --git a/srslte/lib/mimo/test/predecoder_mex.c b/srslte/lib/phy/mimo/test/predecoder_mex.c
similarity index 100%
rename from srslte/lib/mimo/test/predecoder_mex.c
rename to srslte/lib/phy/mimo/test/predecoder_mex.c
diff --git a/srslte/lib/modem/CMakeLists.txt b/srslte/lib/phy/modem/CMakeLists.txt
similarity index 100%
rename from srslte/lib/modem/CMakeLists.txt
rename to srslte/lib/phy/modem/CMakeLists.txt
diff --git a/srslte/lib/modem/demod_hard.c b/srslte/lib/phy/modem/demod_hard.c
similarity index 100%
rename from srslte/lib/modem/demod_hard.c
rename to srslte/lib/phy/modem/demod_hard.c
diff --git a/srslte/lib/modem/demod_soft.c b/srslte/lib/phy/modem/demod_soft.c
similarity index 100%
rename from srslte/lib/modem/demod_soft.c
rename to srslte/lib/phy/modem/demod_soft.c
diff --git a/srslte/lib/modem/hard_demod_lte.c b/srslte/lib/phy/modem/hard_demod_lte.c
similarity index 100%
rename from srslte/lib/modem/hard_demod_lte.c
rename to srslte/lib/phy/modem/hard_demod_lte.c
diff --git a/srslte/lib/modem/hard_demod_lte.h b/srslte/lib/phy/modem/hard_demod_lte.h
similarity index 100%
rename from srslte/lib/modem/hard_demod_lte.h
rename to srslte/lib/phy/modem/hard_demod_lte.h
diff --git a/srslte/lib/modem/lte_tables.c b/srslte/lib/phy/modem/lte_tables.c
similarity index 100%
rename from srslte/lib/modem/lte_tables.c
rename to srslte/lib/phy/modem/lte_tables.c
diff --git a/srslte/lib/modem/lte_tables.h b/srslte/lib/phy/modem/lte_tables.h
similarity index 100%
rename from srslte/lib/modem/lte_tables.h
rename to srslte/lib/phy/modem/lte_tables.h
diff --git a/srslte/lib/modem/mod.c b/srslte/lib/phy/modem/mod.c
similarity index 100%
rename from srslte/lib/modem/mod.c
rename to srslte/lib/phy/modem/mod.c
diff --git a/srslte/lib/modem/modem_table.c b/srslte/lib/phy/modem/modem_table.c
similarity index 100%
rename from srslte/lib/modem/modem_table.c
rename to srslte/lib/phy/modem/modem_table.c
diff --git a/srslte/lib/modem/test/CMakeLists.txt b/srslte/lib/phy/modem/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/modem/test/CMakeLists.txt
rename to srslte/lib/phy/modem/test/CMakeLists.txt
diff --git a/srslte/lib/modem/test/modem_test.c b/srslte/lib/phy/modem/test/modem_test.c
similarity index 100%
rename from srslte/lib/modem/test/modem_test.c
rename to srslte/lib/phy/modem/test/modem_test.c
diff --git a/srslte/lib/modem/test/soft_demod_test.c b/srslte/lib/phy/modem/test/soft_demod_test.c
similarity index 100%
rename from srslte/lib/modem/test/soft_demod_test.c
rename to srslte/lib/phy/modem/test/soft_demod_test.c
diff --git a/srslte/lib/phch/CMakeLists.txt b/srslte/lib/phy/phch/CMakeLists.txt
similarity index 100%
rename from srslte/lib/phch/CMakeLists.txt
rename to srslte/lib/phy/phch/CMakeLists.txt
diff --git a/srslte/lib/phch/cqi.c b/srslte/lib/phy/phch/cqi.c
similarity index 100%
rename from srslte/lib/phch/cqi.c
rename to srslte/lib/phy/phch/cqi.c
diff --git a/srslte/lib/phch/dci.c b/srslte/lib/phy/phch/dci.c
similarity index 100%
rename from srslte/lib/phch/dci.c
rename to srslte/lib/phy/phch/dci.c
diff --git a/srslte/lib/phch/dci_sz_table.h b/srslte/lib/phy/phch/dci_sz_table.h
similarity index 100%
rename from srslte/lib/phch/dci_sz_table.h
rename to srslte/lib/phy/phch/dci_sz_table.h
diff --git a/srslte/lib/phch/pbch.c b/srslte/lib/phy/phch/pbch.c
similarity index 100%
rename from srslte/lib/phch/pbch.c
rename to srslte/lib/phy/phch/pbch.c
diff --git a/srslte/lib/phch/pcfich.c b/srslte/lib/phy/phch/pcfich.c
similarity index 100%
rename from srslte/lib/phch/pcfich.c
rename to srslte/lib/phy/phch/pcfich.c
diff --git a/srslte/lib/phch/pdcch.c b/srslte/lib/phy/phch/pdcch.c
similarity index 100%
rename from srslte/lib/phch/pdcch.c
rename to srslte/lib/phy/phch/pdcch.c
diff --git a/srslte/lib/phch/pdsch.c b/srslte/lib/phy/phch/pdsch.c
similarity index 100%
rename from srslte/lib/phch/pdsch.c
rename to srslte/lib/phy/phch/pdsch.c
diff --git a/srslte/lib/phch/phich.c b/srslte/lib/phy/phch/phich.c
similarity index 100%
rename from srslte/lib/phch/phich.c
rename to srslte/lib/phy/phch/phich.c
diff --git a/srslte/lib/phch/prach.c b/srslte/lib/phy/phch/prach.c
similarity index 100%
rename from srslte/lib/phch/prach.c
rename to srslte/lib/phy/phch/prach.c
diff --git a/srslte/lib/phch/prb_dl.c b/srslte/lib/phy/phch/prb_dl.c
similarity index 100%
rename from srslte/lib/phch/prb_dl.c
rename to srslte/lib/phy/phch/prb_dl.c
diff --git a/srslte/lib/phch/prb_dl.h b/srslte/lib/phy/phch/prb_dl.h
similarity index 100%
rename from srslte/lib/phch/prb_dl.h
rename to srslte/lib/phy/phch/prb_dl.h
diff --git a/srslte/lib/phch/pucch.c b/srslte/lib/phy/phch/pucch.c
similarity index 100%
rename from srslte/lib/phch/pucch.c
rename to srslte/lib/phy/phch/pucch.c
diff --git a/srslte/lib/phch/pusch.c b/srslte/lib/phy/phch/pusch.c
similarity index 100%
rename from srslte/lib/phch/pusch.c
rename to srslte/lib/phy/phch/pusch.c
diff --git a/srslte/lib/phch/ra.c b/srslte/lib/phy/phch/ra.c
similarity index 100%
rename from srslte/lib/phch/ra.c
rename to srslte/lib/phy/phch/ra.c
diff --git a/srslte/lib/phch/regs.c b/srslte/lib/phy/phch/regs.c
similarity index 100%
rename from srslte/lib/phch/regs.c
rename to srslte/lib/phy/phch/regs.c
diff --git a/srslte/lib/phch/sch.c b/srslte/lib/phy/phch/sch.c
similarity index 100%
rename from srslte/lib/phch/sch.c
rename to srslte/lib/phy/phch/sch.c
diff --git a/srslte/lib/phch/sequences.c b/srslte/lib/phy/phch/sequences.c
similarity index 100%
rename from srslte/lib/phch/sequences.c
rename to srslte/lib/phy/phch/sequences.c
diff --git a/srslte/lib/phch/tbs_tables.h b/srslte/lib/phy/phch/tbs_tables.h
similarity index 100%
rename from srslte/lib/phch/tbs_tables.h
rename to srslte/lib/phy/phch/tbs_tables.h
diff --git a/srslte/lib/phch/test/CMakeLists.txt b/srslte/lib/phy/phch/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/phch/test/CMakeLists.txt
rename to srslte/lib/phy/phch/test/CMakeLists.txt
diff --git a/srslte/lib/phch/test/dlsch_encode_test_mex.c b/srslte/lib/phy/phch/test/dlsch_encode_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/dlsch_encode_test_mex.c
rename to srslte/lib/phy/phch/test/dlsch_encode_test_mex.c
diff --git a/srslte/lib/phch/test/pbch_file_test.c b/srslte/lib/phy/phch/test/pbch_file_test.c
similarity index 100%
rename from srslte/lib/phch/test/pbch_file_test.c
rename to srslte/lib/phy/phch/test/pbch_file_test.c
diff --git a/srslte/lib/phch/test/pbch_test.c b/srslte/lib/phy/phch/test/pbch_test.c
similarity index 100%
rename from srslte/lib/phch/test/pbch_test.c
rename to srslte/lib/phy/phch/test/pbch_test.c
diff --git a/srslte/lib/phch/test/pbch_test_mex.c b/srslte/lib/phy/phch/test/pbch_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pbch_test_mex.c
rename to srslte/lib/phy/phch/test/pbch_test_mex.c
diff --git a/srslte/lib/phch/test/pcfich_file_test.c b/srslte/lib/phy/phch/test/pcfich_file_test.c
similarity index 100%
rename from srslte/lib/phch/test/pcfich_file_test.c
rename to srslte/lib/phy/phch/test/pcfich_file_test.c
diff --git a/srslte/lib/phch/test/pcfich_test.c b/srslte/lib/phy/phch/test/pcfich_test.c
similarity index 100%
rename from srslte/lib/phch/test/pcfich_test.c
rename to srslte/lib/phy/phch/test/pcfich_test.c
diff --git a/srslte/lib/phch/test/pcfich_test_mex.c b/srslte/lib/phy/phch/test/pcfich_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pcfich_test_mex.c
rename to srslte/lib/phy/phch/test/pcfich_test_mex.c
diff --git a/srslte/lib/phch/test/pdcch_file_test.c b/srslte/lib/phy/phch/test/pdcch_file_test.c
similarity index 100%
rename from srslte/lib/phch/test/pdcch_file_test.c
rename to srslte/lib/phy/phch/test/pdcch_file_test.c
diff --git a/srslte/lib/phch/test/pdcch_test.c b/srslte/lib/phy/phch/test/pdcch_test.c
similarity index 100%
rename from srslte/lib/phch/test/pdcch_test.c
rename to srslte/lib/phy/phch/test/pdcch_test.c
diff --git a/srslte/lib/phch/test/pdcch_test_mex.c b/srslte/lib/phy/phch/test/pdcch_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pdcch_test_mex.c
rename to srslte/lib/phy/phch/test/pdcch_test_mex.c
diff --git a/srslte/lib/phch/test/pdsch_pdcch_file_test.c b/srslte/lib/phy/phch/test/pdsch_pdcch_file_test.c
similarity index 100%
rename from srslte/lib/phch/test/pdsch_pdcch_file_test.c
rename to srslte/lib/phy/phch/test/pdsch_pdcch_file_test.c
diff --git a/srslte/lib/phch/test/pdsch_test.c b/srslte/lib/phy/phch/test/pdsch_test.c
similarity index 100%
rename from srslte/lib/phch/test/pdsch_test.c
rename to srslte/lib/phy/phch/test/pdsch_test.c
diff --git a/srslte/lib/phch/test/pdsch_test_mex.c b/srslte/lib/phy/phch/test/pdsch_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pdsch_test_mex.c
rename to srslte/lib/phy/phch/test/pdsch_test_mex.c
diff --git a/srslte/lib/phch/test/phich_file_test.c b/srslte/lib/phy/phch/test/phich_file_test.c
similarity index 100%
rename from srslte/lib/phch/test/phich_file_test.c
rename to srslte/lib/phy/phch/test/phich_file_test.c
diff --git a/srslte/lib/phch/test/phich_test.c b/srslte/lib/phy/phch/test/phich_test.c
similarity index 100%
rename from srslte/lib/phch/test/phich_test.c
rename to srslte/lib/phy/phch/test/phich_test.c
diff --git a/srslte/lib/phch/test/phich_test_mex.c b/srslte/lib/phy/phch/test/phich_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/phich_test_mex.c
rename to srslte/lib/phy/phch/test/phich_test_mex.c
diff --git a/srslte/lib/phch/test/prach_detect_test_mex.c b/srslte/lib/phy/phch/test/prach_detect_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/prach_detect_test_mex.c
rename to srslte/lib/phy/phch/test/prach_detect_test_mex.c
diff --git a/srslte/lib/phch/test/prach_test.c b/srslte/lib/phy/phch/test/prach_test.c
similarity index 100%
rename from srslte/lib/phch/test/prach_test.c
rename to srslte/lib/phy/phch/test/prach_test.c
diff --git a/srslte/lib/phch/test/prach_test_mex.c b/srslte/lib/phy/phch/test/prach_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/prach_test_mex.c
rename to srslte/lib/phy/phch/test/prach_test_mex.c
diff --git a/srslte/lib/phch/test/prach_test_multi.c b/srslte/lib/phy/phch/test/prach_test_multi.c
similarity index 100%
rename from srslte/lib/phch/test/prach_test_multi.c
rename to srslte/lib/phy/phch/test/prach_test_multi.c
diff --git a/srslte/lib/phch/test/prach_test_usrp.c b/srslte/lib/phy/phch/test/prach_test_usrp.c
similarity index 100%
rename from srslte/lib/phch/test/prach_test_usrp.c
rename to srslte/lib/phy/phch/test/prach_test_usrp.c
diff --git a/srslte/lib/phch/test/pucch_encode_test_mex.c b/srslte/lib/phy/phch/test/pucch_encode_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pucch_encode_test_mex.c
rename to srslte/lib/phy/phch/test/pucch_encode_test_mex.c
diff --git a/srslte/lib/phch/test/pucch_test.c b/srslte/lib/phy/phch/test/pucch_test.c
similarity index 100%
rename from srslte/lib/phch/test/pucch_test.c
rename to srslte/lib/phy/phch/test/pucch_test.c
diff --git a/srslte/lib/phch/test/pucch_test_mex.c b/srslte/lib/phy/phch/test/pucch_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pucch_test_mex.c
rename to srslte/lib/phy/phch/test/pucch_test_mex.c
diff --git a/srslte/lib/phch/test/pusch_encode_test_mex.c b/srslte/lib/phy/phch/test/pusch_encode_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pusch_encode_test_mex.c
rename to srslte/lib/phy/phch/test/pusch_encode_test_mex.c
diff --git a/srslte/lib/phch/test/pusch_test.c b/srslte/lib/phy/phch/test/pusch_test.c
similarity index 100%
rename from srslte/lib/phch/test/pusch_test.c
rename to srslte/lib/phy/phch/test/pusch_test.c
diff --git a/srslte/lib/phch/test/pusch_test_mex.c b/srslte/lib/phy/phch/test/pusch_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/pusch_test_mex.c
rename to srslte/lib/phy/phch/test/pusch_test_mex.c
diff --git a/srslte/lib/phch/test/signal.1.92M.amar.dat b/srslte/lib/phy/phch/test/signal.1.92M.amar.dat
similarity index 100%
rename from srslte/lib/phch/test/signal.1.92M.amar.dat
rename to srslte/lib/phy/phch/test/signal.1.92M.amar.dat
diff --git a/srslte/lib/phch/test/signal.1.92M.dat b/srslte/lib/phy/phch/test/signal.1.92M.dat
similarity index 100%
rename from srslte/lib/phch/test/signal.1.92M.dat
rename to srslte/lib/phy/phch/test/signal.1.92M.dat
diff --git a/srslte/lib/phch/test/signal.10M.dat b/srslte/lib/phy/phch/test/signal.10M.dat
similarity index 100%
rename from srslte/lib/phch/test/signal.10M.dat
rename to srslte/lib/phy/phch/test/signal.10M.dat
diff --git a/srslte/lib/phch/test/ulsch_encode_test_mex.c b/srslte/lib/phy/phch/test/ulsch_encode_test_mex.c
similarity index 100%
rename from srslte/lib/phch/test/ulsch_encode_test_mex.c
rename to srslte/lib/phy/phch/test/ulsch_encode_test_mex.c
diff --git a/srslte/lib/phch/uci.c b/srslte/lib/phy/phch/uci.c
similarity index 100%
rename from srslte/lib/phch/uci.c
rename to srslte/lib/phy/phch/uci.c
diff --git a/srslte/lib/resampling/CMakeLists.txt b/srslte/lib/phy/resampling/CMakeLists.txt
similarity index 100%
rename from srslte/lib/resampling/CMakeLists.txt
rename to srslte/lib/phy/resampling/CMakeLists.txt
diff --git a/srslte/lib/resampling/decim.c b/srslte/lib/phy/resampling/decim.c
similarity index 100%
rename from srslte/lib/resampling/decim.c
rename to srslte/lib/phy/resampling/decim.c
diff --git a/srslte/lib/resampling/interp.c b/srslte/lib/phy/resampling/interp.c
similarity index 100%
rename from srslte/lib/resampling/interp.c
rename to srslte/lib/phy/resampling/interp.c
diff --git a/srslte/lib/resampling/resample_arb.c b/srslte/lib/phy/resampling/resample_arb.c
similarity index 100%
rename from srslte/lib/resampling/resample_arb.c
rename to srslte/lib/phy/resampling/resample_arb.c
diff --git a/srslte/lib/resampling/test/CMakeLists.txt b/srslte/lib/phy/resampling/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/resampling/test/CMakeLists.txt
rename to srslte/lib/phy/resampling/test/CMakeLists.txt
diff --git a/srslte/lib/resampling/test/resample_arb_bench.c b/srslte/lib/phy/resampling/test/resample_arb_bench.c
similarity index 100%
rename from srslte/lib/resampling/test/resample_arb_bench.c
rename to srslte/lib/phy/resampling/test/resample_arb_bench.c
diff --git a/srslte/lib/resampling/test/resample_arb_test.c b/srslte/lib/phy/resampling/test/resample_arb_test.c
similarity index 100%
rename from srslte/lib/resampling/test/resample_arb_test.c
rename to srslte/lib/phy/resampling/test/resample_arb_test.c
diff --git a/srslte/lib/rf/CMakeLists.txt b/srslte/lib/phy/rf/CMakeLists.txt
similarity index 100%
rename from srslte/lib/rf/CMakeLists.txt
rename to srslte/lib/phy/rf/CMakeLists.txt
diff --git a/srslte/lib/rf/rf_blade_imp.c b/srslte/lib/phy/rf/rf_blade_imp.c
similarity index 100%
rename from srslte/lib/rf/rf_blade_imp.c
rename to srslte/lib/phy/rf/rf_blade_imp.c
diff --git a/srslte/lib/rf/rf_blade_imp.h b/srslte/lib/phy/rf/rf_blade_imp.h
similarity index 100%
rename from srslte/lib/rf/rf_blade_imp.h
rename to srslte/lib/phy/rf/rf_blade_imp.h
diff --git a/srslte/lib/rf/rf_dev.h b/srslte/lib/phy/rf/rf_dev.h
similarity index 100%
rename from srslte/lib/rf/rf_dev.h
rename to srslte/lib/phy/rf/rf_dev.h
diff --git a/srslte/lib/rf/rf_imp.c b/srslte/lib/phy/rf/rf_imp.c
similarity index 100%
rename from srslte/lib/rf/rf_imp.c
rename to srslte/lib/phy/rf/rf_imp.c
diff --git a/srslte/lib/rf/rf_limesdr_imp.c b/srslte/lib/phy/rf/rf_limesdr_imp.c
similarity index 100%
rename from srslte/lib/rf/rf_limesdr_imp.c
rename to srslte/lib/phy/rf/rf_limesdr_imp.c
diff --git a/srslte/lib/rf/rf_limesdr_imp.h b/srslte/lib/phy/rf/rf_limesdr_imp.h
similarity index 100%
rename from srslte/lib/rf/rf_limesdr_imp.h
rename to srslte/lib/phy/rf/rf_limesdr_imp.h
diff --git a/srslte/lib/rf/rf_soapy_imp.c b/srslte/lib/phy/rf/rf_soapy_imp.c
similarity index 100%
rename from srslte/lib/rf/rf_soapy_imp.c
rename to srslte/lib/phy/rf/rf_soapy_imp.c
diff --git a/srslte/lib/rf/rf_soapy_imp.h b/srslte/lib/phy/rf/rf_soapy_imp.h
similarity index 100%
rename from srslte/lib/rf/rf_soapy_imp.h
rename to srslte/lib/phy/rf/rf_soapy_imp.h
diff --git a/srslte/lib/rf/rf_uhd_imp.c b/srslte/lib/phy/rf/rf_uhd_imp.c
similarity index 100%
rename from srslte/lib/rf/rf_uhd_imp.c
rename to srslte/lib/phy/rf/rf_uhd_imp.c
diff --git a/srslte/lib/rf/rf_uhd_imp.h b/srslte/lib/phy/rf/rf_uhd_imp.h
similarity index 100%
rename from srslte/lib/rf/rf_uhd_imp.h
rename to srslte/lib/phy/rf/rf_uhd_imp.h
diff --git a/srslte/lib/rf/rf_utils.c b/srslte/lib/phy/rf/rf_utils.c
similarity index 100%
rename from srslte/lib/rf/rf_utils.c
rename to srslte/lib/phy/rf/rf_utils.c
diff --git a/srslte/lib/rf/uhd_c_api.cpp b/srslte/lib/phy/rf/uhd_c_api.cpp
similarity index 100%
rename from srslte/lib/rf/uhd_c_api.cpp
rename to srslte/lib/phy/rf/uhd_c_api.cpp
diff --git a/srslte/lib/rf/uhd_c_api.h b/srslte/lib/phy/rf/uhd_c_api.h
similarity index 100%
rename from srslte/lib/rf/uhd_c_api.h
rename to srslte/lib/phy/rf/uhd_c_api.h
diff --git a/srslte/lib/scrambling/CMakeLists.txt b/srslte/lib/phy/scrambling/CMakeLists.txt
similarity index 100%
rename from srslte/lib/scrambling/CMakeLists.txt
rename to srslte/lib/phy/scrambling/CMakeLists.txt
diff --git a/srslte/lib/scrambling/scrambling.c b/srslte/lib/phy/scrambling/scrambling.c
similarity index 100%
rename from srslte/lib/scrambling/scrambling.c
rename to srslte/lib/phy/scrambling/scrambling.c
diff --git a/srslte/lib/scrambling/test/CMakeLists.txt b/srslte/lib/phy/scrambling/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/scrambling/test/CMakeLists.txt
rename to srslte/lib/phy/scrambling/test/CMakeLists.txt
diff --git a/srslte/lib/scrambling/test/scrambling_test.c b/srslte/lib/phy/scrambling/test/scrambling_test.c
similarity index 100%
rename from srslte/lib/scrambling/test/scrambling_test.c
rename to srslte/lib/phy/scrambling/test/scrambling_test.c
diff --git a/srslte/lib/sync/CMakeLists.txt b/srslte/lib/phy/sync/CMakeLists.txt
similarity index 100%
rename from srslte/lib/sync/CMakeLists.txt
rename to srslte/lib/phy/sync/CMakeLists.txt
diff --git a/srslte/lib/sync/cfo.c b/srslte/lib/phy/sync/cfo.c
similarity index 100%
rename from srslte/lib/sync/cfo.c
rename to srslte/lib/phy/sync/cfo.c
diff --git a/srslte/lib/sync/cp.c b/srslte/lib/phy/sync/cp.c
similarity index 100%
rename from srslte/lib/sync/cp.c
rename to srslte/lib/phy/sync/cp.c
diff --git a/srslte/lib/sync/find_sss.c b/srslte/lib/phy/sync/find_sss.c
similarity index 100%
rename from srslte/lib/sync/find_sss.c
rename to srslte/lib/phy/sync/find_sss.c
diff --git a/srslte/lib/sync/gen_sss.c b/srslte/lib/phy/sync/gen_sss.c
similarity index 100%
rename from srslte/lib/sync/gen_sss.c
rename to srslte/lib/phy/sync/gen_sss.c
diff --git a/srslte/lib/sync/pss.c b/srslte/lib/phy/sync/pss.c
similarity index 100%
rename from srslte/lib/sync/pss.c
rename to srslte/lib/phy/sync/pss.c
diff --git a/srslte/lib/sync/sfo.c b/srslte/lib/phy/sync/sfo.c
similarity index 100%
rename from srslte/lib/sync/sfo.c
rename to srslte/lib/phy/sync/sfo.c
diff --git a/srslte/lib/sync/sss.c b/srslte/lib/phy/sync/sss.c
similarity index 100%
rename from srslte/lib/sync/sss.c
rename to srslte/lib/phy/sync/sss.c
diff --git a/srslte/lib/sync/sync.c b/srslte/lib/phy/sync/sync.c
similarity index 100%
rename from srslte/lib/sync/sync.c
rename to srslte/lib/phy/sync/sync.c
diff --git a/srslte/lib/sync/test/CMakeLists.txt b/srslte/lib/phy/sync/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/sync/test/CMakeLists.txt
rename to srslte/lib/phy/sync/test/CMakeLists.txt
diff --git a/srslte/lib/sync/test/cfo_test.c b/srslte/lib/phy/sync/test/cfo_test.c
similarity index 100%
rename from srslte/lib/sync/test/cfo_test.c
rename to srslte/lib/phy/sync/test/cfo_test.c
diff --git a/srslte/lib/sync/test/cp_mex.c b/srslte/lib/phy/sync/test/cp_mex.c
similarity index 100%
rename from srslte/lib/sync/test/cp_mex.c
rename to srslte/lib/phy/sync/test/cp_mex.c
diff --git a/srslte/lib/sync/test/pss_file.c b/srslte/lib/phy/sync/test/pss_file.c
similarity index 100%
rename from srslte/lib/sync/test/pss_file.c
rename to srslte/lib/phy/sync/test/pss_file.c
diff --git a/srslte/lib/sync/test/pss_mex.c b/srslte/lib/phy/sync/test/pss_mex.c
similarity index 100%
rename from srslte/lib/sync/test/pss_mex.c
rename to srslte/lib/phy/sync/test/pss_mex.c
diff --git a/srslte/lib/sync/test/pss_usrp.c b/srslte/lib/phy/sync/test/pss_usrp.c
similarity index 100%
rename from srslte/lib/sync/test/pss_usrp.c
rename to srslte/lib/phy/sync/test/pss_usrp.c
diff --git a/srslte/lib/sync/test/sss_mex.c b/srslte/lib/phy/sync/test/sss_mex.c
similarity index 100%
rename from srslte/lib/sync/test/sss_mex.c
rename to srslte/lib/phy/sync/test/sss_mex.c
diff --git a/srslte/lib/sync/test/sync_test.c b/srslte/lib/phy/sync/test/sync_test.c
similarity index 100%
rename from srslte/lib/sync/test/sync_test.c
rename to srslte/lib/phy/sync/test/sync_test.c
diff --git a/srslte/lib/ue/CMakeLists.txt b/srslte/lib/phy/ue/CMakeLists.txt
similarity index 100%
rename from srslte/lib/ue/CMakeLists.txt
rename to srslte/lib/phy/ue/CMakeLists.txt
diff --git a/srslte/lib/ue/ue_cell_search.c b/srslte/lib/phy/ue/ue_cell_search.c
similarity index 100%
rename from srslte/lib/ue/ue_cell_search.c
rename to srslte/lib/phy/ue/ue_cell_search.c
diff --git a/srslte/lib/ue/ue_dl.c b/srslte/lib/phy/ue/ue_dl.c
similarity index 100%
rename from srslte/lib/ue/ue_dl.c
rename to srslte/lib/phy/ue/ue_dl.c
diff --git a/srslte/lib/ue/ue_mib.c b/srslte/lib/phy/ue/ue_mib.c
similarity index 100%
rename from srslte/lib/ue/ue_mib.c
rename to srslte/lib/phy/ue/ue_mib.c
diff --git a/srslte/lib/ue/ue_sync.c b/srslte/lib/phy/ue/ue_sync.c
similarity index 100%
rename from srslte/lib/ue/ue_sync.c
rename to srslte/lib/phy/ue/ue_sync.c
diff --git a/srslte/lib/ue/ue_ul.c b/srslte/lib/phy/ue/ue_ul.c
similarity index 100%
rename from srslte/lib/ue/ue_ul.c
rename to srslte/lib/phy/ue/ue_ul.c
diff --git a/srslte/lib/utils/CMakeLists.txt b/srslte/lib/phy/utils/CMakeLists.txt
similarity index 100%
rename from srslte/lib/utils/CMakeLists.txt
rename to srslte/lib/phy/utils/CMakeLists.txt
diff --git a/srslte/lib/utils/bit.c b/srslte/lib/phy/utils/bit.c
similarity index 100%
rename from srslte/lib/utils/bit.c
rename to srslte/lib/phy/utils/bit.c
diff --git a/srslte/lib/utils/cexptab.c b/srslte/lib/phy/utils/cexptab.c
similarity index 100%
rename from srslte/lib/utils/cexptab.c
rename to srslte/lib/phy/utils/cexptab.c
diff --git a/srslte/lib/utils/convolution.c b/srslte/lib/phy/utils/convolution.c
similarity index 100%
rename from srslte/lib/utils/convolution.c
rename to srslte/lib/phy/utils/convolution.c
diff --git a/srslte/lib/utils/debug.c b/srslte/lib/phy/utils/debug.c
similarity index 100%
rename from srslte/lib/utils/debug.c
rename to srslte/lib/phy/utils/debug.c
diff --git a/srslte/lib/utils/filter.c b/srslte/lib/phy/utils/filter.c
similarity index 100%
rename from srslte/lib/utils/filter.c
rename to srslte/lib/phy/utils/filter.c
diff --git a/srslte/lib/utils/ringbuffer.c b/srslte/lib/phy/utils/ringbuffer.c
similarity index 100%
rename from srslte/lib/utils/ringbuffer.c
rename to srslte/lib/phy/utils/ringbuffer.c
diff --git a/srslte/lib/utils/test/CMakeLists.txt b/srslte/lib/phy/utils/test/CMakeLists.txt
similarity index 100%
rename from srslte/lib/utils/test/CMakeLists.txt
rename to srslte/lib/phy/utils/test/CMakeLists.txt
diff --git a/srslte/lib/utils/test/dft_test.c b/srslte/lib/phy/utils/test/dft_test.c
similarity index 100%
rename from srslte/lib/utils/test/dft_test.c
rename to srslte/lib/phy/utils/test/dft_test.c
diff --git a/srslte/lib/utils/vector.c b/srslte/lib/phy/utils/vector.c
similarity index 100%
rename from srslte/lib/utils/vector.c
rename to srslte/lib/phy/utils/vector.c
diff --git a/srslte/lib/utils/vector_simd.c b/srslte/lib/phy/utils/vector_simd.c
similarity index 100%
rename from srslte/lib/utils/vector_simd.c
rename to srslte/lib/phy/utils/vector_simd.c