diff --git a/api-test/testNgXmlFiles/masterdataApi.xml b/api-test/testNgXmlFiles/masterdataApi.xml
index c29082859c8..7d29851eb17 100644
--- a/api-test/testNgXmlFiles/masterdataApi.xml
+++ b/api-test/testNgXmlFiles/masterdataApi.xml
@@ -12,7 +12,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/BulkUpload/BulkUpload.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithFormDataAndFile" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PostWithFormDataAndFile" />
 		</classes>
 	</test>
 	
@@ -20,7 +20,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/GetAllTxnDetailBulkUpload/allTxnDetails.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithQueryParam" />
 		</classes>
 	</test>
 
@@ -28,7 +28,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/GetApplicationConfigs/getApplicationConfigs.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithQueryParam" />
 		</classes>
 	</test>
 	
@@ -38,70 +38,70 @@
 		<parameter name="ymlFile"
 			value="masterdata/BlockListedWords/CreateBlockListedWords.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateBlockListedWordStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateBlockListedWordStatus/UpdateBlockListedWordStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="UpdateBlockListedWords">
 		<parameter name="ymlFile"
 			value="masterdata/BlockListedWords/UpdateBlockListedWords.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateBlockListedWordDetails">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateBlockListedWordDetails/UpdateBlockListedWordDetails.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FetchAllBlockListedWord">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllBlockListedWord/FetchAllBlockListedWord.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchBlockListedWordByLangcode">
 		<parameter name="ymlFile"
 			value="masterdata/FetchBlockListedWordByLangcode/FetchBlockListedWordByLangcode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="SearchBlockListedWords">
 		<parameter name="ymlFile"
 			value="masterdata/SearchBlockListedWords/SearchBlockListedWords.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FilterBlockListedWords">
 		<parameter name="ymlFile"
 			value="masterdata/FilterBlockListedWords/FilterBlockListedWords.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="DeleteBlockListedWords">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteBlockListedWords/DeleteBlockListedWords.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="BlockListedWordValidation">
 		<parameter name="ymlFile"
 			value="masterdata/BlockListedWordValidation/BlockListedWordValidation.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 
@@ -110,42 +110,42 @@
 		<parameter name="ymlFile"
 			value="masterdata/DeviceType/CreateDeviceType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateDeviceType">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceType/UpdateDeviceType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateDeviceTypeStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateDeviceTypeStatus/UpdateDeviceTypeStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="FetchAllDeviceType">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllDeviceType/FetchAllDeviceTypes.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="DeviceTypeFilter">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceTypeFilter/DeviceTypeFilter.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="DeviceTypeSearch">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceTypeSearch/DeviceTypeSearch.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	
@@ -154,48 +154,48 @@
 			value="masterdata/DeviceSpecification/CreateDeviceSpecification.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateDeviceSpecStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateDeviceSpecStatus/UpdateDeviceSpecStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="UpdateDeviceSpecification">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceSpecification/UpdateDeviceSpecification.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FetchDeviceSpec">
 		<parameter name="ymlFile"
 			value="masterdata/FetchDeviceSpec/FetchDeviceSpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllDeviceSpec"> 
 		<parameter name="ymlFile" value="masterdata/FetchAllDeviceSpec/FetchAllDeviceSpec.yml" /> 
 		<classes> 
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" /> 
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" /> 
 		</classes> 
 	</test>
 	<test name="DeviceSpecFilter">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceSpecFilter/DeviceSpecFilter.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="DeviceSpecSearch">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceSpecSearch/DeviceSpecSearch.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	
@@ -205,48 +205,48 @@
 			value="masterdata/Device/CreateDevice.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateDevice">
 		<parameter name="ymlFile"
 			value="masterdata/Device/UpdateDevice.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateDeviceStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateDeviceStatus/UpdateDeviceStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithQueryParam" />
 		</classes>
 	</test>
 	<test name="FetchDevice">
 		<parameter name="ymlFile"
 			value="masterdata/FetchDevice/FetchDevice.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetDeviceHistory">
 		<parameter name="ymlFile" value="masterdata/GetDeviceHistory/GetDeviceHistory.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="DeviceFilter">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceFilter/DeviceFilter.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="DeviceSearch">
 		<parameter name="ymlFile"
 			value="masterdata/DeviceSearch/DeviceSearch.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	
