diff --git a/CMakeLists.txt b/CMakeLists.txt
index abfc8fa7c0..2c7776c94a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -780,20 +780,6 @@ include_directories(${NFAPI_USER_DIR})
 
 # Layer 1
 #############################
-set(PHY_POLARSRC
-  ${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
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_interleaving_pattern.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_kernal_operation.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_kronecker_power_matrices.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_procedures.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_sequence_pattern.c
-)
 set(PHY_SMALLBLOCKSRC
   ${OPENAIR1_DIR}/PHY/CODING/nrSmallBlock/encodeSmallBlock.c
   ${OPENAIR1_DIR}/PHY/CODING/nrSmallBlock/decodeSmallBlock.c
@@ -978,7 +964,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/dB_routines.c
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
-  ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
   ${PHY_NRLDPC_CODINGIF}
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c
@@ -1029,7 +1014,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
   ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
-  ${PHY_POLARSRC}
   ${PHY_SMALLBLOCKSRC}
   ${PHY_NRLDPC_CODINGIF}
   )
@@ -1064,14 +1048,14 @@ add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})
 target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)
 
 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5)
+target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5 polar)
 
 add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
 target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
 target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)
 
 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL polar)
 
 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)
diff --git a/openair1/PHY/CODING/CMakeLists.txt b/openair1/PHY/CODING/CMakeLists.txt
index f696c71213..bbc5184418 100644
--- a/openair1/PHY/CODING/CMakeLists.txt
+++ b/openair1/PHY/CODING/CMakeLists.txt
@@ -68,3 +68,4 @@ endif()
 
 add_subdirectory(nrLDPC_coding)
 add_subdirectory(nrLDPC_decoder)
+add_subdirectory(nrPolar_tools)
diff --git a/openair1/PHY/CODING/nrPolar_tools/CMakeLists.txt b/openair1/PHY/CODING/nrPolar_tools/CMakeLists.txt
new file mode 100644
index 0000000000..14e3e816e1
--- /dev/null
+++ b/openair1/PHY/CODING/nrPolar_tools/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_library(polar STATIC
+  nr_polar_init.c
+  nr_bitwise_operations.c
+  nr_crc_byte.c
+  nr_polar_decoder.c
+  nr_polar_decoding_tools.c
+  nr_polar_encoder.c
+  nr_polar_interleaving_pattern.c
+  nr_polar_kernal_operation.c
+  nr_polar_kronecker_power_matrices.c
+  nr_polar_matrix_and_array.c
+  nr_polar_procedures.c
+  nr_polar_sequence_pattern.c
+)
+target_link_libraries(polar PRIVATE utils)