diff --git a/openair-cn/NAS/EURECOM-NAS/src/api/network/as_message.h b/openair2/COMMON/as_message.h
similarity index 99%
rename from openair-cn/NAS/EURECOM-NAS/src/api/network/as_message.h
rename to openair2/COMMON/as_message.h
index f242424823a6c07e105f3e811fc0c1f345c515e6..2d4bb77e5369a7a372ad4215f7a09325c6aebaf2 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/api/network/as_message.h
+++ b/openair2/COMMON/as_message.h
@@ -521,6 +521,6 @@ int as_message_decode(const char* buffer, as_message_t* msg, int length);
 int as_message_encode(char* buffer, as_message_t* msg, int length);
 
 /* Implemented in the network_api.c body file */
-int as_message_send(as_message_t* as_msg);
+int as_message_send(const nas_type_t nas_type, as_message_t* as_msg);
 
 #endif /* __AS_MESSAGE_H__*/
diff --git a/openair-cn/NAS/EURECOM-NAS/src/include/commonDef.h b/openair2/COMMON/commonDef.h
similarity index 100%
rename from openair-cn/NAS/EURECOM-NAS/src/include/commonDef.h
rename to openair2/COMMON/commonDef.h
diff --git a/openair-cn/NAS/EURECOM-NAS/src/include/networkDef.h b/openair2/COMMON/networkDef.h
similarity index 100%
rename from openair-cn/NAS/EURECOM-NAS/src/include/networkDef.h
rename to openair2/COMMON/networkDef.h