@@ -254,21 +254,21 @@
 		<parameter name="ymlFile"
 			value="masterdata/DeleteDevice/deleteDevice.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="DecommisionDevice">
 		<parameter name="ymlFile"
 			value="masterdata/DecommisionDevice/decommisionDevice.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PutWithPathParam" />
 		</classes>
 	</test>
 	<test name="DeleteDeviceSpec">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteDeviceSpec/deleteDeviceSpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 
@@ -276,49 +276,49 @@
 		<parameter name="ymlFile"
 			value="masterdata/DocumentCategory/CreateDocumentCategory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateDocumentCategory">
 		<parameter name="ymlFile"
 			value="masterdata/DocumentCategory/UpdateDocumentCategory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FetchDocumentCategories">
 		<parameter name="ymlFile"
 			value="masterdata/FetchDocumentCategories/FetchDocumentCategories.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllDocumentCategories">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllDocumentCategories/FetchAllDocumentCategories.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FilterDocCategory">
 		<parameter name="ymlFile"
 			value="masterdata/FilterDocCategory/FilterDocCategory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="SearchDocCategories">
 		<parameter name="ymlFile"
 			value="masterdata/SearchDocCategories/SearchDocCategories.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="DeleteDocumentCategory">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteDocumentCategory/deleteDocumentCategory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 
@@ -327,14 +327,14 @@
 		<parameter name="ymlFile"
 			value="masterdata/DocumentType/CreateDocumentType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateDocumentType">
 		<parameter name="ymlFile"
 			value="masterdata/DocumentType/UpdateDocumentType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	
@@ -342,7 +342,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/UpdateDocType/UpdateDocType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithQueryParam" />
 		</classes>
 	</test> 
 	
@@ -350,35 +350,35 @@
 		<parameter name="ymlFile"
 			value="masterdata/FetchDocumentTypes/FetchDocumentTypes.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllDocumentTypes">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllDocumentTypes/FetchAllDocumentTypes.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FilterDocumentType">
 		<parameter name="ymlFile"
 			value="masterdata/FilterDocumentType/FilterDocumentType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="SearchDocumentType">
 		<parameter name="ymlFile"
 			value="masterdata/SearchDocumentType/SearchDocumentType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="DeleteDocumentType">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteDocumentType/deleteDocumentType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 
@@ -387,56 +387,56 @@
 			value="masterdata/RegCenterType/CreateRegCenterType.yml" />
 		<parameter name="idKeyName" value="code" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateRegCenterTypeStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateRegCenterTypeStatus/UpdateRegCenterTypeStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="SearchRegCenterType">
 		<parameter name="ymlFile"
 			value="masterdata/SearchRegCenterType/SearchRegCenterType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateRegCenterType">
 		<parameter name="ymlFile"
 			value="masterdata/RegCenterType/UpdateRegCenterType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FilterRegCenterType">
 		<parameter name="ymlFile"
 			value="masterdata/FilterRegCenterType/FilterRegCenterType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchAllRegCenterType">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllRegCenterType/FetchAllRegCenterType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchMissingRegCenterTypeDetails">
 		<parameter name="ymlFile"
 			value="masterdata/FetchMissingRegCenterTypeDetails/FetchMissingRegCenterTypeDetails.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="DeleteRegCenterType">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteRegCenterType/DeleteRegCenterType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 
@@ -445,7 +445,7 @@
 			value="masterdata/LocationController/CreateLocationData.yml" />
 			<parameter name="idKeyName"	value="hierarchyLevel,name,code" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	
