diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testrunner/MosipTestRunner.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testrunner/MosipTestRunner.java
index 5a386ca67f..500385d30c 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testrunner/MosipTestRunner.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testrunner;
+package io.mosip.testrig.apirig.auth.testrunner;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,16 +23,20 @@
 import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.jwk.RSAKey;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
 import io.mosip.testrig.apirig.dataprovider.BiometricDataProvider;
 import io.mosip.testrig.apirig.dbaccess.DBManager;
 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.CertificateGenerationUtil;
 import io.mosip.testrig.apirig.utils.CertsUtil;
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.IdAuthConfigManager;
 import io.mosip.testrig.apirig.utils.JWKKeyUtil;
 import io.mosip.testrig.apirig.utils.KeyCloakUserAndAPIKeyGeneration;
 import io.mosip.testrig.apirig.utils.KeycloakUserManager;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/AddIdentity.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/AddIdentity.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/AddIdentity.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/AddIdentity.java
index ed7388d135..7e8e40b7b8 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/AddIdentity.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/AddIdentity.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
@@ -26,6 +26,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -36,8 +38,6 @@
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
-import io.mosip.testrig.apirig.utils.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.KernelAuthentication;
 import io.mosip.testrig.apirig.utils.KeycloakUserManager;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/BioAuth.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/BioAuth.java
index c249816558..88bd416196 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BioAuth.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/BioAuth.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -19,6 +19,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.utils.AdminTestException;
@@ -26,8 +28,6 @@
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.BioDataUtility;
 import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil;
-import io.mosip.testrig.apirig.utils.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerRegistration;
 import io.mosip.testrig.apirig.utils.ReportUtil;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/DemoAuth.java
similarity index 98%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/DemoAuth.java
index db1bc649bd..c18f473c66 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuth.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/DemoAuth.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 
 import java.lang.reflect.Field;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -28,8 +30,6 @@
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil;
-import io.mosip.testrig.apirig.utils.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerRegistration;
 import io.mosip.testrig.apirig.utils.ReportUtil;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/DemoAuthSimplePostForAutoGenId.java
similarity index 98%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/DemoAuthSimplePostForAutoGenId.java
index 77e3f3adde..c168f710ca 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/DemoAuthSimplePostForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
@@ -26,6 +26,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -35,8 +37,6 @@
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.GlobalMethods;
-import io.mosip.testrig.apirig.utils.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerRegistration;
 import io.mosip.testrig.apirig.utils.ReportUtil;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/GetWithParam.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/GetWithParam.java
index 08030623cb..360d24df97 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/GetWithParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -28,8 +30,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/GetWithParamForAutoGenId.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/GetWithParamForAutoGenId.java
index 7f7d801213..f0804a5239 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/GetWithParamForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -28,8 +30,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/MultiFactorAuthNew.java
similarity index 98%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/MultiFactorAuthNew.java
index 8b32e31140..a2b9cdb6ab 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/MultiFactorAuthNew.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.JsonPrecondtion;
@@ -28,8 +30,6 @@
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.BioDataUtility;
 import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil;
-import io.mosip.testrig.apirig.utils.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerRegistration;
 import io.mosip.testrig.apirig.utils.ReportUtil;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/OtpAuthNew.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/OtpAuthNew.java
index 2fc7877cba..76937e7ff2 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/OtpAuthNew.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 
 import java.lang.reflect.Field;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.utils.AdminTestException;
@@ -27,8 +29,6 @@
 import io.mosip.testrig.apirig.utils.AuthenticationTestException;
 import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil;
 import io.mosip.testrig.apirig.utils.FileUtil;
-import io.mosip.testrig.apirig.utils.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerRegistration;
 import io.mosip.testrig.apirig.utils.ReportUtil;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PatchWithBodyWithOtpGenerate.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PatchWithBodyWithOtpGenerate.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PatchWithBodyWithOtpGenerate.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PatchWithBodyWithOtpGenerate.java
