Restructuring plugin config hierarchy

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java

@@ -32,12 +32,13 @@ import java.io.File;
 public class MobileDeviceConfigurationManager {
 
 	private static final String MOBILE_DEVICE_CONFIG_XML_NAME = "mobile-config.xml";
+    private static final String MOBILE_DEVICE_PLUGIN_DIRECTORY = "mobile";
 	private MobileDeviceManagementConfig currentMobileDeviceConfig;
 	private static MobileDeviceConfigurationManager mobileDeviceConfigManager;
 
 	private final String mobileDeviceMgtConfigXMLPath =
-			CarbonUtils.getCarbonConfigDirPath() + File.separator +
+			CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + "device-mgt-plugin-configs" + File.separator +
-			MOBILE_DEVICE_CONFIG_XML_NAME;
+                    MOBILE_DEVICE_PLUGIN_DIRECTORY + File.separator + MOBILE_DEVICE_CONFIG_XML_NAME;
 
 	public static MobileDeviceConfigurationManager getInstance() {
 		if (mobileDeviceConfigManager == null) {

product/modules/distribution/src/assembly/bin.xml

@@ -369,7 +369,7 @@
         <file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>