@@ -453,7 +453,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/UpdateLocationStatus/UpdateLocationStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	
@@ -462,21 +462,21 @@
 			value="masterdata/RegistrationCenter/CreateRegistrationCenter.yml" />
 		<parameter name="idKeyName" value="id,zoneCode" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateRegCentStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateRegCentStatus/UpdateRegCentStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="FetchRegCent">
 		<parameter name="ymlFile"
 			value="masterdata/FetchRegCent/FetchRegCent.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 		
@@ -484,55 +484,55 @@
 		<parameter name="ymlFile"
 			value="masterdata/LocationController/UpdateLocationData.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateRegistrationCenter">
 		<parameter name="ymlFile"
 			value="masterdata/RegistrationCenter/UpdateRegistrationCenter.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FetchAllRegCent">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllRegCent/FetchAllRegCent.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchRegCentHistory">
 		<parameter name="ymlFile" value="masterdata/FetchRegCentHistory/FetchRegCentHistory.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="RegCenterFilter">
 		<parameter name="ymlFile"
 			value="masterdata/RegCenterFilter/RegCenterFilter.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateRegistrationCenterLang">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateRegistrationCenterLang/UpdateRegistrationCenterLang.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateRegistrationCenterNonLanguage">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateRegistrationCenterNonLanguage/UpdateRegistrationCenterNonLanguage.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FetchMissingRegCenterDetails">
 		<parameter name="ymlFile"
 			value="masterdata/FetchMissingRegCenterDetails/FetchMissingRegCenterDetails.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -541,21 +541,21 @@
 			value="masterdata/ZoneUser/CreateZoneUser.yml" />
 		<parameter name="idKeyName" value="userId" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateZoneUser">
 		<parameter name="ymlFile"
 			value="masterdata/ZoneUser/UpdateZoneUser.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateZoneUserStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateZoneUserStatus/UpdateZoneUserStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	
@@ -564,28 +564,28 @@
 			value="masterdata/UserCenterMapping/UserCenterMapping.yml" />
 		<parameter name="idKeyName" value="responsetime" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateUserCenterMappingStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateUserCenterMappingStatus/UpdateUserCenterMappingStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>	
 	<test name="UpdateUserCenterMapping">
 		<parameter name="ymlFile"
 			value="masterdata/UserCenterMapping/UpdateUserCenterMapping.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="RegCenterSearch">
 		<parameter name="ymlFile"
 			value="masterdata/RegCenterSearch/RegCenterSearch.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>	
 
@@ -594,42 +594,42 @@
 		<parameter name="ymlFile"
 			value="masterdata/MachineType/CreateMachineType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateMachineTypeStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateMachineTypeStatus/UpdateMachineTypeStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithQueryParam" />
 		</classes>
 	</test>
 	<test name="MachineTypeSearch">
 		<parameter name="ymlFile"
 			value="masterdata/MachineTypeSearch/MachineTypeSearch.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateMachineType">
 		<parameter name="ymlFile"
 			value="masterdata/MachineType/UpdateMachineType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FilterMachineType">
 		<parameter name="ymlFile"
 			value="masterdata/FilterMachineType/FilterMachineType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchAllMachineType">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllMachineType/FetchAllMachineType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="CreateMachineSpecification">
@@ -637,42 +637,42 @@
 			value="masterdata/MachineSpecification/CreateMachineSpecification.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateMachineSpecificationStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateMachineSpecificationStatus/UpdateMachineSpecificationStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithQueryParam" />
 		</classes>
 	</test>
 	<test name="SearchMachineSpec">
 		<parameter name="ymlFile"
 			value="masterdata/SearchMachineSpec/SearchMachineSpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateMachineSpecification">
 		<parameter name="ymlFile"
 			value="masterdata/MachineSpecification/UpdateMachineSpecification.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FilterMachineSpec">
 		<parameter name="ymlFile"
 			value="masterdata/FilterMachineSpec/FilterMachineSpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchAllMachineSpecification">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllMachineSpecification/FetchAllMachineSpecification.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 
