diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 8d81632..d4b7acc 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.22" />
+    <option name="version" value="2.0.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9437d56..ebf8bc3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ef668b..80e1dee 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,13 +12,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Numplex">
         <activity
-            android:name=".SignInActivity"
+            android:name=".ui.activity.SignInActivity"
             android:exported="true">
 
         </activity>
 
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.activity.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.Numplex.MySplash">
             <intent-filter>
diff --git a/app/src/main/java/sayan/apps/numplex/MainActivity.kt b/app/src/main/java/sayan/apps/numplex/ui/activity/MainActivity.kt
similarity index 96%
rename from app/src/main/java/sayan/apps/numplex/MainActivity.kt
rename to app/src/main/java/sayan/apps/numplex/ui/activity/MainActivity.kt
index e9cf48e..811eabc 100644
--- a/app/src/main/java/sayan/apps/numplex/MainActivity.kt
+++ b/app/src/main/java/sayan/apps/numplex/ui/activity/MainActivity.kt
@@ -1,4 +1,4 @@
-package sayan.apps.numplex
+package sayan.apps.numplex.ui.activity
 
 import android.content.Intent
 import android.os.Bundle
@@ -24,6 +24,10 @@ import androidx.fragment.app.Fragment
 import com.google.android.material.navigation.NavigationView
 import com.google.firebase.auth.FirebaseAuth
 import com.squareup.picasso.Picasso
