diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
new file mode 100644
index 0000000..e8bc73a
--- /dev/null
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidTestResultsUserPreferences">
+    <option name="androidTestResultsTableState">
+      <map>
+        <entry key="28629151">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_2_XL_API_30" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4402775..ee98ccd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,12 +5,12 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="temurin-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/JCItemPickerDemo" />
-            <option value="$PROJECT_DIR$/jcitempicker" />
+            <option value="$PROJECT_DIR$/JCNumberPicker" />
           </set>
         </option>
         <option name="resolveExternalAnnotations" value="false" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fdf8d99..148fdd2 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.0" />
+    <option name="version" value="1.9.24" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..9e47cdd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +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_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/other.xml b/.idea/other.xml
deleted file mode 100644
index 491f998..0000000
--- a/.idea/other.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q2q" />
-          <option name="id" value="q2q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold3" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1768" />
-          <option name="screenY" value="2208" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/JCItemPickerDemo/build.gradle.kts b/JCItemPickerDemo/build.gradle.kts
index 78e17f7..c78e19a 100644
--- a/JCItemPickerDemo/build.gradle.kts
+++ b/JCItemPickerDemo/build.gradle.kts
@@ -30,17 +30,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
     packaging {
         resources {
@@ -60,7 +60,8 @@ dependencies {
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(libs.kotlinx.collections.immutable)
-    implementation(project(":jcitempicker"))
+    implementation(project(":JCNumberPicker"))
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/JCItemPickerDemo/src/main/java/com/udaysravank/jetpackcomposenumberpicker/MainActivity.kt b/JCItemPickerDemo/src/main/java/com/udaysravank/jetpackcomposenumberpicker/MainActivity.kt
index 5e733dd..5658c35 100644
--- a/JCItemPickerDemo/src/main/java/com/udaysravank/jetpackcomposenumberpicker/MainActivity.kt
+++ b/JCItemPickerDemo/src/main/java/com/udaysravank/jetpackcomposenumberpicker/MainActivity.kt
@@ -28,12 +28,13 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.udaysravank.numberpicker.ItemData
-import com.udaysravank.numberpicker.ItemPicker
-import com.udaysravank.numberpicker.NumberPicker
 import com.udaysravank.jetpackcomposenumberpicker.ui.theme.JetpackComposeNumberPickerTheme
+import com.usk.jcnumberpicker.ItemData
+import com.usk.jcnumberpicker.ItemPicker
+import com.usk.jcnumberpicker.NumberPicker
 import kotlinx.collections.immutable.toImmutableList
 
 class MainActivity : ComponentActivity() {
@@ -90,20 +91,20 @@ fun DatePicker(){
         horizontalArrangement = Arrangement.SpaceEvenly
     ) {
         NumberPicker(
-            modifier = Modifier.weight(1f),
-            range = (0..31),
-            value = 23,
-        ) {}
-        ItemPicker(
-            modifier = Modifier.weight(1f),
-            items = months,
-            value = months[5],
-        ) {}
-        NumberPicker(
-            modifier = Modifier.weight(1f),
-            range = (1900..2024),
-            value = 1990,
+          modifier = Modifier.weight(1f),
+          range = (0..31),
+          value = 23,
         ) {}
+      ItemPicker(
+        modifier = Modifier.weight(1f),
+        items = months,
+        value = months[5],
+      ) {}
+      NumberPicker(
+        modifier = Modifier.weight(1f),
+        range = (1900..2024),
+        value = 1990,
+      ) {}
     }
 }
 
@@ -136,53 +137,60 @@ fun ItemPickerDemoComponent(modifier: Modifier = Modifier) {
             HorizontalDivider(Modifier.padding(vertical = 16.dp))
             Text(text = "Month Picker")
             Row(modifier = Modifier.padding(16.dp), horizontalArrangement = Arrangement.Center) {
-                ItemPicker(
-                    items = months,
-                    value = months[4],
-                    dividerHeight = 2.dp,
-                    itemHeight = 100.dp,
-                    overlayTopItemModifier = Modifier.background(Brush.verticalGradient(listOf(
-                        Color.Green,
-                        Color.Transparent,
-                    ))),
-                    overlayMiddleItemModifier = Modifier.background(Color.Transparent),
-                    overlayBottomItemModifier = Modifier.background(Brush.verticalGradient(listOf(
-                        Color.Transparent,
-                        Color.Yellow,
-                    ))),
-                ) {}
+              ItemPicker(
+                items = months,
+                value = months[4],
+                dividerHeight = 2.dp,
+                itemHeight = 100.dp,
+                overlayTopItemModifier = Modifier.background(
+                  Brush.verticalGradient(
+                    listOf(
+                      Color.Green,
+                      Color.Transparent,
+                    )
+                  )
+                ),
+                overlayMiddleItemModifier = Modifier.background(Color.Transparent),
+                overlayBottomItemModifier = Modifier.background(
+                  Brush.verticalGradient(
+                    listOf(
+                      Color.Transparent,
+                      Color.Yellow,
+                    )
+                  )
+                ),
+              ) {}
             }
             HorizontalDivider(Modifier.padding(vertical = 16.dp))
             Text(text = "Year Picker")
             Row(modifier = Modifier.padding(16.dp), horizontalArrangement = Arrangement.Center) {
-                NumberPicker(
-                    modifier = Modifier.width(100.dp),
-                    range = 1900..2100,
-                    value = 2023,
-                    dividerColor = Color.Transparent,
-                ) {}
+              NumberPicker(
+                modifier = Modifier.width(100.dp),
+                range = 1900..2100,
+                value = 2023,
+                dividerColor = Color.Transparent,
+              ) {}
             }
             HorizontalDivider(Modifier.padding(vertical = 16.dp))
             Text(text = "Gift Picker")
             Row(modifier = Modifier.padding(16.dp), horizontalArrangement = Arrangement.Center) {
-                ItemPicker(
-                    modifier = Modifier.width(120.dp ),
-                    items = gifts.toImmutableList(),
-                    value = luckyGift.value,
-                    itemContent = { data ->
-                        Gem(
-                            modifier = Modifier.size(72.dp),
-                            text = ""
-                        )
-                    },
-                    itemHeight = 120.dp,
-                    dividerHeight = 3.dp,
-                    overlayTopItemModifier = Modifier.background(Color.Transparent),
-                    overlayBottomItemModifier = Modifier.background(Color.Transparent),
-                    overlayMiddleItemModifier = Modifier.background(Color.Transparent),
-                ) { selectedGift ->
-                    luckyGift.value = gifts.first { selectedGift.uniqueId() == it.uniqueId() }
-                }
+              ItemPicker(
+                modifier = Modifier.width(120.dp),
+                items = gifts.toImmutableList(),
+                value = luckyGift.value,
+                itemContent = { _ ->
+                  Gem(
+                    modifier = Modifier.size(72.dp),
+                  )
+                },
+                itemHeight = 120.dp,
+                dividerHeight = 3.dp,
+                overlayTopItemModifier = Modifier.background(Color.Transparent),
+                overlayBottomItemModifier = Modifier.background(Color.Transparent),
+                overlayMiddleItemModifier = Modifier.background(Color.Transparent),
+              ) { selectedGift ->
+                luckyGift.value = gifts.first { selectedGift.uniqueId() == it.uniqueId() }
+              }
             }
             Text(text = "Selected gift worth is ${luckyGift.value.giftValueInDollars}")
         }
@@ -192,7 +200,6 @@ fun ItemPickerDemoComponent(modifier: Modifier = Modifier) {
 @Composable
 fun Gem(
     modifier: Modifier = Modifier,
-    text: String,
 ) {
     Box(
         modifier = modifier
@@ -206,4 +213,12 @@ fun Gem(
     ) {
         Text(text = "🎁", style = TextStyle.Default.copy(fontSize = 32.sp))
     }
+}
+
+@Preview
+@Composable
+fun DatePickerPreview() {
+    JetpackComposeNumberPickerTheme {
+        DatePicker()
+    }
 }
\ No newline at end of file
diff --git a/JCItemPickerDemo/src/test/java/com/udaysravank/jetpackcomposenumberpicker/ExampleUnitTest.kt b/JCItemPickerDemo/src/test/java/com/udaysravank/jetpackcomposenumberpicker/ExampleUnitTest.kt
index 48f3590..e48df51 100644
--- a/JCItemPickerDemo/src/test/java/com/udaysravank/jetpackcomposenumberpicker/ExampleUnitTest.kt
+++ b/JCItemPickerDemo/src/test/java/com/udaysravank/jetpackcomposenumberpicker/ExampleUnitTest.kt
@@ -12,6 +12,6 @@ import org.junit.Assert.*
 class ExampleUnitTest {
     @Test
     fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
+        assertEquals(4, 2+2)
     }
 }
\ No newline at end of file
diff --git a/jcitempicker/.gitignore b/JCNumberPicker/.gitignore
similarity index 100%
rename from jcitempicker/.gitignore
rename to JCNumberPicker/.gitignore
diff --git a/JCNumberPicker/build.gradle.kts b/JCNumberPicker/build.gradle.kts
new file mode 100644
index 0000000..c1ef063
--- /dev/null
+++ b/JCNumberPicker/build.gradle.kts
@@ -0,0 +1,54 @@
+plugins {
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.jetbrains.kotlin.android)
+}
+
+android {
+  namespace = "com.usk.jcnumberpicker"
+  compileSdk = 34
+
+  defaultConfig {
+    minSdk = 24
+
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    consumerProguardFiles("consumer-rules.pro")
+  }
+
+  buildTypes {
+    release {
+      isMinifyEnabled = false
+      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+    }
+  }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+  kotlinOptions {
+    jvmTarget = "1.8"
+  }
+  buildFeatures {
+    compose = true
+  }
+  composeOptions {
+    kotlinCompilerExtensionVersion = "1.5.14"
+  }
+}
+
+dependencies {
+
+  implementation(libs.androidx.core.ktx)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.material)
+  implementation(libs.ui)
+  implementation(libs.androidx.material)
+  implementation(libs.androidx.runtime)
+  implementation(libs.androidx.compiler)
+  implementation(libs.kotlinx.collections.immutable)
+  implementation(libs.androidx.ui.tooling.preview)
+
+  testImplementation(libs.junit)
+  androidTestImplementation(libs.androidx.junit)
+  androidTestImplementation(libs.androidx.espresso.core)
+  debugImplementation(libs.ui.tooling.preview)
+}
\ No newline at end of file
diff --git a/jcitempicker/consumer-rules.pro b/JCNumberPicker/consumer-rules.pro
similarity index 100%
rename from jcitempicker/consumer-rules.pro
rename to JCNumberPicker/consumer-rules.pro
diff --git a/jcitempicker/proguard-rules.pro b/JCNumberPicker/proguard-rules.pro
similarity index 100%
rename from jcitempicker/proguard-rules.pro
rename to JCNumberPicker/proguard-rules.pro
diff --git a/jcitempicker/src/androidTest/java/com/udaysravank/numberpicker/ExampleInstrumentedTest.kt b/JCNumberPicker/src/androidTest/java/com/usk/jcnumberpicker/ExampleInstrumentedTest.kt
similarity index 58%
rename from jcitempicker/src/androidTest/java/com/udaysravank/numberpicker/ExampleInstrumentedTest.kt
rename to JCNumberPicker/src/androidTest/java/com/usk/jcnumberpicker/ExampleInstrumentedTest.kt
index fc4fff0..432f612 100644
--- a/jcitempicker/src/androidTest/java/com/udaysravank/numberpicker/ExampleInstrumentedTest.kt
+++ b/JCNumberPicker/src/androidTest/java/com/usk/jcnumberpicker/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -15,10 +15,10 @@ import org.junit.Assert.*
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.udaysravank.jcitempicker.test", appContext.packageName)
-    }
+  @Test
+  fun useAppContext() {
+    // Context of the app under test.
+    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+    assertEquals("com.usk.jcnumberpicker.test", appContext.packageName)
+  }
 }