index bcab8430fc..7020faf0c2 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PatchWithBodyWithOtpGenerate.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PatchWithBodyWithOtpGenerate.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -19,6 +19,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -27,8 +29,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithAutogenIdWithOtpGenerate.java
similarity index 98%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithAutogenIdWithOtpGenerate.java
index 81102e614e..c069853598 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithAutogenIdWithOtpGenerate.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithAutogenIdWithOtpGenerate.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -28,8 +30,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyWithOtpGenerate.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithBodyWithOtpGenerate.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyWithOtpGenerate.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithBodyWithOtpGenerate.java
index fc7e653446..56117f269b 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithBodyWithOtpGenerate.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithBodyWithOtpGenerate.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -19,6 +19,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -27,8 +29,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithOnlyPathParam.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithOnlyPathParam.java
index d902d72d73..6ae1fd4c0c 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithOnlyPathParam.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/PostWithOnlyPathParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -28,8 +30,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/SimplePost.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/SimplePost.java
index 9193f9c8a9..d83d28e27f 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/SimplePost.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -20,6 +20,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -28,8 +30,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/SimplePostForAutoGenId.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/SimplePostForAutoGenId.java
index 77223091da..b7dd3e8ac9 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePostForAutoGenId.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/SimplePostForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
@@ -21,6 +21,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -29,8 +31,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateDraft.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/UpdateDraft.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateDraft.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/UpdateDraft.java
index aed021490c..aa20df178b 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateDraft.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/UpdateDraft.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -19,6 +19,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -27,8 +29,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateIdentity.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/UpdateIdentity.java
similarity index 98%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateIdentity.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/UpdateIdentity.java
index 2ba5caaeee..99562f4b3d 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdateIdentity.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/testscripts/UpdateIdentity.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.auth.testscripts;
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
@@ -24,6 +24,8 @@
 import org.testng.internal.BaseTestMethod;
 import org.testng.internal.TestResult;
 
+import io.mosip.testrig.apirig.auth.utils.IdAuthConfigManager;
+import io.mosip.testrig.apirig.auth.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
@@ -32,8 +34,6 @@
 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.IdAuthConfigManager;