@@ -681,21 +681,21 @@
 			value="masterdata/Machine/CreateMachine.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateMachine">
 		<parameter name="ymlFile"
 			value="masterdata/Machine/UpdateMachine.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateMachineStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateMachineStatus/UpdateMachineStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithQueryParam" />
 		</classes>
 	</test>
 	<test name="SearchMachine">
@@ -703,21 +703,21 @@
 			value="masterdata/SearchMachine/SearchMachine.yml" />
 		<parameter name="idKeyName" value="responsetime" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="FilterMachines">
 		<parameter name="ymlFile"
 			value="masterdata/FilterMachines/FilterMachines.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchMachine">
 		<parameter name="ymlFile"
 			value="masterdata/FetchMachine/FetchMachine.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -730,35 +730,35 @@
 			value="masterdata/Holiday/CreateHoliday.yml" />
 		<parameter name="idKeyName" value="holidayId" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="HolidaySearch">
 		<parameter name="ymlFile"
 			value="masterdata/HolidaySearch/HolidaySearch.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateHoliday">
 		<parameter name="ymlFile"
 			value="masterdata/Holiday/UpdateHoliday.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateHolidayStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateHolidayStatus/UpdateHolidayStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="FetchHolidays">
 		<parameter name="ymlFile"
 			value="masterdata/FetchHolidays/FetchHoliday.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -766,14 +766,14 @@
 		<parameter name="ymlFile"
 			value="masterdata/FilterHolidays/FilterHolidays.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="DeleteHoliday">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteHoliday/deleteHoliday.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimpleDelete" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimpleDelete" />
 		</classes>
 	</test>
 	
@@ -781,35 +781,35 @@
 		<parameter name="ymlFile"
 			value="masterdata/FilterLocationData/FilterLocationData.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchLocation">
 		<parameter name="ymlFile"
 			value="masterdata/FetchLocation/FetchLocation.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllLocation">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllLocation/FetchAllLocation.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchMissingLocation">
 		<parameter name="ymlFile"
 			value="masterdata/FetchMissingLocation/FetchMissingLocation.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>	
 	<test name="CreateTemplateType">
 		<parameter name="ymlFile"
 			value="masterdata/TemplateType/CreateTemplateType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	
@@ -818,35 +818,35 @@
 			value="masterdata/TemplateFileFormat/CreateTemplateFileFormat.yml" />
 		<parameter name="idKeyName" value="code" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateTemplateFileFormatStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateTemplateFileFormatStatus/UpdateTemplateFileFormatStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="UpdateTemplateFileFormat">
 		<parameter name="ymlFile"
 			value="masterdata/TemplateFileFormat/UpdateTemplateFileFormat.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="DeleteTemplateFileFormat">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteTemplateFileFormat/DeleteTemplateFileFormat.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="GetTemplateFileFormat">
 		<parameter name="ymlFile"
 			value="masterdata/GetTemplateFileFormat/GetTemplateFileFormat.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="CreateTemplate">
@@ -854,42 +854,42 @@
 			value="masterdata/Template/CreateTemplate.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="SearchTemplateDetails">
 		<parameter name="ymlFile"
 			value="masterdata/SearchTemplateDetails/SearchTemplateDetails.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FilterTemplateDetails">
 		<parameter name="ymlFile"
 			value="masterdata/FilterTemplateDetails/FilterTemplateDetails.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UpdateTemplateStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateTemplateStatus/UpdateTemplateStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithQueryParam" />
 		</classes>
 	</test>
 	<test name="UpdateTemplate">
 		<parameter name="ymlFile"
 			value="masterdata/Template/UpdateTemplate.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="FetchTemplate">
 		<parameter name="ymlFile"
 			value="masterdata/FetchTemplate/FetchTemplate.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -897,14 +897,14 @@
 		<parameter name="ymlFile"
 			value="masterdata/DeleteTemplate/DeleteTemplate.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllUserDetails">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllUserDetails/FetchAllUserDetails.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -912,21 +912,21 @@
 		<parameter name="ymlFile"
 			value="masterdata/FetchValidDocuments/FetchValidDocuments.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllValidDocuments">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllValidDocuments/FetchAllValidDocuments.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="DeleteValidDocument">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteValidDocument/DeleteValidDocument.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	
