diff --git a/DauthSDK/src/main/AndroidManifest.xml b/DauthSDK/src/main/AndroidManifest.xml
index 6b1bea1..562331d 100644
--- a/DauthSDK/src/main/AndroidManifest.xml
+++ b/DauthSDK/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="edu.nitt.delta">
+    package="edu.nitt.delta.auth">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission
         android:name="android.permission.AUTHENTICATE_ACCOUNTS"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/DAuth.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/DAuth.kt
similarity index 97%
rename from DauthSDK/src/main/java/edu/nitt/delta/DAuth.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/DAuth.kt
index 978e0d9..41af4bc 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/DAuth.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/DAuth.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.accounts.Account
 import android.accounts.AccountManager
@@ -7,18 +7,18 @@ import android.app.AlertDialog
 import android.net.Uri
 import android.util.Base64
 import com.google.gson.GsonBuilder
-import edu.nitt.delta.api.RetrofitInstance
-import edu.nitt.delta.constants.AccountManagerConstants
-import edu.nitt.delta.constants.ErrorMessageConstants
-import edu.nitt.delta.constants.WebViewConstants.BaseAuthority
-import edu.nitt.delta.constants.WebViewConstants.BaseUrl
-import edu.nitt.delta.constants.WebViewConstants.Scheme
-import edu.nitt.delta.helpers.PkceUtil
-import edu.nitt.delta.helpers.isNetworkAvailable
-import edu.nitt.delta.helpers.openWebView
-import edu.nitt.delta.helpers.toMap
-import edu.nitt.delta.interfaces.ResultListener
-import edu.nitt.delta.models.*
+import edu.nitt.delta.auth.api.RetrofitInstance
+import edu.nitt.delta.auth.constants.AccountManagerConstants
+import edu.nitt.delta.auth.constants.ErrorMessageConstants
+import edu.nitt.delta.auth.constants.WebViewConstants.BaseAuthority
+import edu.nitt.delta.auth.constants.WebViewConstants.BaseUrl
+import edu.nitt.delta.auth.constants.WebViewConstants.Scheme
+import edu.nitt.delta.auth.helpers.PkceUtil
+import edu.nitt.delta.auth.helpers.isNetworkAvailable
+import edu.nitt.delta.auth.helpers.openWebView
+import edu.nitt.delta.auth.helpers.toMap
+import edu.nitt.delta.auth.interfaces.ResultListener
+import edu.nitt.delta.auth.models.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/DAuthAuthenticatorActivity.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/DAuthAuthenticatorActivity.kt
similarity index 89%
rename from DauthSDK/src/main/java/edu/nitt/delta/DAuthAuthenticatorActivity.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/DAuthAuthenticatorActivity.kt
index b9388d0..a5cbf6f 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/DAuthAuthenticatorActivity.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/DAuthAuthenticatorActivity.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.accounts.Account
 import android.accounts.AccountAuthenticatorResponse
@@ -6,13 +6,13 @@ import android.accounts.AccountManager
 import android.app.Activity
 import android.net.Uri
 import android.os.Bundle
