diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testrunner/MosipTestRunner.java
similarity index 96%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testrunner/MosipTestRunner.java
index 8547c863..87ffbde8 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testrunner/MosipTestRunner.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testrunner;
+package io.mosip.testrig.apirig.injicertify.testrunner;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,12 +25,16 @@
 
 import io.mosip.testrig.apirig.dataprovider.BiometricDataProvider;
 import io.mosip.testrig.apirig.dbaccess.DBManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
 import io.mosip.testrig.apirig.report.EmailableReport;
+import io.mosip.testrig.apirig.testrunner.BaseTestCase;
+import io.mosip.testrig.apirig.testrunner.ExtractResource;
+import io.mosip.testrig.apirig.testrunner.HealthChecker;
+import io.mosip.testrig.apirig.testrunner.OTPListener;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthTestsUtil;
 import io.mosip.testrig.apirig.utils.CertsUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
 import io.mosip.testrig.apirig.utils.JWKKeyUtil;
 import io.mosip.testrig.apirig.utils.KeyCloakUserAndAPIKeyGeneration;
 import io.mosip.testrig.apirig.utils.KeycloakUserManager;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/AddIdentity.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/AddIdentity.java
similarity index 97%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/AddIdentity.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/AddIdentity.java
index ff1fad7f..9a202a64 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/AddIdentity.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/AddIdentity.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
@@ -26,14 +26,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.KernelAuthentication;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithAutogenIdWithOtpGenerate.java
similarity index 98%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithAutogenIdWithOtpGenerate.java
index 95971f12..2a247b6b 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithAutogenIdWithOtpGenerate.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -22,14 +22,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyAndQueryParamsForAutoGenId.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithBodyAndQueryParamsForAutoGenId.java
similarity index 97%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyAndQueryParamsForAutoGenId.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithBodyAndQueryParamsForAutoGenId.java
index 02df472c..4a7efe5d 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyAndQueryParamsForAutoGenId.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithBodyAndQueryParamsForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -22,6 +22,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
@@ -29,8 +31,6 @@
 import io.mosip.testrig.apirig.utils.AuthUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerTypes;
 import io.mosip.testrig.apirig.utils.ReportUtil;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithOnlyPathParam.java
similarity index 96%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithOnlyPathParam.java
index d8d60aa9..30d4ae84 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PostWithOnlyPathParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PutWithPathParamsAndBody.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PutWithPathParamsAndBody.java
similarity index 97%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PutWithPathParamsAndBody.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PutWithPathParamsAndBody.java
index bf943df8..8b26d9c6 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/PutWithPathParamsAndBody.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/PutWithPathParamsAndBody.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePost.java
similarity index 97%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePost.java
index 7969e54c..3054c4b3 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePost.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePostForAutoGenId.java
similarity index 97%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePostForAutoGenId.java
index e63d32a0..ddb56e53 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePostForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
@@ -24,14 +24,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenIdForUrlEncoded.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePostForAutoGenIdForUrlEncoded.java
similarity index 97%
rename from apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenIdForUrlEncoded.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePostForAutoGenIdForUrlEncoded.java
index 16864348..e415d773 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenIdForUrlEncoded.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/testscripts/SimplePostForAutoGenIdForUrlEncoded.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.injicertify.testscripts;
 
 import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
@@ -23,14 +23,14 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
+import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.InjiCertifyConfigManager;
-import io.mosip.testrig.apirig.utils.InjiCertifyUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/utils/InjiCertifyConfigManager.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyConfigManager.java
similarity index 83%
rename from apitest/src/main/java/io/mosip/testrig/apirig/utils/InjiCertifyConfigManager.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyConfigManager.java
index dfd5ef6f..95600864 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/utils/InjiCertifyConfigManager.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyConfigManager.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.injicertify.utils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,7 +6,8 @@
 
 import org.apache.log4j.Logger;
 