@@ -934,7 +934,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/UpdateUISpec/UpdateUISpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	
@@ -942,7 +942,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/UpdateIdSchema/UpdateIdSchema.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test> -->
 	
@@ -950,7 +950,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/GetPossiableValues/GetPossiableValues.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 
@@ -958,7 +958,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/GetPacketRejectionReason/GetPacketRejectionReason.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 
@@ -966,7 +966,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/PacketRejectionReasonCategory/PacketRejectionReasonCategory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 
@@ -974,7 +974,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/PacketRejectionReasonList/PacketRejectionReasonList.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 
@@ -982,70 +982,70 @@
 		<parameter name="ymlFile"
 			value="masterdata/GetModuleByLangCode/GetModuleByLangCode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetModuleByIdLangCode">
 		<parameter name="ymlFile"
 			value="masterdata/GetModuleByIdLangCode/GetModuleByIdLangCode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetMachineHistory">
 		<parameter name="ymlFile"
 			value="masterdata/GetMachineHistory/GetMachineHistory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetMachines">
 		<parameter name="ymlFile"
 			value="masterdata/GetMachines/GetMachines.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetLocationHierarchyByHierarchyName">
 		<parameter name="ymlFile"
 			value="masterdata/GetLocationHierarchyByHierarchyName/GetLocationHierarchyByHierarchyName.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetimmediateChildrenByLocationCode">
 		<parameter name="ymlFile"
 			value="masterdata/GetimmediateChildrenByLocationCode/GetimmediateChildrenByLocationCode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetLocations">
 		<parameter name="ymlFile"
 			value="masterdata/GetLocations/GetLocations.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetLocationHierarchyLevelByLastUpdatedDate">
 		<parameter name="ymlFile"
 			value="masterdata/GetLocationHierarchyLevelByLastUpdatedDate/GetLocationHierarchyLevelByLastUpdatedDate.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetLanguage">
 		<parameter name="ymlFile"
 			value="masterdata/GetLanguage/GetLanguage.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetMappedMachinesByRegCentID">
 		<parameter name="ymlFile"
 			value="masterdata/GetMappedMachinesByRegCentID/GetMappedMachinesByRegCentID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<!--Commenting for MOSIP-33731-->
@@ -1053,56 +1053,56 @@
 		<parameter name="ymlFile"
 			value="masterdata/GetIdTypeByLangCode/GetIdTypeByLangCode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>-->
 	<test name="GetHolidaysMissingIds">
 		<parameter name="ymlFile"
 			value="masterdata/GetHolidaysMissingIds/GetHolidaysMissingIds.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetRegistrationMachineUserMappingHistory">
 		<parameter name="ymlFile"
 			value="masterdata/GetRegistrationMachineUserMappingHistory/GetRegistrationMachineUserMappingHistory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetBiometricAttributesByAuthType">
 		<parameter name="ymlFile"
 			value="masterdata/GetBiometricAttributesByAuthType/GetBiometricAttributesByAuthType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="BiometricAttributes">
 		<parameter name="ymlFile"
 			value="masterdata/BiometricAttributes/BiometricAttributes.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="GetExceptionalHolidays">
 		<parameter name="ymlFile"
 			value="masterdata/GetExceptionalHolidays/GetExceptionalHolidays.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetDocumentTypeByLangCode">
 		<parameter name="ymlFile"
 			value="masterdata/GetDocumentTypeByLangCode/GetDocumentTypeByLangCode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="GetMissingDocumentTypeByLangcode">
 		<parameter name="ymlFile"
 			value="masterdata/GetMissingDocumentTypeByLangcode/GetMissingDocumentTypeByLangcode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	