\ No newline at end of file
diff --git a/jcitempicker/src/main/AndroidManifest.xml b/JCNumberPicker/src/main/AndroidManifest.xml
similarity index 100%
rename from jcitempicker/src/main/AndroidManifest.xml
rename to JCNumberPicker/src/main/AndroidManifest.xml
diff --git a/jcitempicker/src/main/java/com/udaysravank/numberpicker/Constants.kt b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/Constants.kt
similarity index 83%
rename from jcitempicker/src/main/java/com/udaysravank/numberpicker/Constants.kt
rename to JCNumberPicker/src/main/java/com/usk/jcnumberpicker/Constants.kt
index 70f8d07..1444e4c 100644
--- a/jcitempicker/src/main/java/com/udaysravank/numberpicker/Constants.kt
+++ b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/Constants.kt
@@ -1,4 +1,4 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemData.kt b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemData.kt
similarity index 88%
rename from jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemData.kt
rename to JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemData.kt
index 0de60d5..fa7c7a9 100644
--- a/jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemData.kt
+++ b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemData.kt
@@ -1,4 +1,4 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 /**
  * Interface to enforce the must have methods in the data class provided for a list item in the ItemPicker.
diff --git a/jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemPicker.kt b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemPicker.kt
similarity index 90%
rename from jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemPicker.kt
rename to JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemPicker.kt
index ea0d979..d295f2d 100644
--- a/jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemPicker.kt
+++ b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemPicker.kt
@@ -1,4 +1,4 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -35,7 +35,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.udaysravank.numberpicker.PreviewData.itemsList
+import com.usk.jcnumberpicker.PreviewData.itemsList
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -64,19 +64,19 @@ import kotlinx.coroutines.launch
  */
 @Composable
 fun ItemPicker(
-    items: ImmutableList<String>,
-    modifier: Modifier = Modifier,
-    value: String = items.first(),
-    dividerHeight: Dp = DEFAULT_SEPARATOR_HEIGHT.dp,
-    dividerColor: Color = Color.Red,
-    selectedItemContentDescription: String = "",
-    scrollContainerContentDescription: String = "",
-    itemHeight: Dp = DEFAULT_ITEM_HEIGHT.dp,
-    itemContent: (@Composable (itemData: ItemData) -> Unit)? = null,
-    overlayTopItemModifier: Modifier? = null,
-    overlayMiddleItemModifier: Modifier? = null,
-    overlayBottomItemModifier: Modifier? = null,
-    onValueChange: (String) -> Unit = {},
+  items: ImmutableList<String>,
+  modifier: Modifier = Modifier,
+  value: String = items.first(),
+  dividerHeight: Dp = DEFAULT_SEPARATOR_HEIGHT.dp,
+  dividerColor: Color = Color.Red,
+  selectedItemContentDescription: String = "",
+  scrollContainerContentDescription: String = "",
+  itemHeight: Dp = DEFAULT_ITEM_HEIGHT.dp,
+  itemContent: (@Composable (itemData: ItemData) -> Unit)? = null,
+  overlayTopItemModifier: Modifier? = null,
+  overlayMiddleItemModifier: Modifier? = null,
+  overlayBottomItemModifier: Modifier? = null,
+  onValueChange: (String) -> Unit = {},
 ) {
     val itemDataList = remember(items) {
         items.map {
@@ -132,19 +132,19 @@ fun ItemPicker(
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ItemPicker(
-    items: ImmutableList<ItemData>,
-    modifier: Modifier = Modifier,
-    value: ItemData = items.first(),
-    dividerHeight: Dp = DEFAULT_SEPARATOR_HEIGHT.dp,
-    dividerColor: Color = Color.Red,
-    selectedItemContentDescription: String = "",
-    scrollContainerContentDescription: String = "",
-    itemHeight: Dp = DEFAULT_ITEM_HEIGHT.dp,
-    itemContent: (@Composable (itemData: ItemData) -> Unit)? = null,
-    overlayTopItemModifier: Modifier? = null,
-    overlayMiddleItemModifier: Modifier? = null,
-    overlayBottomItemModifier: Modifier? = null,
-    onValueChange: (ItemData) -> Unit = {},
+  items: ImmutableList<ItemData>,
+  modifier: Modifier = Modifier,
+  value: ItemData = items.first(),
+  dividerHeight: Dp = DEFAULT_SEPARATOR_HEIGHT.dp,
+  dividerColor: Color = Color.Red,
+  selectedItemContentDescription: String = "",
+  scrollContainerContentDescription: String = "",
+  itemHeight: Dp = DEFAULT_ITEM_HEIGHT.dp,
+  itemContent: (@Composable (itemData: ItemData) -> Unit)? = null,
+  overlayTopItemModifier: Modifier? = null,
+  overlayMiddleItemModifier: Modifier? = null,
+  overlayBottomItemModifier: Modifier? = null,
+  onValueChange: (ItemData) -> Unit = {},
 ) {
     val numberOfItemsToVisibleInTheList = 3 // Like the standard NumberPicker, we have considered showing only 3 items from the list at a time
     val containerHeight = itemHeight * numberOfItemsToVisibleInTheList + dividerHeight * 2
@@ -335,10 +335,10 @@ private fun OverlayLayoutPreview() {
 
 @Composable
 private fun ItemView(
-    itemData: ItemData,
-    listItemHeight: Dp,
-    modifier: Modifier,
-    content: (@Composable (itemData: ItemData) -> Unit)? = null,
+  itemData: ItemData,
+  listItemHeight: Dp,
+  modifier: Modifier,
+  content: (@Composable (itemData: ItemData) -> Unit)? = null,
 ) {
     Row(
         modifier = modifier
diff --git a/jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemPickerHelper.kt b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemPickerHelper.kt
similarity index 95%
rename from jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemPickerHelper.kt
rename to JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemPickerHelper.kt
index b89d1b3..55aef7e 100644
--- a/jcitempicker/src/main/java/com/udaysravank/numberpicker/ItemPickerHelper.kt
+++ b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/ItemPickerHelper.kt
@@ -1,4 +1,4 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 import kotlinx.collections.immutable.ImmutableList
 
@@ -48,9 +48,9 @@ import kotlinx.collections.immutable.ImmutableList
  * ```
  */
 internal fun determineTheSelectedItem(
-    offset: Int,
-    position: Int,
-    items: ImmutableList<ItemData>,
+  offset: Int,
+  position: Int,
+  items: ImmutableList<ItemData>,
 ) = if (offset == 0 && position == 0) { getSelectedItem(0, items) } // Case 1
 else if (offset == 0 && position == 1) { getSelectedItem(1, items) } // Case 2
 else if (offset > 0 && position == 0) { getSelectedItem(1, items) } // Case 4
diff --git a/jcitempicker/src/main/java/com/udaysravank/numberpicker/NumberPicker.kt b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/NumberPicker.kt
similarity index 97%
rename from jcitempicker/src/main/java/com/udaysravank/numberpicker/NumberPicker.kt
rename to JCNumberPicker/src/main/java/com/usk/jcnumberpicker/NumberPicker.kt
index 48f40bf..460b390 100644
--- a/jcitempicker/src/main/java/com/udaysravank/numberpicker/NumberPicker.kt
+++ b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/NumberPicker.kt
@@ -1,9 +1,8 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
diff --git a/jcitempicker/src/main/java/com/udaysravank/numberpicker/PreviewData.kt b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/PreviewData.kt
similarity index 54%
rename from jcitempicker/src/main/java/com/udaysravank/numberpicker/PreviewData.kt
rename to JCNumberPicker/src/main/java/com/usk/jcnumberpicker/PreviewData.kt
index b20fec9..38c0000 100644
--- a/jcitempicker/src/main/java/com/udaysravank/numberpicker/PreviewData.kt
+++ b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/PreviewData.kt
@@ -1,4 +1,4 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 import kotlinx.collections.immutable.toImmutableList
 
@@ -6,8 +6,9 @@ object PreviewData {
   val itemsList = listOf("one", "two", "three", "four", "five", "six", "seven").map {
     TestItemData(it)
   }.toImmutableList()
-  class TestItemData(private val txt: String) : ItemData() {
-    override fun uniqueId()= txt
-    override fun itemText() = txt
-  }
+}
+
+class TestItemData(private val txt: String) : ItemData() {
+  override fun uniqueId()= txt
+  override fun itemText() = txt
 }
\ No newline at end of file
diff --git a/jcitempicker/src/main/java/com/udaysravank/numberpicker/Previews.kt b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/Previews.kt
similarity index 98%
rename from jcitempicker/src/main/java/com/udaysravank/numberpicker/Previews.kt
rename to JCNumberPicker/src/main/java/com/usk/jcnumberpicker/Previews.kt
index 5389941..b82d2e1 100644
--- a/jcitempicker/src/main/java/com/udaysravank/numberpicker/Previews.kt
+++ b/JCNumberPicker/src/main/java/com/usk/jcnumberpicker/Previews.kt
@@ -1,4 +1,4 @@
-package com.udaysravank.numberpicker
+package com.usk.jcnumberpicker
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
diff --git a/JCNumberPicker/src/test/java/com/usk/jcnumberpicker/ItemPickerHelperTest.kt b/JCNumberPicker/src/test/java/com/usk/jcnumberpicker/ItemPickerHelperTest.kt
new file mode 100644
index 0000000..a6f8992
--- /dev/null
+++ b/JCNumberPicker/src/test/java/com/usk/jcnumberpicker/ItemPickerHelperTest.kt
@@ -0,0 +1,31 @@
+package com.usk.jcnumberpicker
+
+import kotlinx.collections.immutable.toImmutableList
+import org.junit.Test
+
+import org.junit.Assert.assertEquals
+
+class ItemPickerHelperTest {
+
+    private val testList = listOf("one", "two", "three").map {
+        TestItemData(it)
+    }.toImmutableList()
+
+    class TestItemData(private val txt: String) : ItemData() {
+        override fun uniqueId()= txt
+        override fun itemText() = txt
+    }
+
+    @Test
+    fun `Case 1 - get first item from the list as selected item`() {
+        // Execute
+        val result = determineTheSelectedItem(
+            offset = 0,
+            position = 0,
+            items = testList
+        )
+
+        // Verify
+        assertEquals(testList.first(), result)
+    }
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 99ecf6c..e9ee906 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.5.0-alpha06"
-kotlin = "1.9.0"
+agp = "8.4.0"
+kotlin = "1.9.24"
 coreKtx = "1.13.0"
 junit = "4.13.2"
 junitVersion = "1.1.5"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 26159ce..c15bf2b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun Apr 21 23:44:33 EDT 2024
+#Fri May 17 21:48:43 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
diff --git a/jcitempicker/build.gradle.kts b/jcitempicker/build.gradle.kts
deleted file mode 100644
index 1b49b12..0000000
--- a/jcitempicker/build.gradle.kts
+++ /dev/null
@@ -1,59 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.jetbrains.kotlin.android)
-}
-
-android {
-    namespace = "com.udaysravank.jcitempicker"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 24
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
-    }
-}
-
-dependencies {
-
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
-    implementation(libs.ui)
-    implementation(libs.androidx.material)
-    implementation(libs.androidx.runtime)
-    implementation(libs.androidx.compiler)
-    implementation(libs.kotlinx.collections.immutable)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    debugImplementation(libs.ui.tooling.preview)
-}
\ No newline at end of file
diff --git a/jcitempicker/src/test/java/com/udaysravank/numberpicker/ItemPickerHelperTest.kt b/jcitempicker/src/test/java/com/udaysravank/numberpicker/ItemPickerHelperTest.kt
deleted file mode 100644
index 1468c06..0000000
--- a/jcitempicker/src/test/java/com/udaysravank/numberpicker/ItemPickerHelperTest.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.udaysravank.numberpicker
-
-import com.udaysravank.numberpicker.PreviewData.itemsList
-import kotlinx.collections.immutable.toImmutableList
-import org.junit.Test
-
-import org.junit.Assert.*
-
-class ItemPickerHelperTest {
-
-    private val testList = itemsList.take(3).toImmutableList()
-
-    @Test
-    fun `Case 1 - get first item from the list as selected item`() {
-        // Execute
-        val result = determineTheSelectedItem(
-            offset = 0,
-            position = 0,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList.first(), result)
-    }
-
-    @Test
-    fun `Case 2 - get second item from the list as selected item`() {
-        // Execute
-        val result = determineTheSelectedItem(
-            offset = 0,
-            position = 1,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[1], result)
-    }
-
-    @Test
-    fun `Case 2 - get last but one item from the list as selected item`() {
-        // Execute
-        val positionOfLastButOne = testList.size - 2 // position 1
-        val result = determineTheSelectedItem(
-            offset = 0,
-            position = positionOfLastButOne,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[positionOfLastButOne], result)
-    }
-
-    @Test
-    fun `Case 3 - get the last item from list as selected item`() {
-        // Execute
-        val positionOfLastItem = testList.size - 1 // position 2
-        val result = determineTheSelectedItem(
-            offset = 0,
-            position = positionOfLastItem,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[positionOfLastItem], result)
-    }
-
-    @Test
-    fun `Case 4 - get the second item from list as selected item if position is 0 but offset is grater than 0`() {
-        // Execute
-        val result = determineTheSelectedItem(
-            offset = 1,
-            position = 0,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[1], result)
-    }
-
-    @Test
-    fun `Case 5 - get the last item from list as selected item if position is 1 but offset is grater than 0`() {
-        // Execute
-        val result = determineTheSelectedItem(
-            offset = 1,
-            position = 1,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[2], result)
-    }
-
-    @Test
-    fun `Case 6 - get the last item from list as selected item if position is 2 but offset is grater than 0`() {
-        // Execute
-        val result = determineTheSelectedItem(
-            offset = 1,
-            position = 2,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[2], result)
-    }
-
-    @Test
-    fun `offset can be greater than 1`() {
-        // Execute
-        val result = determineTheSelectedItem(
-            offset = 5,
-            position = 0,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[1], result)
-    }
-
-    @Test
-    fun `return the last item for invalid offset and position combination`() {
-        // Execute
-        val result = determineTheSelectedItem(
-            offset = 5,
-            position = 2,
-            items = testList
-        )
-
-        // Verify
-        assertEquals(testList[2], result)
-    }
-
-}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 98bef09..d9d9f90 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,4 +21,4 @@ dependencyResolutionManagement {
 
 rootProject.name = "JetpackComposeNumberPicker"
 include(":JCItemPickerDemo")
-include(":jcitempicker")
+include(":JCNumberPicker")