fix includes

srslte/examples/cell_measurement.c

@@ -38,8 +38,8 @@
 #define ENABLE_AGC_DEFAULT
 
 #include "srslte/srslte.h"
-#include "srslte/rf/rf.h"
-#include "srslte/rf/rf_utils.h"
+#include "srslte/phy/rf/rf.h"
+#include "srslte/phy/rf/rf_utils.h"
 
 cell_search_cfg_t cell_detect_config = {
   SRSLTE_DEFAULT_MAX_FRAMES_PBCH,

srslte/examples/cell_search.c

@@ -37,11 +37,11 @@
 
 #include "srslte/srslte.h"
 
-#include "srslte/rf/rf_utils.h"
+#include "srslte/phy/rf/rf_utils.h"
 
 
 #ifndef DISABLE_RF
-#include "srslte/rf/rf.h"
+#include "srslte/phy/rf/rf.h"
 #endif
 
 #define MHZ             1000000

srslte/examples/pdsch_enodeb.c

@@ -41,7 +41,7 @@
 
 
 #ifndef DISABLE_RF
-#include "srslte/rf/rf.h"
+#include "srslte/phy/rf/rf.h"
 srslte_rf_t rf;
 #else
 #warning Compiling pdsch_ue with no RF support

srslte/examples/pdsch_ue.c

@@ -42,8 +42,8 @@
 #define ENABLE_AGC_DEFAULT
 
 #ifndef DISABLE_RF
-#include "srslte/rf/rf.h"
-#include "srslte/rf/rf_utils.h"
+#include "srslte/phy/rf/rf.h"
+#include "srslte/phy/rf/rf_utils.h"
 
 cell_search_cfg_t cell_detect_config = {
   SRSLTE_DEFAULT_MAX_FRAMES_PBCH,

srslte/examples/tutorial_examples/pss.c

@@ -35,7 +35,7 @@
 #include <stdbool.h>
 
 #include "srslte/srslte.h"
-#include "srslte/rf/rf.h"
+#include "srslte/phy/rf/rf.h"
 
 
 #ifndef DISABLE_GRAPHICS

srslte/examples/tutorial_examples/simple_tx.c

@@ -35,7 +35,7 @@
 
 #include "srslte/srslte.h"
 
-#include "srslte/rf/rf.h"
+#include "srslte/phy/rf/rf.h"
 srslte_rf_t rf;
 
 char *output_file_name = NULL;

srslte/examples/usrp_capture.c

@@ -36,8 +36,8 @@
 #include <stdbool.h>
 
 #include "srslte/srslte.h"
-#include "srslte/rf/rf.h"
-#include "srslte/io/filesink.h"
+#include "srslte/phy/rf/rf.h"
+#include "srslte/phy/io/filesink.h"
 
 static bool keep_running = true;
 char *output_file_name;

srslte/examples/usrp_capture_sync.c

@@ -36,7 +36,7 @@
 #include <stdbool.h>
 
 #include "srslte/srslte.h"
-#include "srslte/rf/rf.h"
+#include "srslte/phy/rf/rf.h"
 
 static bool keep_running = true;
 char *output_file_name = NULL;

srslte/examples/usrp_txrx.c

@@ -33,7 +33,7 @@
 #include <time.h>
 #include <complex.h>
 
-#include "srslte/rf/rf.h"
+#include "srslte/phy/rf/rf.h"
 #include "srslte/srslte.h"
 
 uint32_t nof_prb    = 25;

srslte/include/srslte/phy/ch_estimation/chest_dl.h

@@ -45,11 +45,11 @@
 
 #include "srslte/config.h"
 
-#include "srslte/ch_estimation/chest_common.h"
-#include "srslte/resampling/interp.h"
-#include "srslte/ch_estimation/refsignal_dl.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/sync/pss.h"
+#include "srslte/phy/ch_estimation/chest_common.h"
+#include "srslte/phy/resampling/interp.h"
+#include "srslte/phy/ch_estimation/refsignal_dl.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/sync/pss.h"
 
 
 typedef enum {

srslte/include/srslte/phy/ch_estimation/chest_ul.h

@@ -43,10 +43,10 @@
 
 #include "srslte/config.h"
 
-#include "srslte/ch_estimation/chest_common.h"
-#include "srslte/resampling/interp.h"
-#include "srslte/ch_estimation/refsignal_ul.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/ch_estimation/chest_common.h"
+#include "srslte/phy/resampling/interp.h"
+#include "srslte/phy/ch_estimation/refsignal_ul.h"
+#include "srslte/phy/common/phy_common.h"
 
 typedef struct {
   srslte_cell_t cell; 

srslte/include/srslte/phy/ch_estimation/refsignal_dl.h

@@ -36,7 +36,7 @@
 #define SRSLTE_REFSIGNAL_DL_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 // Number of references in a subframe: there are 2 symbols for port_id=0,1 x 2 slots x 2 refs per prb
 #define SRSLTE_REFSIGNAL_NUM_SF(nof_prb, port_id)     (((port_id)<2?8:4)*(nof_prb))

srslte/include/srslte/phy/ch_estimation/refsignal_ul.h

@@ -36,8 +36,8 @@
 #define SRSLTE_REFSIGNAL_UL_
 
 #include "srslte/config.h"
-#include "srslte/phch/pucch.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/phch/pucch.h"
+#include "srslte/phy/common/phy_common.h"
 
 #define SRSLTE_NOF_GROUPS_U    30
 #define SRSLTE_NOF_SEQUENCES_U 2

srslte/include/srslte/phy/common/sequence.h

@@ -37,7 +37,7 @@
 #define LTESEQ_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 typedef struct SRSLTE_API {
   uint8_t *c;

srslte/include/srslte/phy/dft/dft_precoding.h

@@ -37,8 +37,8 @@
 #define DFTPREC_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/dft/dft.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/dft/dft.h"
 
 /* DFT-based Transform Precoding object */
 typedef struct SRSLTE_API {

srslte/include/srslte/phy/dft/ofdm.h

@@ -41,8 +41,8 @@
 #include <stdlib.h>
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/dft/dft.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/dft/dft.h"
 
 /* This is common for both directions */
 typedef struct SRSLTE_API{

srslte/include/srslte/phy/enb/enb_dl.h

@@ -40,25 +40,25 @@
 
 #include <stdbool.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/dft/ofdm.h"
-#include "srslte/sync/pss.h"
-#include "srslte/sync/sss.h"
-#include "srslte/ch_estimation/refsignal_dl.h"
-#include "srslte/phch/dci.h"
-#include "srslte/phch/pbch.h"
-#include "srslte/phch/pcfich.h"
-#include "srslte/phch/pdcch.h"
-#include "srslte/phch/pdsch.h"
-#include "srslte/phch/pdsch_cfg.h"
-#include "srslte/phch/phich.h"
-#include "srslte/phch/ra.h"
-#include "srslte/phch/regs.h"
-
-#include "srslte/enb/enb_ul.h"
-
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/dft/ofdm.h"
+#include "srslte/phy/sync/pss.h"
+#include "srslte/phy/sync/sss.h"
+#include "srslte/phy/ch_estimation/refsignal_dl.h"
+#include "srslte/phy/phch/dci.h"
+#include "srslte/phy/phch/pbch.h"
+#include "srslte/phy/phch/pcfich.h"
+#include "srslte/phy/phch/pdcch.h"
+#include "srslte/phy/phch/pdsch.h"
+#include "srslte/phy/phch/pdsch_cfg.h"
+#include "srslte/phy/phch/phich.h"
+#include "srslte/phy/phch/ra.h"
+#include "srslte/phy/phch/regs.h"
+
+#include "srslte/phy/enb/enb_ul.h"
+
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
 
 #include "srslte/config.h"
 

srslte/include/srslte/phy/enb/enb_ul.h

@@ -40,16 +40,16 @@
 
 #include <stdbool.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/dft/ofdm.h"
-#include "srslte/ch_estimation/chest_ul.h"
-#include "srslte/phch/prach.h"
-#include "srslte/phch/pusch.h"
-#include "srslte/phch/pusch_cfg.h"
-#include "srslte/phch/ra.h"
-
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/dft/ofdm.h"
+#include "srslte/phy/ch_estimation/chest_ul.h"
+#include "srslte/phy/phch/prach.h"
+#include "srslte/phy/phch/pusch.h"
+#include "srslte/phy/phch/pusch_cfg.h"
+#include "srslte/phy/phch/ra.h"
+
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
 
 #include "srslte/config.h"
 

srslte/include/srslte/phy/fec/softbuffer.h

@@ -37,7 +37,7 @@
 #define SOFTBUFFER_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 typedef struct SRSLTE_API {
   uint32_t max_cb;

srslte/include/srslte/phy/fec/turbocoder.h

@@ -39,7 +39,7 @@
 #define TURBOCODER_
 
 #include "srslte/config.h"
-#include "srslte/fec/tc_interl.h"
+#include "srslte/phy/fec/tc_interl.h"
 
 #define SRSLTE_TCOD_MAX_LEN_CB_BYTES (6144/8)
 

srslte/include/srslte/phy/fec/turbodecoder.h

@@ -40,8 +40,8 @@
 #define TURBODECODER_
 
 #include "srslte/config.h"
-#include "srslte/fec/tc_interl.h"
-#include "srslte/fec/cbsegm.h"
+#include "srslte/phy/fec/tc_interl.h"
+#include "srslte/phy/fec/cbsegm.h"
 
 #define SRSLTE_TCOD_RATE 3
 #define SRSLTE_TCOD_TOTALTAIL 12
@@ -49,10 +49,10 @@
 #define SRSLTE_TCOD_MAX_LEN_CB     6144
 #define SRSLTE_TCOD_MAX_LEN_CODED  (SRSLTE_TCOD_RATE*SRSLTE_TCOD_MAX_LEN_CB+SRSLTE_TCOD_TOTALTAIL)
 
-#include "srslte/fec/turbodecoder_gen.h"
+#include "srslte/phy/fec/turbodecoder_gen.h"
 
 #ifdef LV_HAVE_SSE
-#include "srslte/fec/turbodecoder_sse.h"
+#include "srslte/phy/fec/turbodecoder_sse.h"
 #endif
 
 typedef struct SRSLTE_API {

srslte/include/srslte/phy/fec/turbodecoder_gen.h

@@ -40,8 +40,8 @@
 #define TURBODECODER_GEN_
 
 #include "srslte/config.h"
-#include "srslte/fec/tc_interl.h"
-#include "srslte/fec/cbsegm.h"
+#include "srslte/phy/fec/tc_interl.h"
+#include "srslte/phy/fec/cbsegm.h"
 
 #define SRSLTE_TCOD_RATE 3
 #define SRSLTE_TCOD_TOTALTAIL 12

srslte/include/srslte/phy/fec/turbodecoder_sse.h

@@ -40,8 +40,8 @@
 #define TURBODECODER_SSE_
 
 #include "srslte/config.h"
-#include "srslte/fec/tc_interl.h"
-#include "srslte/fec/cbsegm.h"
+#include "srslte/phy/fec/tc_interl.h"
+#include "srslte/phy/fec/cbsegm.h"
 
 #define SRSLTE_TCOD_RATE 3
 #define SRSLTE_TCOD_TOTALTAIL 12

srslte/include/srslte/phy/io/filesink.h

@@ -41,7 +41,7 @@
 #include <stdlib.h>
 
 #include "srslte/config.h"
-#include "srslte/io/format.h"
+#include "srslte/phy/io/format.h"
 
 /* Low-level API */
 typedef struct SRSLTE_API {

srslte/include/srslte/phy/io/filesource.h

@@ -41,7 +41,7 @@
 #include <stdlib.h>
 
 #include "srslte/config.h"
-#include "srslte/io/format.h"
+#include "srslte/phy/io/format.h"
 
 /* Low-level API */
 typedef struct SRSLTE_API {

srslte/include/srslte/phy/mimo/layermap.h

@@ -38,7 +38,7 @@
 #define LAYERMAP_H_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 /* Generates the vector of layer-mapped symbols "x" based on the vector of data symbols "d"
  */

srslte/include/srslte/phy/mimo/precoding.h

@@ -37,7 +37,7 @@
 #define PRECODING_H_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 /** The precoder takes as input nlayers vectors "x" from the
  * layer mapping and generates nports vectors "y" to be mapped onto

srslte/include/srslte/phy/modem/modem_table.h

@@ -40,7 +40,7 @@
 #include <complex.h>
 #include <stdint.h>
 
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 #include "srslte/config.h"
 
 typedef struct {

srslte/include/srslte/phy/phch/cqi.h

@@ -38,7 +38,7 @@
 #include <stdint.h>
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 #define SRSLTE_CQI_MAX_BITS 64
 

srslte/include/srslte/phy/phch/dci.h

@@ -40,8 +40,8 @@
 #include <stdint.h>
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/phch/ra.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/phch/ra.h"
 
 #define SRSLTE_DCI_MAX_BITS  128
 

srslte/include/srslte/phy/phch/pbch.h

@@ -38,16 +38,16 @@
 #define PBCH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/precoding.h"
-#include "srslte/mimo/layermap.h"
-#include "srslte/modem/mod.h"
-#include "srslte/modem/demod_soft.h"
-#include "srslte/scrambling/scrambling.h"
-#include "srslte/fec/rm_conv.h"
-#include "srslte/fec/convcoder.h"
-#include "srslte/fec/viterbi.h"
-#include "srslte/fec/crc.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/mimo/layermap.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/modem/demod_soft.h"
+#include "srslte/phy/scrambling/scrambling.h"
+#include "srslte/phy/fec/rm_conv.h"
+#include "srslte/phy/fec/convcoder.h"
+#include "srslte/phy/fec/viterbi.h"
+#include "srslte/phy/fec/crc.h"
 
 #define SRSLTE_BCH_PAYLOAD_LEN     24
 #define SRSLTE_BCH_PAYLOADCRC_LEN  (SRSLTE_BCH_PAYLOAD_LEN+16)

srslte/include/srslte/phy/phch/pcfich.h

@@ -36,13 +36,13 @@
 #define PCFICH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/precoding.h"
-#include "srslte/mimo/layermap.h"
-#include "srslte/modem/mod.h"
-#include "srslte/modem/demod_soft.h"
-#include "srslte/scrambling/scrambling.h"
-#include "srslte/phch/regs.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/mimo/layermap.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/modem/demod_soft.h"
+#include "srslte/phy/scrambling/scrambling.h"
+#include "srslte/phy/phch/regs.h"
 
 #define PCFICH_CFI_LEN  32
 #define PCFICH_RE       PCFICH_CFI_LEN/2

srslte/include/srslte/phy/phch/pdcch.h

@@ -36,18 +36,18 @@
 #define PDCCH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/precoding.h"
-#include "srslte/mimo/layermap.h"
-#include "srslte/modem/mod.h"
-#include "srslte/modem/demod_soft.h"
-#include "srslte/scrambling/scrambling.h"
-#include "srslte/fec/rm_conv.h"
-#include "srslte/fec/convcoder.h"
-#include "srslte/fec/viterbi.h"
-#include "srslte/fec/crc.h"
-#include "srslte/phch/dci.h"
-#include "srslte/phch/regs.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/mimo/layermap.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/modem/demod_soft.h"
+#include "srslte/phy/scrambling/scrambling.h"
+#include "srslte/phy/fec/rm_conv.h"
+#include "srslte/phy/fec/convcoder.h"
+#include "srslte/phy/fec/viterbi.h"
+#include "srslte/phy/fec/crc.h"
+#include "srslte/phy/phch/dci.h"
+#include "srslte/phy/phch/regs.h"
 
 
 

srslte/include/srslte/phy/phch/pdsch.h

@@ -36,16 +36,16 @@
 #define PDSCH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/precoding.h"
-#include "srslte/mimo/layermap.h"
-#include "srslte/modem/mod.h"
-#include "srslte/modem/demod_soft.h"
-#include "srslte/scrambling/scrambling.h"
-#include "srslte/phch/dci.h"
-#include "srslte/phch/regs.h"
-#include "srslte/phch/sch.h"
-#include "srslte/phch/pdsch_cfg.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/mimo/layermap.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/modem/demod_soft.h"
+#include "srslte/phy/scrambling/scrambling.h"
+#include "srslte/phy/phch/dci.h"
+#include "srslte/phy/phch/regs.h"
+#include "srslte/phy/phch/sch.h"
+#include "srslte/phy/phch/pdsch_cfg.h"
 
 typedef struct {
   srslte_sequence_t seq[SRSLTE_NSUBFRAMES_X_FRAME];  

srslte/include/srslte/phy/phch/pdsch_cfg.h

@@ -35,9 +35,9 @@
 #ifndef PDSCHCFG_
 #define PDSCHCFG_
 
-#include "srslte/phch/ra.h"
-#include "srslte/fec/softbuffer.h"
-#include "srslte/fec/cbsegm.h"
+#include "srslte/phy/phch/ra.h"
+#include "srslte/phy/fec/softbuffer.h"
+#include "srslte/phy/fec/cbsegm.h"
 
 typedef struct SRSLTE_API {
   srslte_cbsegm_t cb_segm; 

srslte/include/srslte/phy/phch/phich.h

@@ -36,12 +36,12 @@
 #define PHICH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/precoding.h"
-#include "srslte/mimo/layermap.h"
-#include "srslte/modem/mod.h"
-#include "srslte/modem/demod_soft.h"
-#include "srslte/scrambling/scrambling.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/mimo/layermap.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/modem/demod_soft.h"
+#include "srslte/phy/scrambling/scrambling.h"
 #include "regs.h"
 
 

srslte/include/srslte/phy/phch/prach.h

@@ -40,8 +40,8 @@
 #include <complex.h>
 #include <stdbool.h>
 #include "srslte/config.h"
-#include "srslte/dft/dft.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/dft/dft.h"
+#include "srslte/phy/common/phy_common.h"
 
 
 /** Generation and detection of RACH signals for uplink.

srslte/include/srslte/phy/phch/pucch.h

@@ -36,11 +36,11 @@
 #define PUCCH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/common/sequence.h"
-#include "srslte/modem/mod.h"
-#include "srslte/phch/cqi.h"
-#include "srslte/phch/uci.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/common/sequence.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/phch/cqi.h"
+#include "srslte/phy/phch/uci.h"
 
 #define SRSLTE_PUCCH_N_SEQ       12 
 #define SRSLTE_PUCCH2_NOF_BITS   SRSLTE_UCI_CQI_CODED_PUCCH_B

srslte/include/srslte/phy/phch/pusch.h

@@ -36,18 +36,18 @@
 #define PUSCH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/precoding.h"
-#include "srslte/mimo/layermap.h"
-#include "srslte/modem/mod.h"
-#include "srslte/modem/demod_soft.h"
-#include "srslte/scrambling/scrambling.h"
-#include "srslte/phch/regs.h"
-#include "srslte/phch/dci.h"
-#include "srslte/phch/sch.h"
-#include "srslte/phch/pusch_cfg.h"
-#include "srslte/dft/dft_precoding.h"
-#include "srslte/ch_estimation/refsignal_ul.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/mimo/layermap.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/modem/demod_soft.h"
+#include "srslte/phy/scrambling/scrambling.h"
+#include "srslte/phy/phch/regs.h"
+#include "srslte/phy/phch/dci.h"
+#include "srslte/phy/phch/sch.h"
+#include "srslte/phy/phch/pusch_cfg.h"
+#include "srslte/phy/dft/dft_precoding.h"
+#include "srslte/phy/ch_estimation/refsignal_ul.h"
 
 #define SRSLTE_PUSCH_MAX_TDEC_ITERS         5
 

srslte/include/srslte/phy/phch/pusch_cfg.h

@@ -35,9 +35,9 @@
 #ifndef PUSCHCFG_
 #define PUSCHCFG_
 
-#include "srslte/phch/ra.h"
-#include "srslte/fec/softbuffer.h"
-#include "srslte/fec/cbsegm.h"
+#include "srslte/phy/phch/ra.h"
+#include "srslte/phy/fec/softbuffer.h"
+#include "srslte/phy/fec/cbsegm.h"
 
 typedef struct SRSLTE_API {
   uint32_t I_offset_cqi;

srslte/include/srslte/phy/phch/ra.h

@@ -40,7 +40,7 @@
 #include <stdbool.h>
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 /**************************************************
  * Common structures used for Resource Allocation 

srslte/include/srslte/phy/phch/regs.h

@@ -37,7 +37,7 @@
 
 #include <stdbool.h>
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/phy_common.h"
 
 #define REGS_PHICH_NSYM      12
 #define REGS_PHICH_REGS_X_GROUP  3

srslte/include/srslte/phy/phch/sch.h

@@ -36,14 +36,14 @@
 #define SCH_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/fec/rm_turbo.h"
-#include "srslte/fec/turbocoder.h"
-#include "srslte/fec/turbodecoder.h"
-#include "srslte/fec/crc.h"
-#include "srslte/phch/pdsch_cfg.h"
-#include "srslte/phch/pusch_cfg.h"
-#include "srslte/phch/uci.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/fec/rm_turbo.h"
+#include "srslte/phy/fec/turbocoder.h"
+#include "srslte/phy/fec/turbodecoder.h"
+#include "srslte/phy/fec/crc.h"
+#include "srslte/phy/phch/pdsch_cfg.h"
+#include "srslte/phy/phch/pusch_cfg.h"
+#include "srslte/phy/phch/uci.h"
 
 #ifndef SRSLTE_RX_NULL
 #define SRSLTE_RX_NULL 10000

srslte/include/srslte/phy/phch/uci.h

@@ -36,11 +36,11 @@
 #define UCI_
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/phch/pusch_cfg.h"
-#include "srslte/fec/crc.h"
-#include "srslte/fec/viterbi.h"
-#include "srslte/phch/cqi.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/phch/pusch_cfg.h"
+#include "srslte/phy/fec/crc.h"
+#include "srslte/phy/fec/viterbi.h"
+#include "srslte/phy/phch/cqi.h"
 
 #define SRSLTE_UCI_MAX_CQI_LEN_PUSCH       512
 #define SRSLTE_UCI_MAX_CQI_LEN_PUCCH       13

srslte/include/srslte/phy/rf/rf_utils.h

@@ -26,7 +26,7 @@
 
 
 #include "srslte/srslte.h"
-#include "srslte/rf/rf.h"
+#include "srslte/phy/rf/rf.h"
 
 typedef struct SRSLTE_API {
   uint32_t max_frames_pbch;      // timeout in number of 5ms frames for MIB decoding

srslte/include/srslte/phy/scrambling/scrambling.h

@@ -36,8 +36,8 @@
 #define SCRAMBLING_
 
 #include "srslte/config.h"
-#include "srslte/common/sequence.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/common/sequence.h"
+#include "srslte/phy/common/phy_common.h"
 
 /* Scrambling has no state */
 SRSLTE_API void srslte_scrambling_b(srslte_sequence_t *s, 

srslte/include/srslte/phy/sync/cfo.h

@@ -38,7 +38,7 @@
 #include <complex.h>
 
 #include "srslte/config.h"
-#include "srslte/utils/cexptab.h"
+#include "srslte/phy/utils/cexptab.h"
 
 /** If the frequency is changed more than the tolerance, a new table is generated */
 #define SRSLTE_CFO_TOLERANCE    0.00001

srslte/include/srslte/phy/sync/pss.h

@@ -49,9 +49,9 @@
 #include <stdbool.h>
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/utils/convolution.h"
-#include "srslte/utils/filter.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/utils/convolution.h"
+#include "srslte/phy/utils/filter.h"
 
 #define CONVOLUTION_FFT
 

srslte/include/srslte/phy/sync/sss.h

@@ -40,8 +40,8 @@
 #include <stdbool.h>
 
 #include "srslte/config.h"
-#include "srslte/common/phy_common.h"
-#include "srslte/dft/dft.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/dft/dft.h"
 
 
 #define SRSLTE_SSS_N      31

srslte/include/srslte/phy/sync/sync.h

@@ -49,10 +49,10 @@
 #include <math.h>
 
 #include "srslte/config.h"
-#include "srslte/sync/pss.h"
-#include "srslte/sync/sss.h"
-#include "srslte/sync/cfo.h"
-#include "srslte/sync/cp.h"
+#include "srslte/phy/sync/pss.h"
+#include "srslte/phy/sync/sss.h"
+#include "srslte/phy/sync/cfo.h"
+#include "srslte/phy/sync/cp.h"
 
 #define SRSLTE_SYNC_FFT_SZ_MIN    64
 #define SRSLTE_SYNC_FFT_SZ_MAX    2048

srslte/include/srslte/phy/ue/ue_cell_search.h

@@ -46,12 +46,12 @@
 #include <stdbool.h>
 
 #include "srslte/config.h"
-#include "srslte/ue/ue_sync.h"
-#include "srslte/ue/ue_mib.h"
-#include "srslte/sync/cfo.h"
-#include "srslte/ch_estimation/chest_dl.h"
-#include "srslte/phch/pbch.h"
-#include "srslte/dft/ofdm.h"
+#include "srslte/phy/ue/ue_sync.h"
+#include "srslte/phy/ue/ue_mib.h"
+#include "srslte/phy/sync/cfo.h"
+#include "srslte/phy/ch_estimation/chest_dl.h"
+#include "srslte/phy/phch/pbch.h"
+#include "srslte/phy/dft/ofdm.h"
 
 #define SRSLTE_CS_NOF_PRB      6
 #define SRSLTE_CS_SAMP_FREQ    1920000.0

srslte/include/srslte/phy/ue/ue_dl.h

@@ -40,23 +40,23 @@
 
 #include <stdbool.h>
 
-#include "srslte/ch_estimation/chest_dl.h"
-#include "srslte/dft/ofdm.h"
-#include "srslte/common/phy_common.h"
-
-#include "srslte/phch/dci.h"
-#include "srslte/phch/pcfich.h"
-#include "srslte/phch/pdcch.h"
-#include "srslte/phch/pdsch.h"
-#include "srslte/phch/pdsch_cfg.h"
-#include "srslte/phch/phich.h"
-#include "srslte/phch/ra.h"
-#include "srslte/phch/regs.h"
-
-#include "srslte/sync/cfo.h"
-
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/ch_estimation/chest_dl.h"
+#include "srslte/phy/dft/ofdm.h"
+#include "srslte/phy/common/phy_common.h"
+
+#include "srslte/phy/phch/dci.h"
+#include "srslte/phy/phch/pcfich.h"
+#include "srslte/phy/phch/pdcch.h"
+#include "srslte/phy/phch/pdsch.h"
+#include "srslte/phy/phch/pdsch_cfg.h"
+#include "srslte/phy/phch/phich.h"
+#include "srslte/phy/phch/ra.h"
+#include "srslte/phy/phch/regs.h"
+
+#include "srslte/phy/sync/cfo.h"
+
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
 
 #include "srslte/config.h"
 

srslte/include/srslte/phy/ue/ue_mib.h

@@ -49,11 +49,11 @@
 #include <stdbool.h>
 
 #include "srslte/config.h"
-#include "srslte/ue/ue_sync.h"
-#include "srslte/sync/cfo.h"
-#include "srslte/ch_estimation/chest_dl.h"
-#include "srslte/phch/pbch.h"
-#include "srslte/dft/ofdm.h"
+#include "srslte/phy/ue/ue_sync.h"
+#include "srslte/phy/sync/cfo.h"
+#include "srslte/phy/ch_estimation/chest_dl.h"
+#include "srslte/phy/phch/pbch.h"
+#include "srslte/phy/dft/ofdm.h"
 
 
 #define SRSLTE_UE_MIB_NOF_PRB              6

srslte/include/srslte/phy/ue/ue_phy.h

@@ -33,7 +33,7 @@
  *****************************************************************************/
 
 #include "srslte/srslte.h"
-#include "srslte/utils/queue.h"
+#include "srslte/phy/utils/queue.h"
 
 #ifndef UEPHY_H
 #define UEPHY_H

srslte/include/srslte/phy/ue/ue_sync.h

@@ -52,14 +52,14 @@
 #include <stdbool.h>
 
 #include "srslte/config.h"
-#include "srslte/sync/sync.h"
-#include "srslte/sync/cfo.h"
-#include "srslte/agc/agc.h"
-#include "srslte/ch_estimation/chest_dl.h"
-#include "srslte/phch/pbch.h"
-#include "srslte/dft/ofdm.h"
-#include "srslte/common/timestamp.h"
-#include "srslte/io/filesource.h"
+#include "srslte/phy/sync/sync.h"
+#include "srslte/phy/sync/cfo.h"
+#include "srslte/phy/agc/agc.h"
+#include "srslte/phy/ch_estimation/chest_dl.h"
+#include "srslte/phy/phch/pbch.h"
+#include "srslte/phy/dft/ofdm.h"
+#include "srslte/phy/common/timestamp.h"
+#include "srslte/phy/io/filesource.h"
 
 
 typedef enum SRSLTE_API { SF_FIND, SF_TRACK} srslte_ue_sync_state_t;

srslte/include/srslte/phy/ue/ue_ul.h

@@ -38,16 +38,16 @@
 #ifndef UEUL_H
 #define UEUL_H
 
-#include "srslte/common/phy_common.h"
-#include "srslte/ch_estimation/chest_dl.h"
-#include "srslte/dft/ofdm.h"
-#include "srslte/ch_estimation/refsignal_ul.h"
-#include "srslte/phch/pusch.h"
-#include "srslte/phch/dci.h"
-#include "srslte/phch/ra.h"
-#include "srslte/sync/cfo.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/ch_estimation/chest_dl.h"
+#include "srslte/phy/dft/ofdm.h"
+#include "srslte/phy/ch_estimation/refsignal_ul.h"
+#include "srslte/phy/phch/pusch.h"
+#include "srslte/phy/phch/dci.h"
+#include "srslte/phy/phch/ra.h"
+#include "srslte/phy/sync/cfo.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
 
 #include "srslte/config.h"
 

srslte/include/srslte/phy/utils/convolution.h

@@ -36,7 +36,7 @@
 #define CONVOLUTION_H_
 
 #include "srslte/config.h"
-#include "srslte/dft/dft.h"
+#include "srslte/phy/dft/dft.h"
 
 typedef struct SRSLTE_API {
   cf_t *input_fft;

srslte/include/srslte/phy/utils/filter.h

@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include "srslte/config.h"
 #include <stdbool.h>
-#include "srslte/utils/vector.h"
+#include "srslte/phy/utils/vector.h"
 typedef struct SRSLTE_API{
     cf_t *filter_input;
     cf_t *downsampled_input;

srslte/include/srslte/srslte.h

@@ -38,88 +38,88 @@
 #include "srslte/config.h"
 #include "srslte/version.h"
 
-#include "srslte/utils/bit.h"
-#include "srslte/utils/convolution.h"
-#include "srslte/utils/debug.h"
-#include "srslte/utils/cexptab.h"
-#include "srslte/utils/vector.h"
-
-#include "srslte/common/timestamp.h"
-#include "srslte/common/sequence.h"
-#include "srslte/common/phy_common.h"
+#include "srslte/phy/utils/bit.h"
+#include "srslte/phy/utils/convolution.h"
+#include "srslte/phy/utils/debug.h"
+#include "srslte/phy/utils/cexptab.h"
+#include "srslte/phy/utils/vector.h"
+
+#include "srslte/phy/common/timestamp.h"
+#include "srslte/phy/common/sequence.h"
+#include "srslte/phy/common/phy_common.h"
             
-#include "srslte/ch_estimation/chest_ul.h"
-#include "srslte/ch_estimation/chest_dl.h"
-#include "srslte/ch_estimation/refsignal_dl.h"
-#include "srslte/ch_estimation/refsignal_ul.h"
-
-#include "srslte/resampling/interp.h"
-#include "srslte/resampling/decim.h"
-#include "srslte/resampling/resample_arb.h"
-
-#include "srslte/channel/ch_awgn.h"
-
-#include "srslte/fec/viterbi.h"
-#include "srslte/fec/convcoder.h"
-#include "srslte/fec/crc.h"
-#include "srslte/fec/tc_interl.h"
-#include "srslte/fec/turbocoder.h"
-#include "srslte/fec/turbodecoder.h"
-#include "srslte/fec/cbsegm.h"
-#include "srslte/fec/rm_conv.h"
-#include "srslte/fec/rm_turbo.h"
-
-#include "srslte/dft/dft_precoding.h"
-#include "srslte/dft/ofdm.h"
-#include "srslte/dft/dft.h"
-
-#include "srslte/io/binsource.h"
-#include "srslte/io/filesink.h"
-#include "srslte/io/filesource.h"
-#include "srslte/io/netsink.h"
-#include "srslte/io/netsource.h"
-
-#include "srslte/modem/demod_hard.h"
-#include "srslte/modem/demod_soft.h"
-#include "srslte/modem/mod.h"
-#include "srslte/modem/modem_table.h"
-
-#include "srslte/mimo/precoding.h"
-#include "srslte/mimo/layermap.h"
-
-#include "srslte/phch/cqi.h"
-#include "srslte/phch/dci.h"
-#include "srslte/fec/softbuffer.h"
-#include "srslte/phch/pbch.h"
-#include "srslte/phch/pcfich.h"
-#include "srslte/phch/pdcch.h"
-#include "srslte/phch/pdsch.h"
-#include "srslte/phch/phich.h"
-#include "srslte/phch/pusch.h"
-#include "srslte/phch/pucch.h"
-#include "srslte/phch/prach.h"
-#include "srslte/phch/ra.h"
-#include "srslte/phch/regs.h"
-#include "srslte/phch/sch.h"
-#include "srslte/phch/uci.h"
+#include "srslte/phy/ch_estimation/chest_ul.h"
+#include "srslte/phy/ch_estimation/chest_dl.h"
+#include "srslte/phy/ch_estimation/refsignal_dl.h"
+#include "srslte/phy/ch_estimation/refsignal_ul.h"
+
+#include "srslte/phy/resampling/interp.h"
+#include "srslte/phy/resampling/decim.h"
+#include "srslte/phy/resampling/resample_arb.h"
+
+#include "srslte/phy/channel/ch_awgn.h"
+
+#include "srslte/phy/fec/viterbi.h"
+#include "srslte/phy/fec/convcoder.h"
+#include "srslte/phy/fec/crc.h"
+#include "srslte/phy/fec/tc_interl.h"
+#include "srslte/phy/fec/turbocoder.h"
+#include "srslte/phy/fec/turbodecoder.h"
+#include "srslte/phy/fec/cbsegm.h"
+#include "srslte/phy/fec/rm_conv.h"
+#include "srslte/phy/fec/rm_turbo.h"
+
+#include "srslte/phy/dft/dft_precoding.h"
+#include "srslte/phy/dft/ofdm.h"
+#include "srslte/phy/dft/dft.h"
+
+#include "srslte/phy/io/binsource.h"
+#include "srslte/phy/io/filesink.h"
+#include "srslte/phy/io/filesource.h"
+#include "srslte/phy/io/netsink.h"
+#include "srslte/phy/io/netsource.h"
+
+#include "srslte/phy/modem/demod_hard.h"
+#include "srslte/phy/modem/demod_soft.h"
+#include "srslte/phy/modem/mod.h"
+#include "srslte/phy/modem/modem_table.h"
+
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/mimo/layermap.h"
+
+#include "srslte/phy/phch/cqi.h"
+#include "srslte/phy/phch/dci.h"
+#include "srslte/phy/fec/softbuffer.h"
+#include "srslte/phy/phch/pbch.h"
+#include "srslte/phy/phch/pcfich.h"
+#include "srslte/phy/phch/pdcch.h"
+#include "srslte/phy/phch/pdsch.h"
+#include "srslte/phy/phch/phich.h"
+#include "srslte/phy/phch/pusch.h"
+#include "srslte/phy/phch/pucch.h"
+#include "srslte/phy/phch/prach.h"
+#include "srslte/phy/phch/ra.h"
+#include "srslte/phy/phch/regs.h"
+#include "srslte/phy/phch/sch.h"
+#include "srslte/phy/phch/uci.h"
       
-#include "srslte/ue/ue_sync.h"
-#include "srslte/ue/ue_mib.h"
-#include "srslte/ue/ue_cell_search.h"
-#include "srslte/ue/ue_dl.h"
-#include "srslte/ue/ue_ul.h"
-
-#include "srslte/enb/enb_dl.h"
-#include "srslte/enb/enb_ul.h"
-
-#include "srslte/scrambling/scrambling.h"
-
-#include "srslte/sync/pss.h"
-#include "srslte/sync/sfo.h"
-#include "srslte/sync/sss.h"
-#include "srslte/sync/sync.h"
-#include "srslte/sync/cfo.h"
-#include "srslte/sync/cp.h"
+#include "srslte/phy/ue/ue_sync.h"
+#include "srslte/phy/ue/ue_mib.h"
+#include "srslte/phy/ue/ue_cell_search.h"
+#include "srslte/phy/ue/ue_dl.h"
+#include "srslte/phy/ue/ue_ul.h"
+
+#include "srslte/phy/enb/enb_dl.h"
+#include "srslte/phy/enb/enb_ul.h"
+
+#include "srslte/phy/scrambling/scrambling.h"
+
+#include "srslte/phy/sync/pss.h"
+#include "srslte/phy/sync/sfo.h"
+#include "srslte/phy/sync/sss.h"
+#include "srslte/phy/sync/sync.h"
+#include "srslte/phy/sync/cfo.h"
+#include "srslte/phy/sync/cp.h"
 
 #ifdef __cplusplus
 }

srslte/lib/phy/agc/agc.c

@@ -31,11 +31,11 @@
 #include <math.h>
 #include <complex.h>
 
-#include "srslte/utils/debug.h"
+#include "srslte/phy/utils/debug.h"
 
-#include "srslte/agc/agc.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/agc/agc.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
 
 int srslte_agc_init (srslte_agc_t *q, srslte_agc_mode_t mode) {
   return srslte_agc_init_acc(q, mode, 0);

srslte/lib/phy/ch_estimation/chest_common.c

@@ -33,9 +33,9 @@
 #include <complex.h>
 #include <math.h>
 
-#include "srslte/ch_estimation/chest_common.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/convolution.h"
+#include "srslte/phy/ch_estimation/chest_common.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/convolution.h"
 
 void srslte_chest_set_triangle_filter(float *fil, int filter_len) 
 {

srslte/lib/phy/ch_estimation/chest_dl.c

@@ -35,9 +35,9 @@
 
 #include "srslte/config.h"
 
-#include "srslte/ch_estimation/chest_dl.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/convolution.h"
+#include "srslte/phy/ch_estimation/chest_dl.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/convolution.h"
 
 //#define DEFAULT_FILTER_LEN 3
 

srslte/lib/phy/ch_estimation/chest_ul.c

@@ -35,10 +35,10 @@
 
 #include "srslte/config.h"
 
-#include "srslte/dft/dft_precoding.h"
-#include "srslte/ch_estimation/chest_ul.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/convolution.h"
+#include "srslte/phy/dft/dft_precoding.h"
+#include "srslte/phy/ch_estimation/chest_ul.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/convolution.h"
 
 #define NOF_REFS_SYM    (q->cell.nof_prb*SRSLTE_NRE)
 #define NOF_REFS_SF     (NOF_REFS_SYM*2) // 2 reference symbols per subframe

srslte/lib/phy/ch_estimation/refsignal_dl.c

@@ -31,11 +31,11 @@
 #include <stdlib.h>
 #include <complex.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/ch_estimation/refsignal_dl.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
-#include "srslte/common/sequence.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/ch_estimation/refsignal_dl.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
+#include "srslte/phy/common/sequence.h"
 
 uint32_t srslte_refsignal_cs_v(uint32_t port_id, uint32_t ref_symbol_idx)
 {

srslte/lib/phy/ch_estimation/refsignal_ul.c

@@ -30,12 +30,12 @@
 #include <stdlib.h>
 #include <complex.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/ch_estimation/refsignal_ul.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
-#include "srslte/common/sequence.h"
-#include "srslte/dft/dft_precoding.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/ch_estimation/refsignal_ul.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
+#include "srslte/phy/common/sequence.h"
+#include "srslte/phy/dft/dft_precoding.h"
 
 #include "ul_rs_tables.h"
 

srslte/lib/phy/channel/ch_awgn.c

@@ -31,7 +31,7 @@
 #include <math.h>
 
 #include "gauss.h"
-#include "srslte/channel/ch_awgn.h"
+#include "srslte/phy/channel/ch_awgn.h"
 
 float srslte_ch_awgn_get_variance(float ebno_db, float rate) {
   float esno_db = ebno_db + 10 * log10f(rate);

srslte/lib/phy/common/phy_common.c

@@ -31,8 +31,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/common/sequence.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/common/sequence.h"
 
 #ifdef FORCE_STANDARD_RATE
 static bool use_standard_rates = true; 

srslte/lib/phy/common/sequence.c

@@ -29,9 +29,9 @@
 #include <strings.h>
 #include <assert.h>
 
-#include "srslte/common/sequence.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/bit.h"
+#include "srslte/phy/common/sequence.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/bit.h"
 
 #define Nc 1600
 

srslte/lib/phy/common/timestamp.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "srslte/common/timestamp.h"
+#include "srslte/phy/common/timestamp.h"
 #include "math.h"
 
 int srslte_timestamp_init(srslte_timestamp_t *t, time_t full_secs, double frac_secs){

srslte/lib/phy/dft/dft_fftw.c

@@ -30,8 +30,8 @@
 #include <fftw3.h>
 #include <string.h>
 
-#include "srslte/dft/dft.h"
-#include "srslte/utils/vector.h"
+#include "srslte/phy/dft/dft.h"
+#include "srslte/phy/utils/vector.h"
 
 #define dft_ceil(a,b) ((a-1)/b+1)
 #define dft_floor(a,b) (a/b)

srslte/lib/phy/dft/dft_precoding.c

@@ -33,11 +33,11 @@
 #include <assert.h>
 #include <math.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/utils/debug.h"
-#include "srslte/utils/vector.h"
-#include "srslte/dft/dft.h"
-#include "srslte/dft/dft_precoding.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/utils/debug.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/dft/dft.h"
+#include "srslte/phy/dft/dft_precoding.h"
 
 /* Create DFT plans for transform precoding */
 int srslte_dft_precoding_init(srslte_dft_precoding_t *q, uint32_t max_prb) 

srslte/lib/phy/dft/ofdm.c

@@ -30,11 +30,11 @@
 #include <complex.h>
 #include <math.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/dft/dft.h"
-#include "srslte/dft/ofdm.h"
-#include "srslte/utils/debug.h"
-#include "srslte/utils/vector.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/dft/dft.h"
+#include "srslte/phy/dft/ofdm.h"
+#include "srslte/phy/utils/debug.h"
+#include "srslte/phy/utils/vector.h"
 
 int srslte_ofdm_init_(srslte_ofdm_t *q, srslte_cp_t cp, int symbol_sz, int nof_prb, srslte_dft_dir_t dir) {
 

srslte/lib/phy/enb/enb_dl.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "srslte/enb/enb_dl.h"
+#include "srslte/phy/enb/enb_dl.h"
 
 #include <complex.h>
 #include <math.h>

srslte/lib/phy/enb/enb_ul.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "srslte/enb/enb_ul.h"
+#include "srslte/phy/enb/enb_ul.h"
 
 #include <complex.h>
 #include <math.h>

srslte/lib/phy/fec/cbsegm.c

@@ -27,9 +27,9 @@
 #include <strings.h>
 #include <math.h>
 
-#include "srslte/fec/turbodecoder_gen.h"
-#include "srslte/fec/cbsegm.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/fec/turbodecoder_gen.h"
+#include "srslte/phy/fec/cbsegm.h"
+#include "srslte/phy/utils/debug.h"
 
 
 const uint32_t tc_cb_sizes[SRSLTE_NOF_TC_CB_SIZES] = { 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120,

srslte/lib/phy/fec/convcoder.c

@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "srslte/fec/convcoder.h"
+#include "srslte/phy/fec/convcoder.h"
 #include "parity.h"
 
 int srslte_convcoder_encode(srslte_convcoder_t *q, uint8_t *input, uint8_t *output, uint32_t frame_length) {

srslte/lib/phy/fec/crc.c

@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "srslte/utils/bit.h"
-#include "srslte/fec/crc.h"
+#include "srslte/phy/utils/bit.h"
+#include "srslte/phy/fec/crc.h"
 
 void gen_crc_table(srslte_crc_t *h) {
 

srslte/lib/phy/fec/rm_conv.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "srslte/fec/rm_conv.h"
+#include "srslte/phy/fec/rm_conv.h"
 
 #define NCOLS 32
 #define NROWS_MAX NCOLS

srslte/lib/phy/fec/rm_turbo.c

@@ -31,10 +31,10 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "srslte/fec/rm_turbo.h"
-#include "srslte/utils/bit.h"
-#include "srslte/utils/vector.h"
-#include "srslte/fec/cbsegm.h"
+#include "srslte/phy/fec/rm_turbo.h"
+#include "srslte/phy/utils/bit.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/fec/cbsegm.h"
 
 #ifdef DEBUG_MODE
 #warning FIXME: Disabling SSE/AVX turbo rate matching 

srslte/lib/phy/fec/softbuffer.c

@@ -33,13 +33,13 @@
 #include <assert.h>
 #include <math.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/phch/ra.h"
-#include "srslte/fec/turbodecoder_gen.h"
-#include "srslte/fec/rm_turbo.h"
-#include "srslte/fec/softbuffer.h"
-#include "srslte/utils/vector.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/phch/ra.h"
+#include "srslte/phy/fec/turbodecoder_gen.h"
+#include "srslte/phy/fec/rm_turbo.h"
+#include "srslte/phy/fec/softbuffer.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/debug.h"
 
 #define MAX_PDSCH_RE(cp) (2 * SRSLTE_CP_NSYMB(cp) * 12)
 

srslte/lib/phy/fec/tc_interl_lte.c

@@ -28,11 +28,11 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/fec/tc_interl.h"
-#include "srslte/fec/turbocoder.h"
-#include "srslte/fec/cbsegm.h"
-#include "srslte/utils/debug.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/fec/tc_interl.h"
+#include "srslte/phy/fec/turbocoder.h"
+#include "srslte/phy/fec/cbsegm.h"
+#include "srslte/phy/utils/debug.h"
 
 /************************************************
  *

srslte/lib/phy/fec/tc_interl_umts.c

@@ -29,8 +29,8 @@
 #include <strings.h>
 #include <stdint.h>
 
-#include "srslte/fec/tc_interl.h"
-#include "srslte/fec/turbocoder.h"
+#include "srslte/phy/fec/tc_interl.h"
+#include "srslte/phy/fec/turbocoder.h"
 
 #define TURBO_SRSLTE_TCOD_RATE 	3
 

srslte/lib/phy/fec/test/crc_test.h

@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "srslte/fec/crc.h"
+#include "srslte/phy/fec/crc.h"
 
 typedef struct {
   int n;

srslte/lib/phy/fec/turbocoder.c

@@ -30,10 +30,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "srslte/fec/cbsegm.h"
-#include "srslte/fec/turbocoder.h"
-#include "srslte/utils/bit.h"
-#include "srslte/utils/vector.h"
+#include "srslte/phy/fec/cbsegm.h"
+#include "srslte/phy/fec/turbocoder.h"
+#include "srslte/phy/utils/bit.h"
+#include "srslte/phy/utils/vector.h"
 
 #define NOF_REGS 3
 

srslte/lib/phy/fec/turbodecoder.c

@@ -30,15 +30,15 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "srslte/fec/turbodecoder.h"
-#include "srslte/fec/turbodecoder_gen.h"
+#include "srslte/phy/fec/turbodecoder.h"
+#include "srslte/phy/fec/turbodecoder_gen.h"
 
 
 #ifdef LV_HAVE_SSE
-#include "srslte/fec/turbodecoder_sse.h"
+#include "srslte/phy/fec/turbodecoder_sse.h"
 #endif
 
-#include "srslte/utils/vector.h"
+#include "srslte/phy/utils/vector.h"
 
 
 int srslte_tdec_init(srslte_tdec_t * h, uint32_t max_long_cb) {

srslte/lib/phy/fec/turbodecoder_gen.c

@@ -31,8 +31,8 @@
 #include <strings.h>
 #include <math.h>
 
-#include "srslte/fec/turbodecoder_gen.h"
-#include "srslte/utils/vector.h"
+#include "srslte/phy/fec/turbodecoder_gen.h"
+#include "srslte/phy/utils/vector.h"
 
 #define NUMSTATES       8
 #define NINPUTS         2

srslte/lib/phy/fec/turbodecoder_sse.c

@@ -31,8 +31,8 @@
 #include <strings.h>
 #include <math.h>
 
-#include "srslte/fec/turbodecoder_sse.h"
-#include "srslte/utils/vector.h"
+#include "srslte/phy/fec/turbodecoder_sse.h"
+#include "srslte/phy/utils/vector.h"
 
 #include <inttypes.h>
 

srslte/lib/phy/fec/viterbi.c

@@ -31,8 +31,8 @@
 #include <math.h>
 #include <string.h>
 
-#include "srslte/utils/vector.h"
-#include "srslte/fec/viterbi.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/fec/viterbi.h"
 #include "parity.h"
 #include "viterbi37.h"
 

srslte/lib/phy/io/binsource.c

@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include <strings.h>
 
-#include "srslte/io/binsource.h"
-#include "srslte/utils/bit.h"
+#include "srslte/phy/io/binsource.h"
+#include "srslte/phy/utils/bit.h"
 
 #define DIV(a,b) ((a-1)/b+1)
 

srslte/lib/phy/io/filesink.c

@@ -31,7 +31,7 @@
 #include <strings.h>
 
 
-#include "srslte/io/filesink.h"
+#include "srslte/phy/io/filesink.h"
 
 int srslte_filesink_init(srslte_filesink_t *q, char *filename, srslte_datatype_t type) {
   bzero(q, sizeof(srslte_filesink_t));

srslte/lib/phy/io/filesource.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <strings.h>
 
-#include "srslte/io/filesource.h"
+#include "srslte/phy/io/filesource.h"
 
 int srslte_filesource_init(srslte_filesource_t *q, char *filename, srslte_datatype_t type) {
   bzero(q, sizeof(srslte_filesource_t));

srslte/lib/phy/io/netsink.c

@@ -36,7 +36,7 @@
 #include <fcntl.h>
 
 
-#include "srslte/io/netsink.h"
+#include "srslte/phy/io/netsink.h"
 
 int srslte_netsink_init(srslte_netsink_t *q, const char *address, uint16_t port, srslte_netsink_type_t type) {
   bzero(q, sizeof(srslte_netsink_t));

srslte/lib/phy/io/netsource.c

@@ -34,7 +34,7 @@
 #include <strings.h>
 #include <errno.h>
 
-#include "srslte/io/netsource.h"
+#include "srslte/phy/io/netsource.h"
 
 int srslte_netsource_init(srslte_netsource_t *q, const char *address, uint16_t port, srslte_netsource_type_t type) {
   bzero(q, sizeof(srslte_netsource_t));

srslte/lib/phy/mimo/layermap.c

@@ -29,8 +29,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/layermap.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/layermap.h"
 
 
 

srslte/lib/phy/mimo/precoding.c

@@ -30,9 +30,9 @@
 #include <string.h>
 #include <math.h>
 
-#include "srslte/common/phy_common.h"
-#include "srslte/mimo/precoding.h"
-#include "srslte/utils/vector.h"
+#include "srslte/phy/common/phy_common.h"
+#include "srslte/phy/mimo/precoding.h"
+#include "srslte/phy/utils/vector.h"
 
 #ifdef LV_HAVE_SSE
 #include <xmmintrin.h>

srslte/lib/phy/modem/demod_hard.c

@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <strings.h>
 
-#include "srslte/modem/demod_hard.h"
+#include "srslte/phy/modem/demod_hard.h"
 #include "hard_demod_lte.h"
 
 

srslte/lib/phy/modem/demod_soft.c

@@ -28,9 +28,9 @@
 #include <stdlib.h>
 #include <strings.h>
 
-#include "srslte/utils/vector.h"
-#include "srslte/utils/bit.h"
-#include "srslte/modem/demod_soft.h"
+#include "srslte/phy/utils/vector.h"
+#include "srslte/phy/utils/bit.h"
+#include "srslte/phy/modem/demod_soft.h"
 
 // AVX implementation not useful for integers. Wait for AVX2
 

srslte/lib/phy/modem/hard_demod_lte.c

@@ -29,7 +29,7 @@
 #include <complex.h>
 #include <math.h>
 
-#include "srslte/modem/demod_hard.h"
+#include "srslte/phy/modem/demod_hard.h"
 #include "hard_demod_lte.h"
 
 

srslte/lib/phy/modem/lte_tables.c

@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "srslte/modem/modem_table.h"
+#include "srslte/phy/modem/modem_table.h"
 #include "lte_tables.h"
 
 /**

srslte/lib/phy/modem/mod.c

@@ -30,8 +30,8 @@
 #include <strings.h>
 #include <assert.h>
 
-#include "srslte/utils/bit.h"
-#include "srslte/modem/mod.h"
+#include "srslte/phy/utils/bit.h"
+#include "srslte/phy/modem/mod.h"
 
 /** Low-level API */