@@ -1110,56 +1110,56 @@
 		<parameter name="ymlFile"
 			value="masterdata/UpdateDocCategory/UpdateDocCategory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithQueryParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithQueryParam" />
 		</classes>
 	</test> 
 	<test name="GetDocCategory">
 		<parameter name="ymlFile"
 			value="masterdata/GetDocCategory/GetDocCategory.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="GetDocCategoryByLangCode">
 		<parameter name="ymlFile"
 			value="masterdata/GetDocCategoryByLangCode/GetDocCategoryByLangCode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="GetMissingDocumentCategoryByLangcode">
 		<parameter name="ymlFile"
 			value="masterdata/GetMissingDocumentCategoryByLangcode/GetMissingDocumentCategoryByLangcode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="CreateBiometricType">
 		<parameter name="ymlFile"
 			value="masterdata/CreateBiometricType/CreateBiometricType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="GetBiometricTypes">
 		<parameter name="ymlFile"
 			value="masterdata/GetBiometricTypes/GetBiometricTypes.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetBiometricTypesByLangcode">
 		<parameter name="ymlFile"
 			value="masterdata/GetBiometricTypesByLangcode/GetBiometricTypesByLangcode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetBiometricTypeByCodeAndLangcode">
 		<parameter name="ymlFile"
 			value="masterdata/GetBiometricTypeByCodeAndLangcode/GetBiometricTypeByCodeAndLangcode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>  
 <!--Commenting for MOSIP-33731-->	
@@ -1167,49 +1167,49 @@
 		<parameter name="ymlFile"
 			value="masterdata/CreateIdType/CreateIdType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>-->
 	<test name="FetchValidDocumentsByDocCategoryCode">
 		<parameter name="ymlFile"
 			value="masterdata/FetchValidDocumentsByDocCategoryCode/FetchValidDocumentsByDocCategoryCode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="CreateValidDocument">
 		<parameter name="ymlFile"
 			value="masterdata/ValidDocument/CreateValidDocument.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchAllTitle">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllTitle/FetchAllTitle.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="ValidDocumentSearch">
 		<parameter name="ymlFile"
 			value="masterdata/ValidDocumentSearch/ValidDocumentSearch.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="ValidDocumentFilter">
 		<parameter name="ymlFile"
 			value="masterdata/ValidDocumentFilter/ValidDocumentFilter.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test> 
 	
 	<test name="GetDocType_DocCatByAppID">
 		<parameter name="ymlFile" value="masterdata/GetDocType_DocCatByAppID/GetDocType_DocCatByAppID.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="CreateDynamicField">
@@ -1217,7 +1217,7 @@
 			value="masterdata/DynamicField/CreateDynamicField.yml" />
 		<parameter name="idKeyName" value="id" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UpdateDynamicField">
@@ -1225,97 +1225,97 @@
 			value="masterdata/DynamicField/UpdateDynamicField.yml" />
 			<parameter name="pathParams"	value="id" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PutWithPathParamsAndBody" />
 		</classes>
 	</test>
 	<test name="UpdateDynamicFieldStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateDynamicFieldStatus/UpdateDynamicFieldStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	<test name="FetchDynamicField">
 		<parameter name="ymlFile"
 			value="masterdata/FetchDynamicField/FetchDynamicField.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchDistinctDynamicField">
 		<parameter name="ymlFile"
 			value="masterdata/FetchDistinctDynamicField/FetchDistinctDynamicField.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchDistinctDynamicFieldByLangcode">
 		<parameter name="ymlFile"
 			value="masterdata/FetchDistinctDynamicFieldByLangcode/FetchDistinctDynamicFieldByLangcode.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="DeleteDynamicField">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteDynamicField/DeleteDynamicField.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="SearchDynamicField">
 		<parameter name="ymlFile"
 			value="masterdata/SearchDynamicField/SearchDynamicField.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FilterDynamicField">
 		<parameter name="ymlFile"
 			value="masterdata/FilterDynamicField/FilterDynamicField.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchMissingDynamicField">
 		<parameter name="ymlFile"
 			value="masterdata/FetchMissingDynamicField/FetchMissingDynamicField.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchWorkingDays">
 		<parameter name="ymlFile"
 			value="masterdata/FetchWorkingDays/FetchWorkingDays.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="UpdateWorkingDay">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateWorkingDay/UpdateWorkingDay.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePut" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePut" />
 		</classes>
 	</test>
 	<test name="UpdateWorkingDayStatus">
 		<parameter name="ymlFile"
 			value="masterdata/UpdateWorkingDayStatus/UpdateWorkingDayStatus.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PatchWithPathParam" />
 		</classes>
 	</test>
 	
 	<test name="GetUserDetails">
 		<parameter name="ymlFile" value="masterdata/GetUserDetails/GetUserDetails.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetUserDetailsByIdAndEffDate">
 		<parameter name="ymlFile" value="masterdata/GetUserDetailsByIdAndEffDate/GetUserDetailsByIdAndEffDate.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -1323,7 +1323,7 @@
 		<parameter name="ymlFile"
 			value="masterdata/SearchUserCenterMapping/SearchUserCenterMapping.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	
