diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ac21ab5d5..e4ab080a2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -772,7 +772,7 @@ set(PHY_TURBOSRC
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_turbo_decoder.c
 )
 set(PHY_POLARSRC
-  ${OPENAIR1_DIR}/PHY/CODING/nr_polar_init.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_init.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
   ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
diff --git a/openair1/PHY/CODING/nr_polar_init.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_init.c
similarity index 99%
rename from openair1/PHY/CODING/nr_polar_init.c
rename to openair1/PHY/CODING/nrPolar_tools/nr_polar_init.c
index ca982d79bf..609f4b4a8f 100644
--- a/openair1/PHY/CODING/nr_polar_init.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_init.c
@@ -30,9 +30,9 @@
  * \warning
  */
 
-#include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
+#include "nr_polar_defs.h"
+#include "nr_polar_psbch_defs.h"
 #include "PHY/NR_TRANSPORT/nr_dci.h"
-#include "nrPolar_tools/nr_polar_psbch_defs.h"
 
 #define PolarKey ((messageType << 24) | (messageLength << 8) | aggregation_level)
 static t_nrPolar_params *PolarList = NULL;