diff --git a/lib/include/srslte/phy/fec/convcoder.h b/lib/include/srslte/phy/fec/convolutional/convcoder.h
similarity index 92%
rename from lib/include/srslte/phy/fec/convcoder.h
rename to lib/include/srslte/phy/fec/convolutional/convcoder.h
index faa2298a2..f3b57d8ca 100644
--- a/lib/include/srslte/phy/fec/convcoder.h
+++ b/lib/include/srslte/phy/fec/convolutional/convcoder.h
@@ -32,8 +32,8 @@
 #ifndef SRSLTE_CONVCODER_H
 #define SRSLTE_CONVCODER_H
 
-#include "srslte/config.h"
-#include <stdbool.h>
+#include "../../../../../../../../../../usr/lib/gcc/x86_64-linux-gnu/7/include/stdbool.h"
+#include "../../../config.h"
 
 typedef struct SRSLTE_API {
   uint32_t R;
diff --git a/lib/include/srslte/phy/fec/rm_conv.h b/lib/include/srslte/phy/fec/convolutional/rm_conv.h
similarity index 98%
rename from lib/include/srslte/phy/fec/rm_conv.h
rename to lib/include/srslte/phy/fec/convolutional/rm_conv.h
index 2e626ad94..490c6361e 100644
--- a/lib/include/srslte/phy/fec/rm_conv.h
+++ b/lib/include/srslte/phy/fec/convolutional/rm_conv.h
@@ -31,7 +31,7 @@
 #ifndef SRSLTE_RM_CONV_H
 #define SRSLTE_RM_CONV_H
 
-#include "srslte/config.h"
+#include "../../../config.h"
 
 #ifndef SRSLTE_RX_NULL
 #define SRSLTE_RX_NULL 10000
diff --git a/lib/include/srslte/phy/fec/viterbi.h b/lib/include/srslte/phy/fec/convolutional/viterbi.h
similarity index 96%
rename from lib/include/srslte/phy/fec/viterbi.h
rename to lib/include/srslte/phy/fec/convolutional/viterbi.h
index 753976997..7bf402ed6 100644
--- a/lib/include/srslte/phy/fec/viterbi.h
+++ b/lib/include/srslte/phy/fec/convolutional/viterbi.h
@@ -20,7 +20,7 @@
  */
 
 /******************************************************************************
- *  File:         viterbi.h
+ *  File:         convolutional.h
  *
  *  Description:  Viterbi decoder for convolutionally encoded data.
  *                Used for decoding of PBCH and PDCCH (type 37 decoder).
@@ -31,8 +31,8 @@
 #ifndef SRSLTE_VITERBI_H
 #define SRSLTE_VITERBI_H
 
-#include "srslte/config.h"
-#include <stdbool.h>
+#include "../../../../../../../../../../usr/lib/gcc/x86_64-linux-gnu/7/include/stdbool.h"
+#include "../../../config.h"
 
 typedef enum { SRSLTE_VITERBI_27 = 0, SRSLTE_VITERBI_29, SRSLTE_VITERBI_37, SRSLTE_VITERBI_39 } srslte_viterbi_type_t;
 
diff --git a/lib/include/srslte/phy/fec/cbsegm.h b/lib/include/srslte/phy/fec/turbo/cbsegm.h
similarity index 100%
rename from lib/include/srslte/phy/fec/cbsegm.h
rename to lib/include/srslte/phy/fec/turbo/cbsegm.h
diff --git a/lib/include/srslte/phy/fec/rm_turbo.h b/lib/include/srslte/phy/fec/turbo/rm_turbo.h
similarity index 100%
rename from lib/include/srslte/phy/fec/rm_turbo.h
rename to lib/include/srslte/phy/fec/turbo/rm_turbo.h
diff --git a/lib/include/srslte/phy/fec/tc_interl.h b/lib/include/srslte/phy/fec/turbo/tc_interl.h
similarity index 100%
rename from lib/include/srslte/phy/fec/tc_interl.h
rename to lib/include/srslte/phy/fec/turbo/tc_interl.h
diff --git a/lib/include/srslte/phy/fec/turbocoder.h b/lib/include/srslte/phy/fec/turbo/turbocoder.h
similarity index 100%
rename from lib/include/srslte/phy/fec/turbocoder.h
rename to lib/include/srslte/phy/fec/turbo/turbocoder.h
diff --git a/lib/include/srslte/phy/fec/turbodecoder.h b/lib/include/srslte/phy/fec/turbo/turbodecoder.h
similarity index 100%
rename from lib/include/srslte/phy/fec/turbodecoder.h
rename to lib/include/srslte/phy/fec/turbo/turbodecoder.h
diff --git a/lib/include/srslte/phy/fec/turbodecoder_gen.h b/lib/include/srslte/phy/fec/turbo/turbodecoder_gen.h
similarity index 100%
rename from lib/include/srslte/phy/fec/turbodecoder_gen.h
rename to lib/include/srslte/phy/fec/turbo/turbodecoder_gen.h
diff --git a/lib/include/srslte/phy/fec/turbodecoder_impl.h b/lib/include/srslte/phy/fec/turbo/turbodecoder_impl.h
similarity index 100%
rename from lib/include/srslte/phy/fec/turbodecoder_impl.h
rename to lib/include/srslte/phy/fec/turbo/turbodecoder_impl.h
diff --git a/lib/include/srslte/phy/fec/turbodecoder_iter.h b/lib/include/srslte/phy/fec/turbo/turbodecoder_iter.h
similarity index 100%
rename from lib/include/srslte/phy/fec/turbodecoder_iter.h
rename to lib/include/srslte/phy/fec/turbo/turbodecoder_iter.h
diff --git a/lib/include/srslte/phy/fec/turbodecoder_sse.h b/lib/include/srslte/phy/fec/turbo/turbodecoder_sse.h
similarity index 100%
rename from lib/include/srslte/phy/fec/turbodecoder_sse.h
rename to lib/include/srslte/phy/fec/turbo/turbodecoder_sse.h
diff --git a/lib/include/srslte/phy/fec/turbodecoder_win.h b/lib/include/srslte/phy/fec/turbo/turbodecoder_win.h
similarity index 100%
rename from lib/include/srslte/phy/fec/turbodecoder_win.h
rename to lib/include/srslte/phy/fec/turbo/turbodecoder_win.h
diff --git a/lib/src/phy/fec/convcoder.c b/lib/src/phy/fec/convolutional/convcoder.c
similarity index 100%
rename from lib/src/phy/fec/convcoder.c
rename to lib/src/phy/fec/convolutional/convcoder.c
diff --git a/lib/src/phy/fec/test/viterbi_test.c b/lib/src/phy/fec/convolutional/test/viterbi_test.c
similarity index 100%
rename from lib/src/phy/fec/test/viterbi_test.c
rename to lib/src/phy/fec/convolutional/test/viterbi_test.c
diff --git a/lib/src/phy/fec/test/viterbi_test.h b/lib/src/phy/fec/convolutional/test/viterbi_test.h
similarity index 100%
rename from lib/src/phy/fec/test/viterbi_test.h
rename to lib/src/phy/fec/convolutional/test/viterbi_test.h
diff --git a/lib/src/phy/fec/viterbi.c b/lib/src/phy/fec/convolutional/viterbi.c
similarity index 99%
rename from lib/src/phy/fec/viterbi.c
rename to lib/src/phy/fec/convolutional/viterbi.c
index d8f47a869..80de2c938 100644
--- a/lib/src/phy/fec/viterbi.c
+++ b/lib/src/phy/fec/convolutional/viterbi.c
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "parity.h"
+#include "../parity.h"
 #include "srslte/phy/fec/viterbi.h"
 #include "srslte/phy/utils/debug.h"
 #include "srslte/phy/utils/vector.h"
diff --git a/lib/src/phy/fec/viterbi37.h b/lib/src/phy/fec/convolutional/viterbi37.h
similarity index 100%
rename from lib/src/phy/fec/viterbi37.h
rename to lib/src/phy/fec/convolutional/viterbi37.h
diff --git a/lib/src/phy/fec/viterbi37_avx2.c b/lib/src/phy/fec/convolutional/viterbi37_avx2.c
similarity index 99%
rename from lib/src/phy/fec/viterbi37_avx2.c
rename to lib/src/phy/fec/convolutional/viterbi37_avx2.c
index 0749bfdf4..b22afe186 100644
--- a/lib/src/phy/fec/viterbi37_avx2.c
+++ b/lib/src/phy/fec/convolutional/viterbi37_avx2.c
@@ -5,7 +5,7 @@
  * May be used under the terms of the GNU Lesser General Public License (LGPL)
  */
 
-#include "parity.h"
+#include "../parity.h"
 #include <limits.h>
 #include <memory.h>
 #include <stdint.h>
diff --git a/lib/src/phy/fec/viterbi37_avx2_16bit.c b/lib/src/phy/fec/convolutional/viterbi37_avx2_16bit.c
similarity index 99%
rename from lib/src/phy/fec/viterbi37_avx2_16bit.c
rename to lib/src/phy/fec/convolutional/viterbi37_avx2_16bit.c
index 9f0aaabaa..c80250fc8 100644
--- a/lib/src/phy/fec/viterbi37_avx2_16bit.c
+++ b/lib/src/phy/fec/convolutional/viterbi37_avx2_16bit.c
@@ -5,7 +5,7 @@
  * May be used under the terms of the GNU Lesser General Public License (LGPL)
  */
 
-#include "parity.h"
+#include "../parity.h"
 #include <limits.h>
 #include <memory.h>
 #include <stdint.h>
diff --git a/lib/src/phy/fec/viterbi37_neon.c b/lib/src/phy/fec/convolutional/viterbi37_neon.c
similarity index 99%
rename from lib/src/phy/fec/viterbi37_neon.c
rename to lib/src/phy/fec/convolutional/viterbi37_neon.c
index 9de1540ae..e39cd2492 100644
--- a/lib/src/phy/fec/viterbi37_neon.c
+++ b/lib/src/phy/fec/convolutional/viterbi37_neon.c
@@ -5,7 +5,7 @@
  * May be used under the terms of the GNU Lesser General Public License (LGPL)
  */
 
-#include "parity.h"
+#include "../parity.h"
 #include <limits.h>
 #include <memory.h>
 #include <stdint.h>
diff --git a/lib/src/phy/fec/viterbi37_port.c b/lib/src/phy/fec/convolutional/viterbi37_port.c
similarity index 99%
rename from lib/src/phy/fec/viterbi37_port.c
rename to lib/src/phy/fec/convolutional/viterbi37_port.c
index 122dfd188..7c53d4927 100644
--- a/lib/src/phy/fec/viterbi37_port.c
+++ b/lib/src/phy/fec/convolutional/viterbi37_port.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "parity.h"
+#include "../parity.h"
 #include "viterbi37.h"
 #include <limits.h>
 #include <memory.h>
diff --git a/lib/src/phy/fec/viterbi37_sse.c b/lib/src/phy/fec/convolutional/viterbi37_sse.c
similarity index 99%
rename from lib/src/phy/fec/viterbi37_sse.c
rename to lib/src/phy/fec/convolutional/viterbi37_sse.c
index 2730c8c01..0c48f8bd6 100644
--- a/lib/src/phy/fec/viterbi37_sse.c
+++ b/lib/src/phy/fec/convolutional/viterbi37_sse.c
@@ -5,7 +5,7 @@
  * May be used under the terms of the GNU Lesser General Public License (LGPL)
  */
 
-#include "parity.h"
+#include "../parity.h"
 #include <limits.h>
 #include <memory.h>
 #include <stdint.h>
diff --git a/lib/src/phy/fec/cbsegm.c b/lib/src/phy/fec/turbo/cbsegm.c
similarity index 100%
rename from lib/src/phy/fec/cbsegm.c
rename to lib/src/phy/fec/turbo/cbsegm.c
diff --git a/lib/src/phy/fec/parity.c b/lib/src/phy/fec/turbo/parity.c
similarity index 100%
rename from lib/src/phy/fec/parity.c
rename to lib/src/phy/fec/turbo/parity.c
diff --git a/lib/src/phy/fec/parity.h b/lib/src/phy/fec/turbo/parity.h
similarity index 100%
rename from lib/src/phy/fec/parity.h
rename to lib/src/phy/fec/turbo/parity.h
diff --git a/lib/src/phy/fec/rm_conv.c b/lib/src/phy/fec/turbo/rm_conv.c
similarity index 100%
rename from lib/src/phy/fec/rm_conv.c
rename to lib/src/phy/fec/turbo/rm_conv.c
diff --git a/lib/src/phy/fec/rm_turbo.c b/lib/src/phy/fec/turbo/rm_turbo.c
similarity index 100%
rename from lib/src/phy/fec/rm_turbo.c
rename to lib/src/phy/fec/turbo/rm_turbo.c
diff --git a/lib/src/phy/fec/tc_interl_lte.c b/lib/src/phy/fec/turbo/tc_interl_lte.c
similarity index 100%
rename from lib/src/phy/fec/tc_interl_lte.c
rename to lib/src/phy/fec/turbo/tc_interl_lte.c
diff --git a/lib/src/phy/fec/tc_interl_umts.c b/lib/src/phy/fec/turbo/tc_interl_umts.c
similarity index 100%
rename from lib/src/phy/fec/tc_interl_umts.c
rename to lib/src/phy/fec/turbo/tc_interl_umts.c
diff --git a/lib/src/phy/fec/test/rm_conv_test.c b/lib/src/phy/fec/turbo/test/rm_conv_test.c
similarity index 100%
rename from lib/src/phy/fec/test/rm_conv_test.c
rename to lib/src/phy/fec/turbo/test/rm_conv_test.c
diff --git a/lib/src/phy/fec/test/rm_turbo_test.c b/lib/src/phy/fec/turbo/test/rm_turbo_test.c
similarity index 100%
rename from lib/src/phy/fec/test/rm_turbo_test.c
rename to lib/src/phy/fec/turbo/test/rm_turbo_test.c
diff --git a/lib/src/phy/fec/test/turbocoder_test.c b/lib/src/phy/fec/turbo/test/turbocoder_test.c
similarity index 100%
rename from lib/src/phy/fec/test/turbocoder_test.c
rename to lib/src/phy/fec/turbo/test/turbocoder_test.c
diff --git a/lib/src/phy/fec/test/turbodecoder_test.c b/lib/src/phy/fec/turbo/test/turbodecoder_test.c
similarity index 100%
rename from lib/src/phy/fec/test/turbodecoder_test.c
rename to lib/src/phy/fec/turbo/test/turbodecoder_test.c
diff --git a/lib/src/phy/fec/test/turbodecoder_test.h b/lib/src/phy/fec/turbo/test/turbodecoder_test.h
similarity index 100%
rename from lib/src/phy/fec/test/turbodecoder_test.h
rename to lib/src/phy/fec/turbo/test/turbodecoder_test.h
diff --git a/lib/src/phy/fec/turbocoder.c b/lib/src/phy/fec/turbo/turbocoder.c
similarity index 100%
rename from lib/src/phy/fec/turbocoder.c
rename to lib/src/phy/fec/turbo/turbocoder.c
diff --git a/lib/src/phy/fec/turbodecoder.c b/lib/src/phy/fec/turbo/turbodecoder.c
similarity index 100%
rename from lib/src/phy/fec/turbodecoder.c
rename to lib/src/phy/fec/turbo/turbodecoder.c
diff --git a/lib/src/phy/fec/turbodecoder_gen.c b/lib/src/phy/fec/turbo/turbodecoder_gen.c
similarity index 100%
rename from lib/src/phy/fec/turbodecoder_gen.c
rename to lib/src/phy/fec/turbo/turbodecoder_gen.c
diff --git a/lib/src/phy/fec/turbodecoder_sse.c b/lib/src/phy/fec/turbo/turbodecoder_sse.c
similarity index 100%
rename from lib/src/phy/fec/turbodecoder_sse.c
rename to lib/src/phy/fec/turbo/turbodecoder_sse.c