@@ -1331,134 +1331,134 @@
 		<parameter name="ymlFile"
 			value="masterdata/DecommisionMachine/DecommisionMachine.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PutWithPathParam" />
 		</classes>
 	</test>
 	<test name="DeleteMachine">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteMachine/DeleteMachine.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="DeleteMachineSpec">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteMachineSpec/DeleteMachineSpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="DeleteUserCenterMapping">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteUserCenterMapping/DeleteUserCenterMapping.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="DeleteZoneUser">
 		<parameter name="ymlFile"
 			value="masterdata/DeleteZoneUser/DeleteZoneUser.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	<test name="DecommissionRegCenter"> 
 		<parameter name="ymlFile" value="masterdata/DecommissionRegCenter/DecommissionRegCenter.yml" /> 
 		<classes> 
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam"/> 
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.PutWithPathParam"/> 
 		</classes> 
 	</test>
 	<test name="DeleteRegCenter"> 
 		<parameter name="ymlFile" value="masterdata/DeleteRegCenter/DeleteRegCenter.yml" /> 
 		<classes> 
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" /> 
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" /> 
 		</classes> 
 	</test>
 	<test name="DeleteLocationData"> 
 		<parameter name="ymlFile" value="masterdata/DeleteLocationData/DeleteLocationData.yml" /> 
 		<classes> 
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" /> 
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.DeleteWithParam" /> 
 		</classes> 
 	</test>
 	<test name="GetApplicantType">
 		<parameter name="ymlFile" value="masterdata/GetApplicantType/GetApplicantType.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="SearchPacketWorkflow">
 		<parameter name="ymlFile" value="masterdata/SearchPacketWorkflow/SearchPacket.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="ResumePacketWorkflow">
 		<parameter name="ymlFile" value="masterdata/ResumePacketWorkflow/ResumePacket.yml"/>  
 		<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+		<class name="io.mosip.testrig.apirig.masterdata.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="FetchTemplateType">
 		<parameter name="ymlFile"
 			value="masterdata/FetchTemplateType/FetchTemplateType.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllTemplates">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllTemplates/FetchAllTemplates.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchMissingTemplates">
 		<parameter name="ymlFile"
 			value="masterdata/FetchMissingTemplates/FetchMissingTemplates.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchUISpec">
 		<parameter name="ymlFile"
 			value="masterdata/FetchUISpec/FetchUISpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllUISpec">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllUISpec/FetchAllUISpec.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAllIdschema">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAllIdschema/FetchAllIdschema.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchIdSchema">
 		<parameter name="ymlFile"
 			value="masterdata/FetchIdSchema/FetchIdSchema.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchModule">
 		<parameter name="ymlFile"
 			value="masterdata/FetchModule/FetchModule.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="FetchAppConfig">
 		<parameter name="ymlFile"
 			value="masterdata/FetchAppConfig/FetchAppConfig.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.masterdata.testscripts.GetWithParam" />
 		</classes>
 	</test>
 </suite>
\ No newline at end of file