+import sayan.apps.numplex.R
+import sayan.apps.numplex.ui.fragment.ClassificationsFragment
+import sayan.apps.numplex.ui.fragment.FeedbackFragment
+import sayan.apps.numplex.ui.fragment.NumplexFragment
 import java.util.concurrent.Executors
 
 class MainActivity : AppCompatActivity() {
diff --git a/app/src/main/java/sayan/apps/numplex/SignInActivity.kt b/app/src/main/java/sayan/apps/numplex/ui/activity/SignInActivity.kt
similarity index 98%
rename from app/src/main/java/sayan/apps/numplex/SignInActivity.kt
rename to app/src/main/java/sayan/apps/numplex/ui/activity/SignInActivity.kt
index e9bbc16..37d52eb 100644
--- a/app/src/main/java/sayan/apps/numplex/SignInActivity.kt
+++ b/app/src/main/java/sayan/apps/numplex/ui/activity/SignInActivity.kt
@@ -1,4 +1,4 @@
-package sayan.apps.numplex
+package sayan.apps.numplex.ui.activity
 
 import android.content.Intent
 import android.os.Bundle
@@ -18,6 +18,7 @@ import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
+import sayan.apps.numplex.R
 import java.util.concurrent.Executors
 
 
diff --git a/app/src/main/java/sayan/apps/numplex/ClassificationsFragment.kt b/app/src/main/java/sayan/apps/numplex/ui/fragment/ClassificationsFragment.kt
similarity index 99%
rename from app/src/main/java/sayan/apps/numplex/ClassificationsFragment.kt
rename to app/src/main/java/sayan/apps/numplex/ui/fragment/ClassificationsFragment.kt
index 38cfe4a..3d70948 100644
--- a/app/src/main/java/sayan/apps/numplex/ClassificationsFragment.kt
+++ b/app/src/main/java/sayan/apps/numplex/ui/fragment/ClassificationsFragment.kt
@@ -1,4 +1,4 @@
-package sayan.apps.numplex
+package sayan.apps.numplex.ui.fragment
 
 import android.content.Intent
 import android.net.Uri
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
+import sayan.apps.numplex.R
 
 class ClassificationsFragment : Fragment(), View.OnClickListener {
 
diff --git a/app/src/main/java/sayan/apps/numplex/FeedbackFragment.kt b/app/src/main/java/sayan/apps/numplex/ui/fragment/FeedbackFragment.kt
similarity index 97%
rename from app/src/main/java/sayan/apps/numplex/FeedbackFragment.kt
rename to app/src/main/java/sayan/apps/numplex/ui/fragment/FeedbackFragment.kt
index 9fa133e..81c398c 100644
--- a/app/src/main/java/sayan/apps/numplex/FeedbackFragment.kt
+++ b/app/src/main/java/sayan/apps/numplex/ui/fragment/FeedbackFragment.kt
@@ -1,4 +1,4 @@
-package sayan.apps.numplex
+package sayan.apps.numplex.ui.fragment
 
 import android.content.Context
 import android.os.Bundle
@@ -14,6 +14,7 @@ import androidx.fragment.app.Fragment
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.FirebaseDatabase
+import sayan.apps.numplex.R
 
 class FeedbackFragment : Fragment(), View.OnClickListener {
 
diff --git a/app/src/main/java/sayan/apps/numplex/NumplexFragment.kt b/app/src/main/java/sayan/apps/numplex/ui/fragment/NumplexFragment.kt
similarity index 84%
rename from app/src/main/java/sayan/apps/numplex/NumplexFragment.kt
rename to app/src/main/java/sayan/apps/numplex/ui/fragment/NumplexFragment.kt
index 495bdc5..8737626 100644
--- a/app/src/main/java/sayan/apps/numplex/NumplexFragment.kt
+++ b/app/src/main/java/sayan/apps/numplex/ui/fragment/NumplexFragment.kt
@@ -1,4 +1,4 @@
-package sayan.apps.numplex
+package sayan.apps.numplex.ui.fragment
 
 import android.content.Context
 import android.os.Bundle
@@ -10,6 +10,39 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import sayan.apps.numplex.R
+import sayan.apps.numplex.decimalToBin
+import sayan.apps.numplex.decimalToHex
+import sayan.apps.numplex.decimalToOct
+import sayan.apps.numplex.digitCount
+import sayan.apps.numplex.digitSum
+import sayan.apps.numplex.factors
+import sayan.apps.numplex.isAbundantNumber
+import sayan.apps.numplex.isArmstrongNumber
+import sayan.apps.numplex.isAutomorphicNumber
+import sayan.apps.numplex.isCircularPrimeNumber
+import sayan.apps.numplex.isDisariumNumber
+import sayan.apps.numplex.isDuckNumber
+import sayan.apps.numplex.isEmirpNumber
+import sayan.apps.numplex.isEven
+import sayan.apps.numplex.isFermatNumber
+import sayan.apps.numplex.isFibonacciNumber
+import sayan.apps.numplex.isHappyNumber
+import sayan.apps.numplex.isKaprekarNumber
+import sayan.apps.numplex.isLucasNumber
+import sayan.apps.numplex.isNeonNumber
+import sayan.apps.numplex.isNivenNumber
+import sayan.apps.numplex.isPalindrome
+import sayan.apps.numplex.isPrimeNumber
+import sayan.apps.numplex.isPronicNumber
+import sayan.apps.numplex.isSmithNumber
+import sayan.apps.numplex.isSpecialNumber
+import sayan.apps.numplex.isSpyNumber
+import sayan.apps.numplex.isTechNumber
+import sayan.apps.numplex.isUglyNumber
+import sayan.apps.numplex.primeFactorization
+import sayan.apps.numplex.primeFactors
+import sayan.apps.numplex.reverse
 import kotlin.math.pow
 import kotlin.random.Random
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 79dc4bc..a831baa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:layout_gravity="center"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".ui.activity.MainActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_signin.xml b/app/src/main/res/layout/activity_signin.xml
index 70db4d8..8f18448 100644
--- a/app/src/main/res/layout/activity_signin.xml
+++ b/app/src/main/res/layout/activity_signin.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".ui.activity.MainActivity">
 
 
     <ImageView
diff --git a/app/src/main/res/layout/fragment_classifications.xml b/app/src/main/res/layout/fragment_classifications.xml
index c5f4304..52bfa2e 100644
--- a/app/src/main/res/layout/fragment_classifications.xml
+++ b/app/src/main/res/layout/fragment_classifications.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ClassificationsFragment">
+    tools:context=".ui.fragment.ClassificationsFragment">
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
index 0fafe74..92dbefa 100644
--- a/app/src/main/res/layout/fragment_feedback.xml
+++ b/app/src/main/res/layout/fragment_feedback.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".FeedbackFragment">
+    tools:context=".ui.fragment.FeedbackFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_numplex.xml b/app/src/main/res/layout/fragment_numplex.xml
index 6fb82bf..d6e0ff0 100644
--- a/app/src/main/res/layout/fragment_numplex.xml
+++ b/app/src/main/res/layout/fragment_numplex.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".NumplexFragment">
+    tools:context=".ui.fragment.NumplexFragment">
 
     <LinearLayout
         android:id="@+id/numplexPage"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8efd583..2a70170 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.1"
+agp = "8.7.0"
 kotlin = "2.0.20"
 coreKtx = "1.13.1"
 junit = "4.13.2"