diff --git a/connectivity/nfc/acore/acore/ac_buffer.h b/connectivity/nfc/libraries/acore/acore/ac_buffer.h
similarity index 100%
rename from connectivity/nfc/acore/acore/ac_buffer.h
rename to connectivity/nfc/libraries/acore/acore/ac_buffer.h
diff --git a/connectivity/nfc/acore/acore/ac_buffer_builder.h b/connectivity/nfc/libraries/acore/acore/ac_buffer_builder.h
similarity index 100%
rename from connectivity/nfc/acore/acore/ac_buffer_builder.h
rename to connectivity/nfc/libraries/acore/acore/ac_buffer_builder.h
diff --git a/connectivity/nfc/acore/acore/ac_buffer_reader.h b/connectivity/nfc/libraries/acore/acore/ac_buffer_reader.h
similarity index 100%
rename from connectivity/nfc/acore/acore/ac_buffer_reader.h
rename to connectivity/nfc/libraries/acore/acore/ac_buffer_reader.h
diff --git a/connectivity/nfc/acore/acore/ac_debug.h b/connectivity/nfc/libraries/acore/acore/ac_debug.h
similarity index 100%
rename from connectivity/nfc/acore/acore/ac_debug.h
rename to connectivity/nfc/libraries/acore/acore/ac_debug.h
diff --git a/connectivity/nfc/acore/acore/ac_macros.h b/connectivity/nfc/libraries/acore/acore/ac_macros.h
similarity index 100%
rename from connectivity/nfc/acore/acore/ac_macros.h
rename to connectivity/nfc/libraries/acore/acore/ac_macros.h
diff --git a/connectivity/nfc/acore/acore/ac_stream.h b/connectivity/nfc/libraries/acore/acore/ac_stream.h
similarity index 100%
rename from connectivity/nfc/acore/acore/ac_stream.h
rename to connectivity/nfc/libraries/acore/acore/ac_stream.h
diff --git a/connectivity/nfc/acore/source/ac_buffer.c b/connectivity/nfc/libraries/acore/source/ac_buffer.c
similarity index 100%
rename from connectivity/nfc/acore/source/ac_buffer.c
rename to connectivity/nfc/libraries/acore/source/ac_buffer.c
diff --git a/connectivity/nfc/acore/source/ac_buffer_builder.c b/connectivity/nfc/libraries/acore/source/ac_buffer_builder.c
similarity index 100%
rename from connectivity/nfc/acore/source/ac_buffer_builder.c
rename to connectivity/nfc/libraries/acore/source/ac_buffer_builder.c
diff --git a/connectivity/nfc/acore/source/ac_buffer_reader.c b/connectivity/nfc/libraries/acore/source/ac_buffer_reader.c
similarity index 100%
rename from connectivity/nfc/acore/source/ac_buffer_reader.c
rename to connectivity/nfc/libraries/acore/source/ac_buffer_reader.c
diff --git a/connectivity/nfc/acore/source/ac_stream.c b/connectivity/nfc/libraries/acore/source/ac_stream.c
similarity index 100%
rename from connectivity/nfc/acore/source/ac_stream.c
rename to connectivity/nfc/libraries/acore/source/ac_stream.c
diff --git a/connectivity/nfc/stack/ndef/ndef.c b/connectivity/nfc/libraries/stack/ndef/ndef.c
similarity index 100%
rename from connectivity/nfc/stack/ndef/ndef.c
rename to connectivity/nfc/libraries/stack/ndef/ndef.c
diff --git a/connectivity/nfc/stack/ndef/ndef.h b/connectivity/nfc/libraries/stack/ndef/ndef.h
similarity index 100%
rename from connectivity/nfc/stack/ndef/ndef.h
rename to connectivity/nfc/libraries/stack/ndef/ndef.h
diff --git a/connectivity/nfc/stack/nfc_common.h b/connectivity/nfc/libraries/stack/nfc_common.h
similarity index 100%
rename from connectivity/nfc/stack/nfc_common.h
rename to connectivity/nfc/libraries/stack/nfc_common.h
diff --git a/connectivity/nfc/stack/nfc_errors.h b/connectivity/nfc/libraries/stack/nfc_errors.h
similarity index 100%
rename from connectivity/nfc/stack/nfc_errors.h
rename to connectivity/nfc/libraries/stack/nfc_errors.h
diff --git a/connectivity/nfc/stack/platform/nfc_debug.h b/connectivity/nfc/libraries/stack/platform/nfc_debug.h
similarity index 100%
rename from connectivity/nfc/stack/platform/nfc_debug.h
rename to connectivity/nfc/libraries/stack/platform/nfc_debug.h
diff --git a/connectivity/nfc/stack/platform/nfc_scheduler.c b/connectivity/nfc/libraries/stack/platform/nfc_scheduler.c
similarity index 100%
rename from connectivity/nfc/stack/platform/nfc_scheduler.c
rename to connectivity/nfc/libraries/stack/platform/nfc_scheduler.c
diff --git a/connectivity/nfc/stack/platform/nfc_scheduler.h b/connectivity/nfc/libraries/stack/platform/nfc_scheduler.h
similarity index 100%
rename from connectivity/nfc/stack/platform/nfc_scheduler.h
rename to connectivity/nfc/libraries/stack/platform/nfc_scheduler.h
diff --git a/connectivity/nfc/stack/platform/nfc_transport.c b/connectivity/nfc/libraries/stack/platform/nfc_transport.c
similarity index 100%
rename from connectivity/nfc/stack/platform/nfc_transport.c
rename to connectivity/nfc/libraries/stack/platform/nfc_transport.c
diff --git a/connectivity/nfc/stack/platform/nfc_transport.h b/connectivity/nfc/libraries/stack/platform/nfc_transport.h
similarity index 100%
rename from connectivity/nfc/stack/platform/nfc_transport.h
rename to connectivity/nfc/libraries/stack/platform/nfc_transport.h
diff --git a/connectivity/nfc/stack/tech/iso7816/iso7816.c b/connectivity/nfc/libraries/stack/tech/iso7816/iso7816.c
similarity index 100%
rename from connectivity/nfc/stack/tech/iso7816/iso7816.c
rename to connectivity/nfc/libraries/stack/tech/iso7816/iso7816.c
diff --git a/connectivity/nfc/stack/tech/iso7816/iso7816.h b/connectivity/nfc/libraries/stack/tech/iso7816/iso7816.h
similarity index 100%
rename from connectivity/nfc/stack/tech/iso7816/iso7816.h
rename to connectivity/nfc/libraries/stack/tech/iso7816/iso7816.h
diff --git a/connectivity/nfc/stack/tech/iso7816/iso7816_app.c b/connectivity/nfc/libraries/stack/tech/iso7816/iso7816_app.c
similarity index 100%
rename from connectivity/nfc/stack/tech/iso7816/iso7816_app.c
rename to connectivity/nfc/libraries/stack/tech/iso7816/iso7816_app.c
diff --git a/connectivity/nfc/stack/tech/iso7816/iso7816_app.h b/connectivity/nfc/libraries/stack/tech/iso7816/iso7816_app.h
similarity index 100%
rename from connectivity/nfc/stack/tech/iso7816/iso7816_app.h
rename to connectivity/nfc/libraries/stack/tech/iso7816/iso7816_app.h
diff --git a/connectivity/nfc/stack/tech/iso7816/iso7816_defs.h b/connectivity/nfc/libraries/stack/tech/iso7816/iso7816_defs.h
similarity index 100%
rename from connectivity/nfc/stack/tech/iso7816/iso7816_defs.h
rename to connectivity/nfc/libraries/stack/tech/iso7816/iso7816_defs.h
diff --git a/connectivity/nfc/stack/tech/isodep/isodep.h b/connectivity/nfc/libraries/stack/tech/isodep/isodep.h
similarity index 100%
rename from connectivity/nfc/stack/tech/isodep/isodep.h
rename to connectivity/nfc/libraries/stack/tech/isodep/isodep.h
diff --git a/connectivity/nfc/stack/tech/isodep/isodep_target.c b/connectivity/nfc/libraries/stack/tech/isodep/isodep_target.c
similarity index 100%
rename from connectivity/nfc/stack/tech/isodep/isodep_target.c
rename to connectivity/nfc/libraries/stack/tech/isodep/isodep_target.c
diff --git a/connectivity/nfc/stack/tech/isodep/isodep_target.h b/connectivity/nfc/libraries/stack/tech/isodep/isodep_target.h
similarity index 100%
rename from connectivity/nfc/stack/tech/isodep/isodep_target.h
rename to connectivity/nfc/libraries/stack/tech/isodep/isodep_target.h
diff --git a/connectivity/nfc/stack/tech/type4/type4_target.c b/connectivity/nfc/libraries/stack/tech/type4/type4_target.c
similarity index 100%
rename from connectivity/nfc/stack/tech/type4/type4_target.c
rename to connectivity/nfc/libraries/stack/tech/type4/type4_target.c
diff --git a/connectivity/nfc/stack/tech/type4/type4_target.h b/connectivity/nfc/libraries/stack/tech/type4/type4_target.h
similarity index 100%
rename from connectivity/nfc/stack/tech/type4/type4_target.h
rename to connectivity/nfc/libraries/stack/tech/type4/type4_target.h
diff --git a/connectivity/nfc/stack/transceiver/protocols.h b/connectivity/nfc/libraries/stack/transceiver/protocols.h
similarity index 100%
rename from connectivity/nfc/stack/transceiver/protocols.h
rename to connectivity/nfc/libraries/stack/transceiver/protocols.h
diff --git a/connectivity/nfc/stack/transceiver/transceiver.c b/connectivity/nfc/libraries/stack/transceiver/transceiver.c
similarity index 100%
rename from connectivity/nfc/stack/transceiver/transceiver.c
rename to connectivity/nfc/libraries/stack/transceiver/transceiver.c
diff --git a/connectivity/nfc/stack/transceiver/transceiver.h b/connectivity/nfc/libraries/stack/transceiver/transceiver.h
similarity index 100%
rename from connectivity/nfc/stack/transceiver/transceiver.h
rename to connectivity/nfc/libraries/stack/transceiver/transceiver.h
diff --git a/connectivity/nfc/stack/transceiver/transceiver_internal.h b/connectivity/nfc/libraries/stack/transceiver/transceiver_internal.h
similarity index 100%
rename from connectivity/nfc/stack/transceiver/transceiver_internal.h
rename to connectivity/nfc/libraries/stack/transceiver/transceiver_internal.h