diff --git a/connectivity/drivers/nfc/PN512/include/PN512Driver.h b/connectivity/drivers/nfc/PN512/include/nfc/controllers/PN512Driver.h
similarity index 100%
rename from connectivity/drivers/nfc/PN512/include/PN512Driver.h
rename to connectivity/drivers/nfc/PN512/include/nfc/controllers/PN512Driver.h
diff --git a/connectivity/drivers/nfc/PN512/include/PN512SPITransportDriver.h b/connectivity/drivers/nfc/PN512/include/nfc/controllers/PN512SPITransportDriver.h
similarity index 100%
rename from connectivity/drivers/nfc/PN512/include/PN512SPITransportDriver.h
rename to connectivity/drivers/nfc/PN512/include/nfc/controllers/PN512SPITransportDriver.h
diff --git a/connectivity/drivers/nfc/PN512/include/PN512TransportDriver.h b/connectivity/drivers/nfc/PN512/include/nfc/controllers/PN512TransportDriver.h
similarity index 100%
rename from connectivity/drivers/nfc/PN512/include/PN512TransportDriver.h
rename to connectivity/drivers/nfc/PN512/include/nfc/controllers/PN512TransportDriver.h