-import io.mosip.testrig.apirig.utils.IdAuthenticationUtil;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/utils/IdAuthConfigManager.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/utils/IdAuthConfigManager.java
similarity index 84%
rename from api-test/src/main/java/io/mosip/testrig/apirig/utils/IdAuthConfigManager.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/utils/IdAuthConfigManager.java
index 327d3ecdbc..4d2befd4b8 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/utils/IdAuthConfigManager.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/utils/IdAuthConfigManager.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.auth.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.auth.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.utils.ConfigManager;
 
 public class IdAuthConfigManager extends ConfigManager{
 	private static final Logger LOGGER = Logger.getLogger(IdAuthConfigManager.class);
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/utils/IdAuthenticationUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/auth/utils/IdAuthenticationUtil.java
similarity index 71%
rename from api-test/src/main/java/io/mosip/testrig/apirig/utils/IdAuthenticationUtil.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/auth/utils/IdAuthenticationUtil.java
index 3773c049ae..d7250dc36c 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/utils/IdAuthenticationUtil.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/auth/utils/IdAuthenticationUtil.java
@@ -1,10 +1,13 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.auth.utils;
 
 import org.apache.log4j.Logger;
 import org.testng.SkipException;
 
+import io.mosip.testrig.apirig.auth.testrunner.MosipTestRunner;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
-import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.utils.AdminTestUtil;
+import io.mosip.testrig.apirig.utils.GlobalConstants;
+import io.mosip.testrig.apirig.utils.SkipTestCaseHandler;
 
 public class IdAuthenticationUtil extends AdminTestUtil {
 
diff --git a/api-test/testNgXmlFiles/authPrerequisiteSuite.xml b/api-test/testNgXmlFiles/authPrerequisiteSuite.xml
index a9dbf77cea..31957a08e0 100644
--- a/api-test/testNgXmlFiles/authPrerequisiteSuite.xml
+++ b/api-test/testNgXmlFiles/authPrerequisiteSuite.xml
@@ -13,7 +13,7 @@
 			value="ida/AddIdentity/AddIdentity.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.AddIdentity" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.AddIdentity" />
 		</classes>
 	</test>
 	<test name="CreateVID">
@@ -21,7 +21,7 @@
 	    <parameter name="idKeyName" value="VID" />
 	    <parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	
@@ -30,7 +30,7 @@
 			value="ida/UpdateIdentityForUin/UpdateIdentity.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.UpdateIdentity" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.UpdateIdentity" />
 		</classes>
 	</test>
 
@@ -39,7 +39,7 @@
 		<parameter name="ymlFile"	value="ida/CreateDraft/CreateDraft.yml" />
 		<parameter name="prerequisite" value="Yes" />
 	<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.PostWithOnlyPathParam" />
+		<class name="io.mosip.testrig.apirig.auth.testscripts.PostWithOnlyPathParam" />
 	</classes>
 	</test> 
 	
@@ -48,7 +48,7 @@
 		<parameter name="idKeyName" value="UIN" />
 		<parameter name="prerequisite" value="Yes" />
 	<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.GetWithParamForAutoGenId" />
+		<class name="io.mosip.testrig.apirig.auth.testscripts.GetWithParamForAutoGenId" />
 	</classes>
 	</test>
 	
@@ -56,7 +56,7 @@
 		<parameter name="ymlFile"	value="ida/CreateDraftVID/CreateDraftVID.yml" />
 		<parameter name="prerequisite" value="Yes" />
 	<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+		<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId" />
 	</classes>
 	</test>
 	
@@ -66,7 +66,7 @@
 		<parameter name="pathParams"	value="registrationId" />
 		<parameter name="prerequisite" value="Yes" />
 	<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.UpdateDraft" />
+		<class name="io.mosip.testrig.apirig.auth.testscripts.UpdateDraft" />
 	</classes>
 	</test> 
 	
@@ -74,7 +74,7 @@
 		<parameter name="ymlFile"	value="ida/PublishDraft/PublishDraft.yml" />
 		<parameter name="prerequisite" value="Yes" />
 	<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+		<class name="io.mosip.testrig.apirig.auth.testscripts.GetWithParam" />
 	</classes>
 	</test>
 	<test name="GenerateVID">
@@ -84,7 +84,7 @@
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
 			<class
-				name="io.mosip.testrig.apirig.testscripts.PostWithAutogenIdWithOtpGenerate" />
+				name="io.mosip.testrig.apirig.auth.testscripts.PostWithAutogenIdWithOtpGenerate" />
 		</classes>
 	</test>
 	
@@ -92,7 +92,7 @@
 		<parameter name="ymlFile"	value="ida/DeactivateUin/DeactivateUin.yml" />
 		<parameter name="prerequisite" value="Yes" />
 	<classes>
-		<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+		<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId" />
 	</classes>
 	</test>
 
@@ -101,7 +101,7 @@
 			value="ida/RevokeVID/createRevokeVID.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PatchWithBodyWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.PatchWithBodyWithOtpGenerate" />
 		</classes>
 	</test>
 
@@ -110,7 +110,7 @@
 			value="ida/AuthInternalLock/AuthInternalLock.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePost" />
 		</classes>
 	</test>
 
@@ -119,7 +119,7 @@
 			value="ida/AuthLock/createAuthLock.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithBodyWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.PostWithBodyWithOtpGenerate" />
 		</classes>
 	</test>
 	
diff --git a/api-test/testNgXmlFiles/authSuite.xml b/api-test/testNgXmlFiles/authSuite.xml
index 29f23f9a1f..6f0264e828 100644
--- a/api-test/testNgXmlFiles/authSuite.xml
+++ b/api-test/testNgXmlFiles/authSuite.xml
@@ -12,7 +12,7 @@
 		<parameter name="ymlFile" value="ida/BioAuth/BioAuth2.yml" />
 		<parameter name="isInternal" value="false" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.BioAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.BioAuth" />
 		</classes>
 	</test>
 
@@ -20,28 +20,28 @@
 		<parameter name="ymlFile" value="ida/EkycBio/EkycBio2.yml" />
 		<parameter name="isInternal" value="false" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.BioAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.BioAuth" />
 		</classes>
 	</test>
 	<test name="OtpAuth">
 		<parameter name="ymlFile" value="ida/OtpAuth/OtpAuth2.yml" />
 		<parameter name="isInternal" value="false" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.OtpAuthNew" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.OtpAuthNew" />
 		</classes>
 	</test>
 	<test name="EkycOtp">
 		<parameter name="ymlFile" value="ida/EkycOtp/EkycOtp2.yml" />
 		<parameter name="isInternal" value="false" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.OtpAuthNew" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.OtpAuthNew" />
 		</classes>
 	</test>
 	<test name="MultiFactorAuth">
 		<parameter name="ymlFile"
 			value="ida/MultiFactorAuth/MultiFactorAuth2.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.MultiFactorAuthNew" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.MultiFactorAuthNew" />
 		</classes>
 	</test>
 
@@ -49,7 +49,7 @@
 		<parameter name="ymlFile"
 			value="ida/AuthTransaction/AuthTransaction.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.GetWithParam" />
 		</classes>
 	</test>
 
@@ -59,7 +59,7 @@
 			value="ida/UpdateIdentity/UpdateIdentity.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.UpdateIdentity" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.UpdateIdentity" />
 		</classes>
 	</test>
 
@@ -68,7 +68,7 @@
 			value="ida/BlockHotlistAPI/BlockHotlistAPI.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 
@@ -80,7 +80,7 @@
 		<parameter name="ymlFile"
 			value="ida/HotlistTestcases/HotlistTestcases.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DemoAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.DemoAuth" />
 		</classes>
 	</test>
 
@@ -89,7 +89,7 @@
 			value="ida/HotlistTestcases/HotlistTestcasesKyc.yml" />
 		<parameter name="isInternal" value="false" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DemoAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.DemoAuth" />
 		</classes>
 	</test>
 	
@@ -100,7 +100,7 @@
 			value="ida/BioAuthHotListLock/BioAuth.yml" />
 		<parameter name="isInternal" value="false" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.BioAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.BioAuth" />
 		</classes>
 	</test>
 
@@ -110,7 +110,7 @@
 			value="ida/AuthUnLock/createAuthUnLock.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithBodyWithOtpGenerate" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.PostWithBodyWithOtpGenerate" />
 		</classes>
 	</test>
 
@@ -119,20 +119,20 @@
 			value="ida/UnBlockHotlistAPI/UnBlockHotlistAPI.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	
 	<test name="DemoAuth">
 		<parameter name="ymlFile" value="ida/DemoAuth/DemoAuth2.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DemoAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.DemoAuth" />
 		</classes>
 	</test>
 	<test name="EkycDemo">
 		<parameter name="ymlFile" value="ida/EkycDemo/EkycDemo2.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DemoAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.DemoAuth" />
 		</classes>
 	</test>
 
@@ -141,7 +141,7 @@
 			value="ida/BlockHotlistAPI/BlockPartnerId.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 
@@ -151,14 +151,14 @@
 			value="ida/HotlistTestcases/HotlistTestcasesPartnerId.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DemoAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.DemoAuth" />
 		</classes>
 	</test>
 	<test name="BioAuthHotListPartner">
 		<parameter name="ymlFile"
 			value="ida/BioAuthHotListPartner/BioAuth.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.BioAuth" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.BioAuth" />
 		</classes>
 	</test>
 	
@@ -168,7 +168,7 @@
 		<parameter name="ymlFile" value="ida/OtpAuth/OtpAuthHotlisted.yml" />
 		<parameter name="isInternal" value="false" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.OtpAuthNew" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.OtpAuthNew" />
 		</classes>
 	</test>
 
@@ -177,7 +177,7 @@
 			value="ida/UnBlockHotlistAPI/UnBlockHotlistAPIForPartnerId.yml" />
 			<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
 	
@@ -186,7 +186,7 @@
 		<parameter name="isInternal" value="false" />
 		<parameter name="prerequisite" value="Yes" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.OtpAuthNew" />
+			<class name="io.mosip.testrig.apirig.auth.testscripts.OtpAuthNew" />
 		</classes>
 	</test>