-import edu.nitt.delta.constants.AccountManagerConstants
-import edu.nitt.delta.constants.ErrorCodeConstants
-import edu.nitt.delta.constants.ErrorMessageConstants
-import edu.nitt.delta.constants.WebViewConstants
-import edu.nitt.delta.helpers.toFormatString
-import edu.nitt.delta.helpers.openWebView
-import edu.nitt.delta.helpers.retrieveCookie
+import edu.nitt.delta.auth.constants.AccountManagerConstants
+import edu.nitt.delta.auth.constants.ErrorCodeConstants
+import edu.nitt.delta.auth.constants.ErrorMessageConstants
+import edu.nitt.delta.auth.constants.WebViewConstants
+import edu.nitt.delta.auth.helpers.toFormatString
+import edu.nitt.delta.auth.helpers.openWebView
+import edu.nitt.delta.auth.helpers.retrieveCookie
 import java.util.*
 
 /**
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/DauthAccountAuthenticator.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAccountAuthenticator.kt
similarity index 94%
rename from DauthSDK/src/main/java/edu/nitt/delta/DauthAccountAuthenticator.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAccountAuthenticator.kt
index 53cd56e..35c57d1 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/DauthAccountAuthenticator.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAccountAuthenticator.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.accounts.AbstractAccountAuthenticator
 import android.accounts.Account
@@ -7,12 +7,11 @@ import android.accounts.AccountManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
-import edu.nitt.delta.api.RetrofitInstance
-import edu.nitt.delta.constants.ErrorCodeConstants
-import edu.nitt.delta.constants.ErrorMessageConstants
-import edu.nitt.delta.helpers.toDate
-import edu.nitt.delta.helpers.toFormatString
+import edu.nitt.delta.auth.api.RetrofitInstance
+import edu.nitt.delta.auth.constants.ErrorCodeConstants
+import edu.nitt.delta.auth.constants.ErrorMessageConstants
+import edu.nitt.delta.auth.helpers.toDate
+import edu.nitt.delta.auth.helpers.toFormatString
 import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.Callback
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/DauthAuthenticatorService.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAuthenticatorService.kt
similarity index 92%
rename from DauthSDK/src/main/java/edu/nitt/delta/DauthAuthenticatorService.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAuthenticatorService.kt
index 52a85f6..beb7504 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/DauthAuthenticatorService.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAuthenticatorService.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.app.Service
 import android.content.Intent
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/api/ApiRoutes.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/api/ApiRoutes.kt
similarity index 93%
rename from DauthSDK/src/main/java/edu/nitt/delta/api/ApiRoutes.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/api/ApiRoutes.kt
index 9c78018..8ad3fbb 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/api/ApiRoutes.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/api/ApiRoutes.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.api
+package edu.nitt.delta.auth.api
 
 /**
  * Singleton object containing the [api routes](https://delta.github.io/DAuth-Docs/#endpoints)
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/api/DAuthApi.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/api/DAuthApi.kt
similarity index 90%
rename from DauthSDK/src/main/java/edu/nitt/delta/api/DAuthApi.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/api/DAuthApi.kt
index 7d1772e..0a97a6f 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/api/DAuthApi.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/api/DAuthApi.kt
@@ -1,8 +1,8 @@
-package edu.nitt.delta.api
+package edu.nitt.delta.auth.api
 
-import edu.nitt.delta.models.Token
-import edu.nitt.delta.models.User
-import edu.nitt.delta.models.jwks
+import edu.nitt.delta.auth.models.Token
+import edu.nitt.delta.auth.models.User
+import edu.nitt.delta.auth.models.jwks
 import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.*
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/api/RetrofitInstance.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/api/RetrofitInstance.kt
similarity index 97%
rename from DauthSDK/src/main/java/edu/nitt/delta/api/RetrofitInstance.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/api/RetrofitInstance.kt
index 878f9de..f1fd0d6 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/api/RetrofitInstance.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/api/RetrofitInstance.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.api
+package edu.nitt.delta.auth.api
 
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/constants/AccountManagerConstants.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/AccountManagerConstants.kt
similarity index 69%
rename from DauthSDK/src/main/java/edu/nitt/delta/constants/AccountManagerConstants.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/constants/AccountManagerConstants.kt
index f6e33d6..5eab081 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/constants/AccountManagerConstants.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/AccountManagerConstants.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 object AccountManagerConstants {
     const val AccountType = "auth.delta.nitt.edu"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorCodeConstants.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorCodeConstants.kt
similarity index 77%
rename from DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorCodeConstants.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorCodeConstants.kt
index 1c751de..4eab70d 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorCodeConstants.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorCodeConstants.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 object ErrorCodeConstants {
     const val InternalError=404
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorMessageConstants.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorMessageConstants.kt
similarity index 90%
rename from DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorMessageConstants.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorMessageConstants.kt
index 9804dc0..ed90333 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorMessageConstants.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorMessageConstants.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 object ErrorMessageConstants {
     const val NoAccount="Account Not Found"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/constants/WebViewConstants.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/WebViewConstants.kt
similarity index 84%
rename from DauthSDK/src/main/java/edu/nitt/delta/constants/WebViewConstants.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/constants/WebViewConstants.kt
index 03d8d9f..69dcb85 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/constants/WebViewConstants.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/WebViewConstants.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 internal object WebViewConstants {
     const val Scheme = "https"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/deltaButton/DeltaButton.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/deltaButton/DeltaButton.kt
similarity index 97%
rename from DauthSDK/src/main/java/edu/nitt/delta/deltaButton/DeltaButton.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/deltaButton/DeltaButton.kt
index 03ed98e..96d8431 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/deltaButton/DeltaButton.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/deltaButton/DeltaButton.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.deltaButton
+package edu.nitt.delta.auth.deltaButton
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -10,9 +10,9 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
 import androidx.core.content.ContextCompat
-import edu.nitt.delta.R
-import edu.nitt.delta.helpers.ViewUtils.dpToPixel
-import edu.nitt.delta.helpers.ViewUtils.drawableToBitmap
+import edu.nitt.delta.auth.R
+import edu.nitt.delta.auth.helpers.ViewUtils.dpToPixel
+import edu.nitt.delta.auth.helpers.ViewUtils.drawableToBitmap
 
 /**
  * An open [DeltaButton] class to integrate with the client UI
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/helpers/Connectivity.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/Connectivity.kt
similarity index 96%
rename from DauthSDK/src/main/java/edu/nitt/delta/helpers/Connectivity.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/Connectivity.kt
index b78c854..00671ba 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/helpers/Connectivity.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/Connectivity.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.content.Context
 import android.net.ConnectivityManager
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/helpers/DateUtils.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/DateUtils.kt
similarity index 94%
rename from DauthSDK/src/main/java/edu/nitt/delta/helpers/DateUtils.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/DateUtils.kt
index 66cf30c..60c95b9 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/helpers/DateUtils.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/DateUtils.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/helpers/GsonHelper.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/GsonHelper.kt
similarity index 92%
rename from DauthSDK/src/main/java/edu/nitt/delta/helpers/GsonHelper.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/GsonHelper.kt
index beda78b..dbca5e5 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/helpers/GsonHelper.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/GsonHelper.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/helpers/PkceUtils.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/PkceUtils.kt
similarity index 98%
rename from DauthSDK/src/main/java/edu/nitt/delta/helpers/PkceUtils.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/PkceUtils.kt
index a49d7be..8950b4c 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/helpers/PkceUtils.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/PkceUtils.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.util.Base64
 import java.security.MessageDigest
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/helpers/ViewUtils.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/ViewUtils.kt
similarity index 97%
rename from DauthSDK/src/main/java/edu/nitt/delta/helpers/ViewUtils.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/ViewUtils.kt
index 5679132..7f958c3 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/helpers/ViewUtils.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/ViewUtils.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.content.Context
 import android.content.res.Resources
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/helpers/WebViewHelper.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/WebViewHelper.kt
similarity index 99%
rename from DauthSDK/src/main/java/edu/nitt/delta/helpers/WebViewHelper.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/WebViewHelper.kt
index d48aa83..7a3abe5 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/helpers/WebViewHelper.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/WebViewHelper.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.R
 import android.app.Dialog
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/interfaces/ResultListener.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/interfaces/ResultListener.kt
similarity index 70%
rename from DauthSDK/src/main/java/edu/nitt/delta/interfaces/ResultListener.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/interfaces/ResultListener.kt
index ac26ebd..b1bcc40 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/interfaces/ResultListener.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/interfaces/ResultListener.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.interfaces
+package edu.nitt.delta.auth.interfaces
 
 interface ResultListener<T> {
     fun onSuccess(value: T)
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationErrorType.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationErrorType.kt
similarity index 83%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationErrorType.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationErrorType.kt
index 8912bc1..42485ab 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationErrorType.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationErrorType.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class AuthorizationErrorType {
     NetworkError,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationRequest.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationRequest.kt
similarity index 83%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationRequest.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationRequest.kt
index 100dba1..a31cac7 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationRequest.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationRequest.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class AuthorizationRequest(
     val response_type: ResponseType,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationResponse.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationResponse.kt
similarity index 81%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationResponse.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationResponse.kt
index aea2d7f..e77a918 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationResponse.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationResponse.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class AuthorizationResponse(
     val authorizationCode : String,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/ClientCredentials.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/ClientCredentials.kt
similarity index 76%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/ClientCredentials.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/ClientCredentials.kt
index e47f9d0..a92c248 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/ClientCredentials.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/ClientCredentials.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class ClientCredentials(
     val clientId: String,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/GrantType.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/GrantType.kt
similarity index 80%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/GrantType.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/GrantType.kt
index f4ae755..cddc2a7 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/GrantType.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/GrantType.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class GrantType {
     AuthorizationCode {
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/Key.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Key.kt
similarity index 80%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/Key.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/Key.kt
index 3fa26b8..7db3c6d 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/Key.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Key.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class Key(
     val e: String,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/ResponseType.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/ResponseType.kt
similarity index 77%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/ResponseType.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/ResponseType.kt
index ab485ee..280d9fb 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/ResponseType.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/ResponseType.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class ResponseType {
     Code{
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/Result.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Result.kt
similarity index 71%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/Result.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/Result.kt
index b1a367d..aaf5eec 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/Result.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Result.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class Result(
     val user: User?,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/Scope.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Scope.kt
similarity index 94%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/Scope.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/Scope.kt
index 34b3b20..3c9ec63 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/Scope.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Scope.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class Scope {
     OpenID {
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/Token.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Token.kt
similarity index 74%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/Token.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/Token.kt
index 5f39272..78c8090 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/Token.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Token.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class Token(
     val access_token: String,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/TokenRequest.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/TokenRequest.kt
similarity index 75%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/TokenRequest.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/TokenRequest.kt
index 7920209..fb30ea6 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/TokenRequest.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/TokenRequest.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class TokenRequest(
     val grant_type:String,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/User.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/User.kt
similarity index 75%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/User.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/User.kt
index 68ad681..b292559 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/User.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/User.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class User(
     val id: Int,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/jwks.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwks.kt
similarity index 55%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/jwks.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwks.kt
index cd801b6..dc231e4 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/jwks.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwks.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class jwks (
     val key: List<Key>
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/models/jwt.kt b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwt.kt
similarity index 91%
rename from DauthSDK/src/main/java/edu/nitt/delta/models/jwt.kt
rename to DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwt.kt
index 7298a74..a82304f 100644
--- a/DauthSDK/src/main/java/edu/nitt/delta/models/jwt.kt
+++ b/DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwt.kt
@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class jwt(
     val header: Header,
diff --git a/DauthSDK/src/main/res/layout/activity_dauth_authenticator.xml b/DauthSDK/src/main/res/layout/activity_dauth_authenticator.xml
index 70847b5..6ff3bd6 100644
--- a/DauthSDK/src/main/res/layout/activity_dauth_authenticator.xml
+++ b/DauthSDK/src/main/res/layout/activity_dauth_authenticator.xml
@@ -4,5 +4,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DAuthAuthenticatorActivity">
+    tools:context=".auth.DAuthAuthenticatorActivity">
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sampleApp/build.gradle b/sampleApp/build.gradle
index 4ee65aa..ec25a06 100644
--- a/sampleApp/build.gradle
+++ b/sampleApp/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdk 30
 
     defaultConfig {
-        applicationId "edu.nitt.delta"
+        applicationId "edu.nitt.delta.auth.sample"
         minSdk 21
         targetSdk 30
         versionCode 1
diff --git a/sampleApp/src/Java/java/edu/nitt/delta/MainActivity.java b/sampleApp/src/Java/java/edu/nitt/delta/auth/sample/MainActivity.java
similarity index 82%
rename from sampleApp/src/Java/java/edu/nitt/delta/MainActivity.java
rename to sampleApp/src/Java/java/edu/nitt/delta/auth/sample/MainActivity.java
index a1672b2..dda3fc9 100644
--- a/sampleApp/src/Java/java/edu/nitt/delta/MainActivity.java
+++ b/sampleApp/src/Java/java/edu/nitt/delta/auth/sample/MainActivity.java
@@ -1,4 +1,4 @@
-package edu.nitt.delta;
+package edu.nitt.delta.auth.sample;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -8,14 +8,14 @@
 import androidx.appcompat.app.AppCompatActivity;
 import java.util.ArrayList;
 import java.util.List;
-import edu.nitt.delta.deltaButton.DeltaButton;
-import edu.nitt.delta.interfaces.ResultListener;
-import edu.nitt.delta.models.AuthorizationRequest;
-import edu.nitt.delta.models.GrantType;
-import edu.nitt.delta.models.ResponseType;
-import edu.nitt.delta.models.Result;
-import edu.nitt.delta.models.Scope;
-import edu.nitt.delta.models.User;
+import edu.nitt.delta.auth.DAuth;
+import edu.nitt.delta.auth.deltaButton.DeltaButton;
+import edu.nitt.delta.auth.interfaces.ResultListener;
+import edu.nitt.delta.auth.models.AuthorizationRequest;
+import edu.nitt.delta.auth.models.GrantType;
+import edu.nitt.delta.auth.models.ResponseType;
+import edu.nitt.delta.auth.models.Result;
+import edu.nitt.delta.auth.models.Scope;
 
 /**
  * Sample activity in java to show the use of DAuth sign in
diff --git a/sampleApp/src/Kotlin/java/edu/nitt/delta/MainActivity.kt b/sampleApp/src/Kotlin/java/edu/nitt/delta/auth/sample/MainActivity.kt
similarity index 100%
rename from sampleApp/src/Kotlin/java/edu/nitt/delta/MainActivity.kt
rename to sampleApp/src/Kotlin/java/edu/nitt/delta/auth/sample/MainActivity.kt
diff --git a/sampleApp/src/main/AndroidManifest.xml b/sampleApp/src/main/AndroidManifest.xml
index a3b668c..4dde735 100644
--- a/sampleApp/src/main/AndroidManifest.xml
+++ b/sampleApp/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="edu.nitt.delta">
+    package="edu.nitt.delta.auth.sample">
 
     <application
         android:allowBackup="false"
diff --git a/sampleApp/src/main/res/layout/activity_main.xml b/sampleApp/src/main/res/layout/activity_main.xml
index 3bca6b4..7fb180e 100644
--- a/sampleApp/src/main/res/layout/activity_main.xml
+++ b/sampleApp/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <edu.nitt.delta.deltaButton.DeltaButton
+    <edu.nitt.delta.auth.deltaButton.DeltaButton
         android:id="@+id/sign_in_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"