diff --git a/features/nfc/acore/acore/ac_buffer.h b/connectivity/nfc/acore/acore/ac_buffer.h
similarity index 100%
rename from features/nfc/acore/acore/ac_buffer.h
rename to connectivity/nfc/acore/acore/ac_buffer.h
diff --git a/features/nfc/acore/acore/ac_buffer_builder.h b/connectivity/nfc/acore/acore/ac_buffer_builder.h
similarity index 100%
rename from features/nfc/acore/acore/ac_buffer_builder.h
rename to connectivity/nfc/acore/acore/ac_buffer_builder.h
diff --git a/features/nfc/acore/acore/ac_buffer_reader.h b/connectivity/nfc/acore/acore/ac_buffer_reader.h
similarity index 100%
rename from features/nfc/acore/acore/ac_buffer_reader.h
rename to connectivity/nfc/acore/acore/ac_buffer_reader.h
diff --git a/features/nfc/acore/acore/ac_debug.h b/connectivity/nfc/acore/acore/ac_debug.h
similarity index 100%
rename from features/nfc/acore/acore/ac_debug.h
rename to connectivity/nfc/acore/acore/ac_debug.h
diff --git a/features/nfc/acore/acore/ac_macros.h b/connectivity/nfc/acore/acore/ac_macros.h
similarity index 100%
rename from features/nfc/acore/acore/ac_macros.h
rename to connectivity/nfc/acore/acore/ac_macros.h
diff --git a/features/nfc/acore/acore/ac_stream.h b/connectivity/nfc/acore/acore/ac_stream.h
similarity index 100%
rename from features/nfc/acore/acore/ac_stream.h
rename to connectivity/nfc/acore/acore/ac_stream.h
diff --git a/features/nfc/acore/source/ac_buffer.c b/connectivity/nfc/acore/source/ac_buffer.c
similarity index 100%
rename from features/nfc/acore/source/ac_buffer.c
rename to connectivity/nfc/acore/source/ac_buffer.c
diff --git a/features/nfc/acore/source/ac_buffer_builder.c b/connectivity/nfc/acore/source/ac_buffer_builder.c
similarity index 100%
rename from features/nfc/acore/source/ac_buffer_builder.c
rename to connectivity/nfc/acore/source/ac_buffer_builder.c
diff --git a/features/nfc/acore/source/ac_buffer_reader.c b/connectivity/nfc/acore/source/ac_buffer_reader.c
similarity index 100%
rename from features/nfc/acore/source/ac_buffer_reader.c
rename to connectivity/nfc/acore/source/ac_buffer_reader.c
diff --git a/features/nfc/acore/source/ac_stream.c b/connectivity/nfc/acore/source/ac_stream.c
similarity index 100%
rename from features/nfc/acore/source/ac_stream.c
rename to connectivity/nfc/acore/source/ac_stream.c
diff --git a/features/nfc/controllers/PN512Driver.h b/connectivity/nfc/controllers/PN512Driver.h
similarity index 100%
rename from features/nfc/controllers/PN512Driver.h
rename to connectivity/nfc/controllers/PN512Driver.h
diff --git a/features/nfc/controllers/PN512SPITransportDriver.h b/connectivity/nfc/controllers/PN512SPITransportDriver.h
similarity index 100%
rename from features/nfc/controllers/PN512SPITransportDriver.h
rename to connectivity/nfc/controllers/PN512SPITransportDriver.h
diff --git a/features/nfc/controllers/PN512TransportDriver.h b/connectivity/nfc/controllers/PN512TransportDriver.h
similarity index 100%
rename from features/nfc/controllers/PN512TransportDriver.h
rename to connectivity/nfc/controllers/PN512TransportDriver.h
diff --git a/features/nfc/mbed_lib.json b/connectivity/nfc/mbed_lib.json
similarity index 100%
rename from features/nfc/mbed_lib.json
rename to connectivity/nfc/mbed_lib.json
diff --git a/features/nfc/nfc/NFC.h b/connectivity/nfc/nfc/NFC.h
similarity index 100%
rename from features/nfc/nfc/NFC.h
rename to connectivity/nfc/nfc/NFC.h
diff --git a/features/nfc/nfc/NFCController.h b/connectivity/nfc/nfc/NFCController.h
similarity index 100%
rename from features/nfc/nfc/NFCController.h
rename to connectivity/nfc/nfc/NFCController.h
diff --git a/features/nfc/nfc/NFCControllerDriver.h b/connectivity/nfc/nfc/NFCControllerDriver.h
similarity index 100%
rename from features/nfc/nfc/NFCControllerDriver.h
rename to connectivity/nfc/nfc/NFCControllerDriver.h
diff --git a/features/nfc/nfc/NFCDefinitions.h b/connectivity/nfc/nfc/NFCDefinitions.h
similarity index 100%
rename from features/nfc/nfc/NFCDefinitions.h
rename to connectivity/nfc/nfc/NFCDefinitions.h
diff --git a/features/nfc/nfc/NFCEEPROM.h b/connectivity/nfc/nfc/NFCEEPROM.h
similarity index 100%
rename from features/nfc/nfc/NFCEEPROM.h
rename to connectivity/nfc/nfc/NFCEEPROM.h
diff --git a/features/nfc/nfc/NFCEEPROMDriver.h b/connectivity/nfc/nfc/NFCEEPROMDriver.h
similarity index 100%
rename from features/nfc/nfc/NFCEEPROMDriver.h
rename to connectivity/nfc/nfc/NFCEEPROMDriver.h
diff --git a/features/nfc/nfc/NFCNDEFCapable.h b/connectivity/nfc/nfc/NFCNDEFCapable.h
similarity index 100%
rename from features/nfc/nfc/NFCNDEFCapable.h
rename to connectivity/nfc/nfc/NFCNDEFCapable.h
diff --git a/features/nfc/nfc/NFCRemoteEndpoint.h b/connectivity/nfc/nfc/NFCRemoteEndpoint.h
similarity index 100%
rename from features/nfc/nfc/NFCRemoteEndpoint.h
rename to connectivity/nfc/nfc/NFCRemoteEndpoint.h
diff --git a/features/nfc/nfc/NFCRemoteInitiator.h b/connectivity/nfc/nfc/NFCRemoteInitiator.h
similarity index 100%
rename from features/nfc/nfc/NFCRemoteInitiator.h
rename to connectivity/nfc/nfc/NFCRemoteInitiator.h
diff --git a/features/nfc/nfc/NFCTarget.h b/connectivity/nfc/nfc/NFCTarget.h
similarity index 100%
rename from features/nfc/nfc/NFCTarget.h
rename to connectivity/nfc/nfc/NFCTarget.h
diff --git a/features/nfc/nfc/Type4RemoteInitiator.h b/connectivity/nfc/nfc/Type4RemoteInitiator.h
similarity index 100%
rename from features/nfc/nfc/Type4RemoteInitiator.h
rename to connectivity/nfc/nfc/Type4RemoteInitiator.h
diff --git a/features/nfc/nfc/ndef/MessageBuilder.h b/connectivity/nfc/nfc/ndef/MessageBuilder.h
similarity index 100%
rename from features/nfc/nfc/ndef/MessageBuilder.h
rename to connectivity/nfc/nfc/ndef/MessageBuilder.h
diff --git a/features/nfc/nfc/ndef/MessageParser.h b/connectivity/nfc/nfc/ndef/MessageParser.h
similarity index 100%
rename from features/nfc/nfc/ndef/MessageParser.h
rename to connectivity/nfc/nfc/ndef/MessageParser.h
diff --git a/features/nfc/nfc/ndef/Record.h b/connectivity/nfc/nfc/ndef/Record.h
similarity index 100%
rename from features/nfc/nfc/ndef/Record.h
rename to connectivity/nfc/nfc/ndef/Record.h
diff --git a/features/nfc/nfc/ndef/RecordParser.h b/connectivity/nfc/nfc/ndef/RecordParser.h
similarity index 100%
rename from features/nfc/nfc/ndef/RecordParser.h
rename to connectivity/nfc/nfc/ndef/RecordParser.h
diff --git a/features/nfc/nfc/ndef/common/Mime.h b/connectivity/nfc/nfc/ndef/common/Mime.h
similarity index 100%
rename from features/nfc/nfc/ndef/common/Mime.h
rename to connectivity/nfc/nfc/ndef/common/Mime.h
diff --git a/features/nfc/nfc/ndef/common/SimpleMessageParser.h b/connectivity/nfc/nfc/ndef/common/SimpleMessageParser.h
similarity index 100%
rename from features/nfc/nfc/ndef/common/SimpleMessageParser.h
rename to connectivity/nfc/nfc/ndef/common/SimpleMessageParser.h
diff --git a/features/nfc/nfc/ndef/common/Text.h b/connectivity/nfc/nfc/ndef/common/Text.h
similarity index 100%
rename from features/nfc/nfc/ndef/common/Text.h
rename to connectivity/nfc/nfc/ndef/common/Text.h
diff --git a/features/nfc/nfc/ndef/common/URI.h b/connectivity/nfc/nfc/ndef/common/URI.h
similarity index 100%
rename from features/nfc/nfc/ndef/common/URI.h
rename to connectivity/nfc/nfc/ndef/common/URI.h
diff --git a/features/nfc/nfc/ndef/common/util.h b/connectivity/nfc/nfc/ndef/common/util.h
similarity index 100%
rename from features/nfc/nfc/ndef/common/util.h
rename to connectivity/nfc/nfc/ndef/common/util.h
diff --git a/features/nfc/source/controllers/PN512Driver.cpp b/connectivity/nfc/source/controllers/PN512Driver.cpp
similarity index 100%
rename from features/nfc/source/controllers/PN512Driver.cpp
rename to connectivity/nfc/source/controllers/PN512Driver.cpp
diff --git a/features/nfc/source/controllers/PN512SPITransportDriver.cpp b/connectivity/nfc/source/controllers/PN512SPITransportDriver.cpp
similarity index 100%
rename from features/nfc/source/controllers/PN512SPITransportDriver.cpp
rename to connectivity/nfc/source/controllers/PN512SPITransportDriver.cpp
diff --git a/features/nfc/source/controllers/PN512TransportDriver.cpp b/connectivity/nfc/source/controllers/PN512TransportDriver.cpp
similarity index 100%
rename from features/nfc/source/controllers/PN512TransportDriver.cpp
rename to connectivity/nfc/source/controllers/PN512TransportDriver.cpp
diff --git a/features/nfc/source/nfc/NFCController.cpp b/connectivity/nfc/source/nfc/NFCController.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCController.cpp
rename to connectivity/nfc/source/nfc/NFCController.cpp
diff --git a/features/nfc/source/nfc/NFCControllerDriver.cpp b/connectivity/nfc/source/nfc/NFCControllerDriver.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCControllerDriver.cpp
rename to connectivity/nfc/source/nfc/NFCControllerDriver.cpp
diff --git a/features/nfc/source/nfc/NFCEEPROM.cpp b/connectivity/nfc/source/nfc/NFCEEPROM.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCEEPROM.cpp
rename to connectivity/nfc/source/nfc/NFCEEPROM.cpp
diff --git a/features/nfc/source/nfc/NFCEEPROMDriver.cpp b/connectivity/nfc/source/nfc/NFCEEPROMDriver.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCEEPROMDriver.cpp
rename to connectivity/nfc/source/nfc/NFCEEPROMDriver.cpp
diff --git a/features/nfc/source/nfc/NFCNDEFCapable.cpp b/connectivity/nfc/source/nfc/NFCNDEFCapable.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCNDEFCapable.cpp
rename to connectivity/nfc/source/nfc/NFCNDEFCapable.cpp
diff --git a/features/nfc/source/nfc/NFCRemoteEndpoint.cpp b/connectivity/nfc/source/nfc/NFCRemoteEndpoint.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCRemoteEndpoint.cpp
rename to connectivity/nfc/source/nfc/NFCRemoteEndpoint.cpp
diff --git a/features/nfc/source/nfc/NFCRemoteInitiator.cpp b/connectivity/nfc/source/nfc/NFCRemoteInitiator.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCRemoteInitiator.cpp
rename to connectivity/nfc/source/nfc/NFCRemoteInitiator.cpp
diff --git a/features/nfc/source/nfc/NFCTarget.cpp b/connectivity/nfc/source/nfc/NFCTarget.cpp
similarity index 100%
rename from features/nfc/source/nfc/NFCTarget.cpp
rename to connectivity/nfc/source/nfc/NFCTarget.cpp
diff --git a/features/nfc/source/nfc/Type4RemoteInitiator.cpp b/connectivity/nfc/source/nfc/Type4RemoteInitiator.cpp
similarity index 100%
rename from features/nfc/source/nfc/Type4RemoteInitiator.cpp
rename to connectivity/nfc/source/nfc/Type4RemoteInitiator.cpp
diff --git a/features/nfc/source/nfc/ndef/MessageBuilder.cpp b/connectivity/nfc/source/nfc/ndef/MessageBuilder.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/MessageBuilder.cpp
rename to connectivity/nfc/source/nfc/ndef/MessageBuilder.cpp
diff --git a/features/nfc/source/nfc/ndef/MessageParser.cpp b/connectivity/nfc/source/nfc/ndef/MessageParser.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/MessageParser.cpp
rename to connectivity/nfc/source/nfc/ndef/MessageParser.cpp
diff --git a/features/nfc/source/nfc/ndef/RecordParser.cpp b/connectivity/nfc/source/nfc/ndef/RecordParser.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/RecordParser.cpp
rename to connectivity/nfc/source/nfc/ndef/RecordParser.cpp
diff --git a/features/nfc/source/nfc/ndef/common/Mime.cpp b/connectivity/nfc/source/nfc/ndef/common/Mime.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/common/Mime.cpp
rename to connectivity/nfc/source/nfc/ndef/common/Mime.cpp
diff --git a/features/nfc/source/nfc/ndef/common/SimpleMessageParser.cpp b/connectivity/nfc/source/nfc/ndef/common/SimpleMessageParser.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/common/SimpleMessageParser.cpp
rename to connectivity/nfc/source/nfc/ndef/common/SimpleMessageParser.cpp
diff --git a/features/nfc/source/nfc/ndef/common/Text.cpp b/connectivity/nfc/source/nfc/ndef/common/Text.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/common/Text.cpp
rename to connectivity/nfc/source/nfc/ndef/common/Text.cpp
diff --git a/features/nfc/source/nfc/ndef/common/URI.cpp b/connectivity/nfc/source/nfc/ndef/common/URI.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/common/URI.cpp
rename to connectivity/nfc/source/nfc/ndef/common/URI.cpp
diff --git a/features/nfc/source/nfc/ndef/common/util.cpp b/connectivity/nfc/source/nfc/ndef/common/util.cpp
similarity index 100%
rename from features/nfc/source/nfc/ndef/common/util.cpp
rename to connectivity/nfc/source/nfc/ndef/common/util.cpp
diff --git a/features/nfc/stack/ndef/ndef.c b/connectivity/nfc/stack/ndef/ndef.c
similarity index 100%
rename from features/nfc/stack/ndef/ndef.c
rename to connectivity/nfc/stack/ndef/ndef.c
diff --git a/features/nfc/stack/ndef/ndef.h b/connectivity/nfc/stack/ndef/ndef.h
similarity index 100%
rename from features/nfc/stack/ndef/ndef.h
rename to connectivity/nfc/stack/ndef/ndef.h
diff --git a/features/nfc/stack/nfc_common.h b/connectivity/nfc/stack/nfc_common.h
similarity index 100%
rename from features/nfc/stack/nfc_common.h
rename to connectivity/nfc/stack/nfc_common.h
diff --git a/features/nfc/stack/nfc_errors.h b/connectivity/nfc/stack/nfc_errors.h
similarity index 100%
rename from features/nfc/stack/nfc_errors.h
rename to connectivity/nfc/stack/nfc_errors.h
diff --git a/features/nfc/stack/platform/nfc_debug.h b/connectivity/nfc/stack/platform/nfc_debug.h
similarity index 100%
rename from features/nfc/stack/platform/nfc_debug.h
rename to connectivity/nfc/stack/platform/nfc_debug.h
diff --git a/features/nfc/stack/platform/nfc_scheduler.c b/connectivity/nfc/stack/platform/nfc_scheduler.c
similarity index 100%
rename from features/nfc/stack/platform/nfc_scheduler.c
rename to connectivity/nfc/stack/platform/nfc_scheduler.c
diff --git a/features/nfc/stack/platform/nfc_scheduler.h b/connectivity/nfc/stack/platform/nfc_scheduler.h
similarity index 100%
rename from features/nfc/stack/platform/nfc_scheduler.h
rename to connectivity/nfc/stack/platform/nfc_scheduler.h
diff --git a/features/nfc/stack/platform/nfc_transport.c b/connectivity/nfc/stack/platform/nfc_transport.c
similarity index 100%
rename from features/nfc/stack/platform/nfc_transport.c
rename to connectivity/nfc/stack/platform/nfc_transport.c
diff --git a/features/nfc/stack/platform/nfc_transport.h b/connectivity/nfc/stack/platform/nfc_transport.h
similarity index 100%
rename from features/nfc/stack/platform/nfc_transport.h
rename to connectivity/nfc/stack/platform/nfc_transport.h
diff --git a/features/nfc/stack/tech/iso7816/iso7816.c b/connectivity/nfc/stack/tech/iso7816/iso7816.c
similarity index 100%
rename from features/nfc/stack/tech/iso7816/iso7816.c
rename to connectivity/nfc/stack/tech/iso7816/iso7816.c
diff --git a/features/nfc/stack/tech/iso7816/iso7816.h b/connectivity/nfc/stack/tech/iso7816/iso7816.h
similarity index 100%
rename from features/nfc/stack/tech/iso7816/iso7816.h
rename to connectivity/nfc/stack/tech/iso7816/iso7816.h
diff --git a/features/nfc/stack/tech/iso7816/iso7816_app.c b/connectivity/nfc/stack/tech/iso7816/iso7816_app.c
similarity index 100%
rename from features/nfc/stack/tech/iso7816/iso7816_app.c
rename to connectivity/nfc/stack/tech/iso7816/iso7816_app.c
diff --git a/features/nfc/stack/tech/iso7816/iso7816_app.h b/connectivity/nfc/stack/tech/iso7816/iso7816_app.h
similarity index 100%
rename from features/nfc/stack/tech/iso7816/iso7816_app.h
rename to connectivity/nfc/stack/tech/iso7816/iso7816_app.h
diff --git a/features/nfc/stack/tech/iso7816/iso7816_defs.h b/connectivity/nfc/stack/tech/iso7816/iso7816_defs.h
similarity index 100%
rename from features/nfc/stack/tech/iso7816/iso7816_defs.h
rename to connectivity/nfc/stack/tech/iso7816/iso7816_defs.h
diff --git a/features/nfc/stack/tech/isodep/isodep.h b/connectivity/nfc/stack/tech/isodep/isodep.h
similarity index 100%
rename from features/nfc/stack/tech/isodep/isodep.h
rename to connectivity/nfc/stack/tech/isodep/isodep.h
diff --git a/features/nfc/stack/tech/isodep/isodep_target.c b/connectivity/nfc/stack/tech/isodep/isodep_target.c
similarity index 100%
rename from features/nfc/stack/tech/isodep/isodep_target.c
rename to connectivity/nfc/stack/tech/isodep/isodep_target.c
diff --git a/features/nfc/stack/tech/isodep/isodep_target.h b/connectivity/nfc/stack/tech/isodep/isodep_target.h
similarity index 100%
rename from features/nfc/stack/tech/isodep/isodep_target.h
rename to connectivity/nfc/stack/tech/isodep/isodep_target.h
diff --git a/features/nfc/stack/tech/type4/type4_target.c b/connectivity/nfc/stack/tech/type4/type4_target.c
similarity index 100%
rename from features/nfc/stack/tech/type4/type4_target.c
rename to connectivity/nfc/stack/tech/type4/type4_target.c
diff --git a/features/nfc/stack/tech/type4/type4_target.h b/connectivity/nfc/stack/tech/type4/type4_target.h
similarity index 100%
rename from features/nfc/stack/tech/type4/type4_target.h
rename to connectivity/nfc/stack/tech/type4/type4_target.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512.c b/connectivity/nfc/stack/transceiver/pn512/pn512.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512.h b/connectivity/nfc/stack/transceiver/pn512/pn512.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_callback.h b/connectivity/nfc/stack/transceiver/pn512/pn512_callback.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_callback.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_callback.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_cmd.c b/connectivity/nfc/stack/transceiver/pn512/pn512_cmd.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_cmd.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_cmd.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_cmd.h b/connectivity/nfc/stack/transceiver/pn512/pn512_cmd.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_cmd.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_cmd.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_hw.c b/connectivity/nfc/stack/transceiver/pn512/pn512_hw.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_hw.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_hw.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_hw.h b/connectivity/nfc/stack/transceiver/pn512/pn512_hw.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_hw.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_hw.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_internal.h b/connectivity/nfc/stack/transceiver/pn512/pn512_internal.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_internal.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_internal.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_irq.c b/connectivity/nfc/stack/transceiver/pn512/pn512_irq.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_irq.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_irq.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_irq.h b/connectivity/nfc/stack/transceiver/pn512/pn512_irq.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_irq.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_irq.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_poll.c b/connectivity/nfc/stack/transceiver/pn512/pn512_poll.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_poll.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_poll.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_poll.h b/connectivity/nfc/stack/transceiver/pn512/pn512_poll.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_poll.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_poll.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_registers.c b/connectivity/nfc/stack/transceiver/pn512/pn512_registers.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_registers.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_registers.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_registers.h b/connectivity/nfc/stack/transceiver/pn512/pn512_registers.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_registers.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_registers.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_rf.c b/connectivity/nfc/stack/transceiver/pn512/pn512_rf.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_rf.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_rf.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_rf.h b/connectivity/nfc/stack/transceiver/pn512/pn512_rf.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_rf.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_rf.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_timer.c b/connectivity/nfc/stack/transceiver/pn512/pn512_timer.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_timer.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_timer.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_timer.h b/connectivity/nfc/stack/transceiver/pn512/pn512_timer.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_timer.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_timer.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_transceive.c b/connectivity/nfc/stack/transceiver/pn512/pn512_transceive.c
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_transceive.c
rename to connectivity/nfc/stack/transceiver/pn512/pn512_transceive.c
diff --git a/features/nfc/stack/transceiver/pn512/pn512_transceive.h b/connectivity/nfc/stack/transceiver/pn512/pn512_transceive.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_transceive.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_transceive.h
diff --git a/features/nfc/stack/transceiver/pn512/pn512_types.h b/connectivity/nfc/stack/transceiver/pn512/pn512_types.h
similarity index 100%
rename from features/nfc/stack/transceiver/pn512/pn512_types.h
rename to connectivity/nfc/stack/transceiver/pn512/pn512_types.h
diff --git a/features/nfc/stack/transceiver/protocols.h b/connectivity/nfc/stack/transceiver/protocols.h
similarity index 100%
rename from features/nfc/stack/transceiver/protocols.h
rename to connectivity/nfc/stack/transceiver/protocols.h
diff --git a/features/nfc/stack/transceiver/transceiver.c b/connectivity/nfc/stack/transceiver/transceiver.c
similarity index 100%
rename from features/nfc/stack/transceiver/transceiver.c
rename to connectivity/nfc/stack/transceiver/transceiver.c
diff --git a/features/nfc/stack/transceiver/transceiver.h b/connectivity/nfc/stack/transceiver/transceiver.h
similarity index 100%
rename from features/nfc/stack/transceiver/transceiver.h
rename to connectivity/nfc/stack/transceiver/transceiver.h
diff --git a/features/nfc/stack/transceiver/transceiver_internal.h b/connectivity/nfc/stack/transceiver/transceiver_internal.h
similarity index 100%
rename from features/nfc/stack/transceiver/transceiver_internal.h
rename to connectivity/nfc/stack/transceiver/transceiver_internal.h