diff --git a/noncore/_utils/rfcx-guardian/router-ping.js b/noncore/_utils/rfcx-guardian/router-ping.js
index 9ab28e6dc..7da7ce85b 100644
--- a/noncore/_utils/rfcx-guardian/router-ping.js
+++ b/noncore/_utils/rfcx-guardian/router-ping.js
@@ -3,7 +3,7 @@ const checkInDatabase = require('../rfcx-mqtt/mqtt-database').checkInDatabase
 const mqttInstructions = require('../rfcx-mqtt/mqtt-instructions').mqttInstructions
 const guardianCommand = require('../rfcx-guardian/guardian-command-publish').guardianCommand
 const iotdaProcess = require('../rfcx-mqtt/mqtt-iotda-data-process')
-const iotdaApp = require('../../../mqtt/iotda')
+const iotdaApp = require('../../iotda')
 const { expandAbbreviatedFieldNames } = require('../rfcx-mqtt/expand-abbreviated')
 
 function onMessagePing (pingObj, messageId) {
diff --git a/noncore/_utils/rfcx-mqtt/mqtt-iotda-data-process.js b/noncore/_utils/rfcx-mqtt/mqtt-iotda-data-process.js
index 6ca70e5a6..d86ba5972 100644
--- a/noncore/_utils/rfcx-mqtt/mqtt-iotda-data-process.js
+++ b/noncore/_utils/rfcx-mqtt/mqtt-iotda-data-process.js
@@ -1,5 +1,5 @@
 const crypto = require('crypto')
-const iotdaApp = require('../../../mqtt/iotda')
+const iotdaApp = require('../../iotda')
 const moment = require('moment')
 
 function parse (pingObj) {
diff --git a/mqtt/iotda/index.js b/noncore/iotda/index.js
similarity index 100%
rename from mqtt/iotda/index.js
rename to noncore/iotda/index.js