-import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.injicertify.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.utils.ConfigManager;
 
 public class InjiCertifyConfigManager extends ConfigManager{
 	private static final Logger LOGGER = Logger.getLogger(InjiCertifyConfigManager.class);
diff --git a/apitest/src/main/java/io/mosip/testrig/apirig/utils/InjiCertifyUtil.java b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyUtil.java
similarity index 96%
rename from apitest/src/main/java/io/mosip/testrig/apirig/utils/InjiCertifyUtil.java
rename to apitest/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyUtil.java
index dbb190fd..c588235c 100644
--- a/apitest/src/main/java/io/mosip/testrig/apirig/utils/InjiCertifyUtil.java
+++ b/apitest/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyUtil.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.injicertify.utils;
 
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
@@ -7,8 +7,12 @@
 import com.nimbusds.jose.jwk.RSAKey;
 
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
-import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.injicertify.testrunner.MosipTestRunner;
 import io.mosip.testrig.apirig.testrunner.OTPListener;
+import io.mosip.testrig.apirig.utils.AdminTestUtil;
+import io.mosip.testrig.apirig.utils.GlobalConstants;
+import io.mosip.testrig.apirig.utils.JWKKeyUtil;
+import io.mosip.testrig.apirig.utils.SkipTestCaseHandler;
 
 public class InjiCertifyUtil extends AdminTestUtil {
 
diff --git a/apitest/testNgXmlFiles/injicertifyPrerequisiteSuite.xml b/apitest/testNgXmlFiles/injicertifyPrerequisiteSuite.xml
index 3778b447..72a6f53b 100644
--- a/apitest/testNgXmlFiles/injicertifyPrerequisiteSuite.xml
+++ b/apitest/testNgXmlFiles/injicertifyPrerequisiteSuite.xml
@@ -12,7 +12,7 @@
 		<parameter name="ymlFile" value="injicertify/AddIdentity/AddIdentity.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.AddIdentity" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.AddIdentity" />
 		</classes>
 	</test>
 </suite>
\ No newline at end of file
diff --git a/apitest/testNgXmlFiles/injicertifySuite.xml b/apitest/testNgXmlFiles/injicertifySuite.xml
index 1908ad6a..e7db26b7 100644
--- a/apitest/testNgXmlFiles/injicertifySuite.xml
+++ b/apitest/testNgXmlFiles/injicertifySuite.xml
@@ -13,7 +13,7 @@
 		<parameter name="idKeyName" value="clientId" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestSunBirdC">
@@ -21,14 +21,14 @@
 		<parameter name="idKeyName" value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserSunBirdC">
 		<parameter name="ymlFile" value="injicertify/SunBirdC/AuthenticateUserSunBirdC/AuthenticateUserSunBirdC.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeSunBirdC">
@@ -36,7 +36,7 @@
 		<parameter name="idKeyName" value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenSunBirdC">
@@ -44,13 +44,13 @@
 		<parameter name="idKeyName" value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialSunBirdC">
 		<parameter name="ymlFile" value="injicertify/SunBirdC/GetCredentialSunBirdC/GetCredentialSunBirdC.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestSunBirdCForVd11">
@@ -58,14 +58,14 @@
 		<parameter name="idKeyName" value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserSunBirdCForVd11">
 		<parameter name="ymlFile" value="injicertify/SunBirdCForVd11/AuthenticateUserSunBirdCForVd11/AuthenticateUserSunBirdCForVd11.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeSunBirdCForVd11">
@@ -73,7 +73,7 @@
 		<parameter name="idKeyName" value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenSunBirdCForVd11">
@@ -81,13 +81,13 @@
 		<parameter name="idKeyName" value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialSunBirdCForVd11">
 		<parameter name="ymlFile" value="injicertify/SunBirdCForVd11/GetCredentialSunBirdCForVd11/GetCredentialSunBirdCForVd11.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestSunBirdCForVd12">
@@ -95,14 +95,14 @@
 		<parameter name="idKeyName" value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserSunBirdCForVd12">
 		<parameter name="ymlFile" value="injicertify/SunBirdCForVd12/AuthenticateUserSunBirdCForVd12/AuthenticateUserSunBirdCForVd12.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeSunBirdCForVd12">
@@ -110,7 +110,7 @@
 		<parameter name="idKeyName" value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenSunBirdCForVd12">
@@ -118,13 +118,13 @@
 		<parameter name="idKeyName" value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialSunBirdCForVd12">
 		<parameter name="ymlFile" value="injicertify/SunBirdCForVd12/GetCredentialSunBirdCForVd12/GetCredentialSunBirdCForVd12.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="CreatePolicyGroup">
@@ -132,7 +132,7 @@
 		<parameter name="idKeyName" value="id,name" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="DefinePolicy">
@@ -140,14 +140,14 @@
 		<parameter name="idKeyName" value="id,name" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="PublishPolicy">
 		<parameter name="ymlFile" value="injicertify/PmsIntegration/PublishPolicy/PublishPolicy.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithOnlyPathParam" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithOnlyPathParam" />
 		</classes>
 	</test>
 	<test name="CreatePartner">
@@ -155,14 +155,14 @@
 		<parameter name="idKeyName" value="partnerId" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="UploadCACertificate">
 		<parameter name="ymlFile" value="injicertify/PmsIntegration/UploadCertificate/UploadCertificate.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="UploadPartnerCertificate">
@@ -170,7 +170,7 @@
 		<parameter name="idKeyName" value="signedCertificateData" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="RequestAPIKeyForAuthPartner">
@@ -178,7 +178,7 @@
 		<parameter name="idKeyName" value="mappingkey" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="ApproveAPIKey">
@@ -186,7 +186,7 @@
 		<parameter name="pathParams" value="mappingkey" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParamsAndBody" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PutWithPathParamsAndBody" />
 		</classes>
 	</test>
 	<test name="OIDCClient">
@@ -194,7 +194,7 @@
 		<parameter name="idKeyName"	value="clientId" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestVCIMosipID">
@@ -202,14 +202,14 @@
 		<parameter name="idKeyName"	value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserVCIMosipID">
 		<parameter name="ymlFile" value="injicertify/VCIMosipID/AuthenticateUserVCI/AuthenticateUserVCI.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeVCIMosipID">
@@ -217,7 +217,7 @@
 		<parameter name="idKeyName"	value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenVCIMosipID">
@@ -225,13 +225,13 @@
 		<parameter name="idKeyName"	value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialMosipID">
 		<parameter name="ymlFile" value="injicertify/VCIMosipID/GetCredentialMosipID/GetCredentialMosipID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestVCIMosipIDForVd11">
@@ -239,14 +239,14 @@
 		<parameter name="idKeyName"	value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserVCIMosipIDForVd11">
 		<parameter name="ymlFile" value="injicertify/VCIMosipIDForVD11/AuthenticateUserVCI/AuthenticateUserVCI.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeVCIMosipIDForVd11">
@@ -254,7 +254,7 @@
 		<parameter name="idKeyName"	value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenVCIMosipIDForVd11">
@@ -262,13 +262,13 @@
 		<parameter name="idKeyName"	value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialMosipIDForVd11">
 		<parameter name="ymlFile" value="injicertify/VCIMosipIDForVD11/GetCredentialMosipID/GetCredentialMosipID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestVCIMosipIDForVd12">
@@ -276,14 +276,14 @@
 		<parameter name="idKeyName"	value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserVCIMosipIDForVd12">
 		<parameter name="ymlFile" value="injicertify/VCIMosipIDForVD12/AuthenticateUserVCI/AuthenticateUserVCI.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeVCIMosipIDForVd12">
@@ -291,7 +291,7 @@
 		<parameter name="idKeyName"	value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenVCIMosipIDForVd12">
@@ -299,13 +299,13 @@
 		<parameter name="idKeyName"	value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialMosipIDForVd12">
 		<parameter name="ymlFile" value="injicertify/VCIMosipIDForVD12/GetCredentialMosipID/GetCredentialMosipID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="CreateOIDCClientV2ForMockIDA">
@@ -313,7 +313,7 @@
 		<parameter name="idKeyName" value="clientId" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestVCIForMockIDA">
@@ -321,14 +321,14 @@
 		<parameter name="idKeyName" value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserVCIForMockIDA">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDA/AuthenticateUserForMockIDA/AuthenticateUserForMockIDA.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeVCIForMockIDA">
@@ -336,7 +336,7 @@
 		<parameter name="idKeyName"	value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenVCIForMockIDA">
@@ -344,13 +344,13 @@
 		<parameter name="idKeyName"	value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialForMockIDA">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDA/GetCredentialForMockIDA/GetCredentialForMockIDA.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestVCIForMockIDAForVd11">
@@ -358,14 +358,14 @@
 		<parameter name="idKeyName" value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserVCIForMockIDAForVd11">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDAForVd11/AuthenticateUserForMockIDA/AuthenticateUserForMockIDA.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeVCIForMockIDAForVd11">
@@ -373,7 +373,7 @@
 		<parameter name="idKeyName"	value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenVCIForMockIDAForVd11">
@@ -381,13 +381,13 @@
 		<parameter name="idKeyName"	value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialForMockIDAForVd11">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDAForVd11/GetCredentialForMockIDA/GetCredentialForMockIDA.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="OAuthDetailsRequestVCIForMockIDAForVd12">
@@ -395,14 +395,14 @@
 		<parameter name="idKeyName" value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserVCIForMockIDAForVd12">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDAForVd12/AuthenticateUserForMockIDA/AuthenticateUserForMockIDA.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeVCIForMockIDAForVd12">
@@ -410,7 +410,7 @@
 		<parameter name="idKeyName"	value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenVCIForMockIDAForVd12">
@@ -418,13 +418,13 @@
 		<parameter name="idKeyName"	value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialForMockIDAForVd12">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDAForVd12/GetCredentialForMockIDA/GetCredentialForMockIDA.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>	
 	<test name="OAuthDetailsRequestVCIForMockIDANegTC">
@@ -432,14 +432,14 @@
 		<parameter name="idKeyName" value="transactionId,encodedResp" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="AuthenticateUserVCIForMockIDANegTC">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDANegTC/AuthenticateUserForMockIDANegTC/AuthenticateUserForMockIDANegTC.yml" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	<test name="AuthorizationCodeVCIForMockIDANegTC">
@@ -447,7 +447,7 @@
 		<parameter name="idKeyName"	value="code" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	<test name="GenerateTokenVCIForMockIDANegTC">
@@ -455,13 +455,13 @@
 		<parameter name="idKeyName"	value="access_token" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePostForAutoGenIdForUrlEncoded" />
 		</classes>
 	</test>
 	<test name="GetCredentialForMockIDANegTC">
 		<parameter name="ymlFile" value="injicertify/VCIMockIDANegTC/GetCredentialForMockIDANegTC/GetCredentialForMockIDANegTC.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.injicertify.testscripts.SimplePost" />
 		</classes>
 	</test>	
 </suite>
\ No newline at end of file