diff --git a/.github/workflows/android-ci-generated-artifact.yml b/.github/workflows/android-ci-generated-artifact.yml
index 0ced776..8958dd1 100644
--- a/.github/workflows/android-ci-generated-artifact.yml
+++ b/.github/workflows/android-ci-generated-artifact.yml
@@ -10,8 +10,7 @@ env:
 on:
   # Triggers the workflow on push or pull request events but only for default and protected branches
   workflow_dispatch:
-    # The workflow will be dispatched to the default queue
-    branches: [ master ]
+  # The workflow will be dispatched to the default queue
 
 jobs:
   build:
@@ -19,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       # Set Current Date As Env Variable
       - name: Set current date as env variable
@@ -28,11 +27,13 @@ jobs:
       # Set Repository Name As Env Variable
       - name: Set repository name as env variable
         run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
-      
+
       - name: Set Up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
@@ -59,9 +60,23 @@ jobs:
         run: ./gradlew ${{ env.main_project_module }}:bundleRelease
 
       # Upload Artifact Build
+      # Noted For Output [main_project_module]/build/outputs/apk/debug/
+      - name: Upload APK Debug - ${{ env.repository_name }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
+          path: ${{ env.main_project_module }}/build/outputs/apk/debug/
+
+      # Noted For Output [main_project_module]/build/outputs/apk/release/
+      - name: Upload APK Release - ${{ env.repository_name }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated
+          path: ${{ env.main_project_module }}/build/outputs/apk/release/
+
       # Noted For Output [main_project_module]/build/outputs/bundle/release/
       - name: Upload AAB (App Bundle) Release - ${{ env.repository_name }}
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
-          path: ${{ env.main_project_module }}/build/outputs/bundle/release/
+          path: ${{ env.main_project_module }}/build/outputs/bundle/release/
\ No newline at end of file
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 383ec64..40753e7 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -15,8 +15,7 @@ on:
     branches: [ master ]
 
   workflow_dispatch:
-    # The workflow will be dispatched to the default queue
-    branches: [ master ]
+  # The workflow will be dispatched to the default queue
 
 jobs:
   build:
@@ -24,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       # Set Current Date As Env Variable
       - name: Set current date as env variable
@@ -33,11 +32,13 @@ jobs:
       # Set Repository Name As Env Variable
       - name: Set repository name as env variable
         run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
-      
+
       - name: Set Up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
diff --git a/README.md b/README.md
index e7f85f7..33a9862 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![ScreenShoot Apps](https://raw.githubusercontent.com/frogobox/frogo-ui/master/docs/image/ss_banner.png?raw=true)
+[![ScreenShoot Apps](https://raw.githubusercontent.com/frogobox/frogo-ui/master/docs/image/ss_banner.png?raw=true)
 
 ## About This Project (release 👷🔧️👷‍♀️⛏)
 [![](https://jitpack.io/v/frogobox/frogo-ui.svg?style=flat-square)](https://jitpack.io/#frogobox/frogo-ui)
@@ -20,7 +20,7 @@
 ## Version Release
 This Is Latest Release
 
-    $version_release = 1.1.6
+    $version_release = 1.1.7
 
 What's New??
 
@@ -79,14 +79,20 @@ allprojects {
 
     dependencies {
         // library frogo-ui
-        implementation 'com.github.frogobox:frogo-ui:1.1.6'
+        implementation 'com.github.frogobox:frogo-ui:1.1.7'
+
+        // library frogo-ui for desktop
+        implementation 'com.github.frogobox.frogo-ui:core-ui:1.1.7'
     }
 
 #### <Option 2> Kotlin DSL Gradle
 
     dependencies {
         // library frogo-ui
-        implementation("com.github.frogobox:frogo-ui:1.1.6")
+        implementation("com.github.frogobox:frogo-ui:1.1.7")
+
+        // library frogo-ui for desktop
+        implementation("com.github.frogobox.frogo-ui:core-ui:1.1.7")
     }
 
 ## Documentation
@@ -132,73 +138,73 @@ FrogoAnimation().apply {
 
 To animate the view, add the class name and specific animation method name`setAnimation` to an view. You can include the method `setDuration` to specify duration of animation. Default value for `duration` is `1000 Milliseconds`. Finally you need to add one of the following classes to the view:
 
-| Class Name  |             |             |             |             |             |		  |
-| ----------- | ----------- | ----------- | ----------- | ----------- | ----------- | ----------- |
-| `Attention` | `Bounce`    | `Fade`      | `Flip   `   | `Rotate`    | `Slide`     | `Zoom`      |
+| Class Name  |          |        |           |          |         | 		     |
+|-------------|----------|--------|-----------|----------|---------|--------|
+| `Attention` | `Bounce` | `Fade` | `Flip   ` | `Rotate` | `Slide` | `Zoom` |
 
 ### Attention
 
-| `Attention`       |                    |  		      |                    |
-| ----------------- | ------------------ | ------------------ | ------------------ |
-| `Bounce`|<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/1-attention-bounce.c6335f3d.gif">| `Flash`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/2-attention-flash.27fb56e5.gif">|
-| `Pulse`           |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/3-attention-pulse.ee6d1fae.gif">| `Ruberband`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/4-attention-ruberband.a701fa5b.gif">|
-| `Shake`           |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/5-attention-shake.62d9243a.gif">| `Standup`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/6-attention-standup.553e1945.gif">|
-| `Swing`           |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/7-attention-swing.602dd7aa.gif">| `Tada`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/8-attention-tada.faa9f3c1.gif">|
-| `Wave`            |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/9-attention-wave.9a37979d.gif">| `Wobble`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/10-attention-wobble.42ac8c56.gif">|
+| `Attention` |                                                                                                                                           | 		          |                                                                                                                                              |
+|-------------|-------------------------------------------------------------------------------------------------------------------------------------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------|
+| `Bounce`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/1-attention-bounce.c6335f3d.gif"> | `Flash`     | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/2-attention-flash.27fb56e5.gif">     |
+| `Pulse`     | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/3-attention-pulse.ee6d1fae.gif">  | `Ruberband` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/4-attention-ruberband.a701fa5b.gif"> |
+| `Shake`     | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/5-attention-shake.62d9243a.gif">  | `Standup`   | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/6-attention-standup.553e1945.gif">   |
+| `Swing`     | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/7-attention-swing.602dd7aa.gif">  | `Tada`      | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/8-attention-tada.faa9f3c1.gif">      |
+| `Wave`      | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/9-attention-wave.9a37979d.gif">   | `Wobble`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/10-attention-wobble.42ac8c56.gif">   |
 
 ### Bounce
 
-| `Bounce`	    |                    |       	      |                    |
-| ----------------- | ------------------ | ------------------ | ------------------ |
-| `InDown`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/15-bounce-in-down.6aad1cbd.gif">| `InUp`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/13-bounce-in-up.7a1d7c17.gif">|
-| `InLeft`           |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/11-bounce-in-left.ebc9bc0f.gif">| `InRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/12-bounce-in-right.a66d3b31.gif">|
-| `In`           |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/14-bounce-in.2ef584a6.gif">	|		|		|
+| `Bounce`	 |                                                                                                                                          | 	         |                                                                                                                                           |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------------|
+| `InDown`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/15-bounce-in-down.6aad1cbd.gif"> | `InUp`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/13-bounce-in-up.7a1d7c17.gif">    |
+| `InLeft`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/11-bounce-in-left.ebc9bc0f.gif"> | `InRight` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/12-bounce-in-right.a66d3b31.gif"> |
+| `In`      | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/14-bounce-in.2ef584a6.gif">	     | 		        | 		                                                                                                                                        |
 
 ### Fade
 
-| `Fade`            |                    |                    |                    |
-| ----------------- | ------------------ | ------------------ | ------------------ |
-| `InDown`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/18-fade-in-down.24e645e6.gif">| `InUp`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/19-fade-in-up.a2b79fa7.gif">|
-| `InLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/16-fade-in-left.6e93da17.gif">| `InRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/17-fade-in-right.59345f8c.gif">|
-| `OutDown`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/22-fade-out-down.4f4ebc27.gif">| `OutUp`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/25-fade-out-up.75f60e2d.gif">|
-| `OutLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/20-fade-out-left.7f1583e0.gif">| `OutRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/21-fade-out-right.ff6adf09.gif">|
-| `In`               |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/23-fade-in.532822b1.gif">| `Out`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/24-fade-out.a3ee0d3a.gif">|
+| `Fade`    |                                                                                                                                         |            |                                                                                                                                          |
+|-----------|-----------------------------------------------------------------------------------------------------------------------------------------|------------|------------------------------------------------------------------------------------------------------------------------------------------|
+| `InDown`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/18-fade-in-down.24e645e6.gif">  | `InUp`     | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/19-fade-in-up.a2b79fa7.gif">     |
+| `InLeft`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/16-fade-in-left.6e93da17.gif">  | `InRight`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/17-fade-in-right.59345f8c.gif">  |
+| `OutDown` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/22-fade-out-down.4f4ebc27.gif"> | `OutUp`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/25-fade-out-up.75f60e2d.gif">    |
+| `OutLeft` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/20-fade-out-left.7f1583e0.gif"> | `OutRight` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/21-fade-out-right.ff6adf09.gif"> |
+| `In`      | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/23-fade-in.532822b1.gif">       | `Out`      | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/24-fade-out.a3ee0d3a.gif">       |
 
 ### Flip
 
-| `Flip`            |                    |                    |                    |
-| ----------------- | ------------------ | ------------------ | ------------------ |
-| `InX`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/26-flip-in-x.1de9f264.gif">| `InY`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/27-flip-in-y.8f45c5e1.gif">|
-| `OutX`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/28-flip-out-x.09be8ac3.gif">| `OutY`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/29-flip-out-y.f5c532a8.gif">|
+| `Flip` |                                                                                                                                      |        |                                                                                                                                      |
+|--------|--------------------------------------------------------------------------------------------------------------------------------------|--------|--------------------------------------------------------------------------------------------------------------------------------------|
+| `InX`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/26-flip-in-x.1de9f264.gif">  | `InY`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/27-flip-in-y.8f45c5e1.gif">  |
+| `OutX` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/28-flip-out-x.09be8ac3.gif"> | `OutY` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/29-flip-out-y.f5c532a8.gif"> |
 
 ### Rotate
 
-| `Rotate`          |                    |                    |                    |
-| ----------------- | ------------------ | ------------------ | ------------------ |
-| `InDownLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/30-rotate-in-down-left.cdd124aa.gif">| `InDownRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/31-rotate-in-down-right.f0693f8b.gif">|
-| `InUpLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/32-rotate-in-up-left.f818146d.gif">| `InUpRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/33-rotate-in-up-right.537606e2.gif">|
-| `OutDownLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/34-rotate-out-down-left.de06d895.gif">| `OutDownRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/35-rotate-out-down-right.f4505ac5.gif">|
-| `OutUpLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/39-rotate-up-left.de13c028.gif">| `OutUpRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/36-rotate-out-up-right.ddb7df75.gif">|
-| `In`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/37-rotate-in.08924c36.gif">| `Out`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/38-rotate-out.b127d7a8.gif">|
+| `Rotate`      |                                                                                                                                                |                |                                                                                                                                                 |
+|---------------|------------------------------------------------------------------------------------------------------------------------------------------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------|
+| `InDownLeft`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/30-rotate-in-down-left.cdd124aa.gif">  | `InDownRight`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/31-rotate-in-down-right.f0693f8b.gif">  |
+| `InUpLeft`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/32-rotate-in-up-left.f818146d.gif">    | `InUpRight`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/33-rotate-in-up-right.537606e2.gif">    |
+| `OutDownLeft` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/34-rotate-out-down-left.de06d895.gif"> | `OutDownRight` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/35-rotate-out-down-right.f4505ac5.gif"> |
+| `OutUpLeft`   | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/39-rotate-up-left.de13c028.gif">       | `OutUpRight`   | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/36-rotate-out-up-right.ddb7df75.gif">   |
+| `In`          | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/37-rotate-in.08924c36.gif">            | `Out`          | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/38-rotate-out.b127d7a8.gif">            |
 
 ### Slide
 
-| `Slide`           |                    |                    |                    |
-| ----------------- | ------------------ | ------------------ | ------------------ |
-| `InDown`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/40-slide-in-down.efa18709.gif">| `InUp`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/43-slide-in-up.0f918432.gif">|
-| `InLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/41-slide-in-left.da5a9127.gif">| `InRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/42-slide-in-right.f0e33c31.gif">|
-| `OutDown`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/44-slide-out-down.269616ff.gif">| `OutUp`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/47-slide-out-up.7efa439e.gif">|
-| `OutLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/45-slide-out-left.4226eca7.gif">| `OutRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/46-slide-out-right.f283b64b.gif">|
+| `Slide`   |                                                                                                                                          |            |                                                                                                                                           |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------|
+| `InDown`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/40-slide-in-down.efa18709.gif">  | `InUp`     | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/43-slide-in-up.0f918432.gif">     |
+| `InLeft`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/41-slide-in-left.da5a9127.gif">  | `InRight`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/42-slide-in-right.f0e33c31.gif">  |
+| `OutDown` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/44-slide-out-down.269616ff.gif"> | `OutUp`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/47-slide-out-up.7efa439e.gif">    |
+| `OutLeft` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/45-slide-out-left.4226eca7.gif"> | `OutRight` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/46-slide-out-right.f283b64b.gif"> |
 
 ### Zoom
 
-| `Zoom`            |                    |                    |                    |
-| ----------------- | ------------------ | ------------------ | ------------------ |
-| `InDown`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/48-zoom-in-down.6e41a799.gif">| `InUp`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/51-zoom-in-up.40e3a26e.gif">|
-| `InLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/49-zoom-in-left.82604bb4.gif">| `InRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/50-zoom-in-right.a419ab92.gif">|
-| `OutDown`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/52-zoom-out-down.cb3ee254.gif">| `OutUp`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/57-zoom-out-up.0c74d038.gif">|
-| `OutLeft`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/53-zoom-out-left.79cb419d.gif">| `OutRight`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/54-zoom-out-right.7a3ac74d.gif">|
-| `In`          |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/55-zoom-in.1c0c5d5a.gif">| `Out`              |<img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/56-zoom-out.f0c52b21.gif">|
+| `Zoom`    |                                                                                                                                         |            |                                                                                                                                          |
+|-----------|-----------------------------------------------------------------------------------------------------------------------------------------|------------|------------------------------------------------------------------------------------------------------------------------------------------|
+| `InDown`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/48-zoom-in-down.6e41a799.gif">  | `InUp`     | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/51-zoom-in-up.40e3a26e.gif">     |
+| `InLeft`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/49-zoom-in-left.82604bb4.gif">  | `InRight`  | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/50-zoom-in-right.a419ab92.gif">  |
+| `OutDown` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/52-zoom-out-down.cb3ee254.gif"> | `OutUp`    | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/57-zoom-out-up.0c74d038.gif">    |
+| `OutLeft` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/53-zoom-out-left.79cb419d.gif"> | `OutRight` | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/54-zoom-out-right.7a3ac74d.gif"> |
+| `In`      | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/55-zoom-in.1c0c5d5a.gif">       | `Out`      | <img width="200" alt="portfolio_view" src="https://gayanvoice.github.io/android-animations/static/media/56-zoom-out.f0c52b21.gif">       |
 
 ## FrogoLoadingIndicatorView
 
@@ -297,4 +303,4 @@ Waiting for your contribute
 - Please enjoy and don't forget fork and give a star
 - Don't Forget Follow My Github Account
 
-![ScreenShoot Apps](docs/image/mad_score.png?raw=true)
\ No newline at end of file
+![ScreenShoot Apps](docs/image/mad_score.png?raw=true)]()
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 005f9f4..5596767 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.0.1" apply false
-    id("com.android.library") version "8.0.1" apply false
+    id("com.android.application") version "8.0.2" apply false
+    id("com.android.library") version "8.0.2" apply false
     id("org.jetbrains.kotlin.android") version DependencyGradle.KOTLIN_VERSION apply false
     id("org.jetbrains.kotlin.jvm") version DependencyGradle.KOTLIN_VERSION apply false
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 1c2b856..74a01c3 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,5 +11,5 @@ repositories {
 
 dependencies{
     // library frogo-build-src
-    implementation("com.github.frogobox:open-build-src:2.1.8")
+    implementation("com.github.frogobox:open-build-src:2.1.9")
 }
diff --git a/buildSrc/src/main/kotlin/DependencyGradle.kt b/buildSrc/src/main/kotlin/DependencyGradle.kt
index d612c60..0943b91 100644
--- a/buildSrc/src/main/kotlin/DependencyGradle.kt
+++ b/buildSrc/src/main/kotlin/DependencyGradle.kt
@@ -14,12 +14,12 @@
 object DependencyGradle {
 
     // dependencies version
-    const val KOTLIN_VERSION = "1.8.20"
+    const val KOTLIN_VERSION = Version.JetBrains.kotlin
     const val COMPOSE_MULTIPLATFORM_VERSION = Version.Androidx.composeMultiPlatform
-    const val COMPOSE_VERSION = "1.4.6"
+    const val COMPOSE_VERSION = Version.Androidx.composeCompiler
 
-    const val FROGO_PATH_CORE_UI = ":frogocoreui"
-    const val FROGO_PATH_UI = ":frogoui"
+    const val FROGO_PATH_CORE_UI = ":core-ui"
+    const val FROGO_PATH_UI = ":core-ui-android"
 
     const val FrogoRecyclerView = "com.github.amirisback:frogo-recycler-view:4.3.5"
 
diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt
index f500d20..2f48206 100644
--- a/buildSrc/src/main/kotlin/ProjectSetting.kt
+++ b/buildSrc/src/main/kotlin/ProjectSetting.kt
@@ -29,7 +29,7 @@ object ProjectSetting {
 
     const val VERSION_MAJOR = 1
     const val VERSION_MINOR = 1
-    const val VERSION_PATCH = 6
+    const val VERSION_PATCH = 7
 
     // ---------------------------------------------------------------------------------------------
 
diff --git a/frogocoreui/.gitignore b/core-ui-android/.gitignore
similarity index 100%
rename from frogocoreui/.gitignore
rename to core-ui-android/.gitignore
diff --git a/frogoui/build.gradle.kts b/core-ui-android/build.gradle.kts
similarity index 100%
rename from frogoui/build.gradle.kts
rename to core-ui-android/build.gradle.kts
diff --git a/frogoui/consumer-rules.pro b/core-ui-android/consumer-rules.pro
similarity index 100%
rename from frogoui/consumer-rules.pro
rename to core-ui-android/consumer-rules.pro
diff --git a/frogoui/proguard-rules.pro b/core-ui-android/proguard-rules.pro
similarity index 100%
rename from frogoui/proguard-rules.pro
rename to core-ui-android/proguard-rules.pro
diff --git a/frogoui/src/main/AndroidManifest.xml b/core-ui-android/src/main/AndroidManifest.xml
similarity index 100%
rename from frogoui/src/main/AndroidManifest.xml
rename to core-ui-android/src/main/AndroidManifest.xml
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/FrogoAnimation.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/FrogoAnimation.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/FrogoAnimation.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/FrogoAnimation.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/FrogoSingleAnimation.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/FrogoSingleAnimation.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/FrogoSingleAnimation.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/FrogoSingleAnimation.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/IFrogoAnimation.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/IFrogoAnimation.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/IFrogoAnimation.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/IFrogoAnimation.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/Attention.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/Attention.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/Attention.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/Attention.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/Bounce.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/Bounce.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/Bounce.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/Bounce.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/Fade.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/Fade.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/Fade.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/Fade.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/Flip.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/Flip.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/Flip.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/Flip.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/IAttention.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/IAttention.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/IAttention.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/IAttention.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/IBounce.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/IBounce.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/IBounce.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/IBounce.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/IFade.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/IFade.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/IFade.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/IFade.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/IFlip.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/IFlip.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/IFlip.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/IFlip.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/IRotate.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/IRotate.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/IRotate.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/IRotate.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/ISlide.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/ISlide.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/ISlide.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/ISlide.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/IZoom.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/IZoom.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/IZoom.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/IZoom.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/Rotate.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/Rotate.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/Rotate.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/Rotate.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/Slide.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/Slide.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/Slide.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/Slide.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/core/Zoom.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/core/Zoom.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/core/Zoom.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/core/Zoom.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/animation/util/Constant.kt b/core-ui-android/src/main/java/com/frogobox/ui/animation/util/Constant.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/animation/util/Constant.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/animation/util/Constant.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/compose/DataBuilder.kt b/core-ui-android/src/main/java/com/frogobox/ui/compose/DataBuilder.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/compose/DataBuilder.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/compose/DataBuilder.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/compose/FrogoComposeList.kt b/core-ui-android/src/main/java/com/frogobox/ui/compose/FrogoComposeList.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/compose/FrogoComposeList.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/compose/FrogoComposeList.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/compose/theme/Color.kt b/core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Color.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/compose/theme/Color.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Color.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/compose/theme/Dimens.kt b/core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Dimens.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/compose/theme/Dimens.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Dimens.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/compose/theme/Shape.kt b/core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Shape.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/compose/theme/Shape.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Shape.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/compose/theme/Theme.kt b/core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Theme.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/compose/theme/Theme.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Theme.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/compose/theme/Type.kt b/core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Type.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/compose/theme/Type.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/compose/theme/Type.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/ext/ViewExt.kt b/core-ui-android/src/main/java/com/frogobox/ui/ext/ViewExt.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/ext/ViewExt.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/ext/ViewExt.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/AnimatedParticle.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/AnimatedParticle.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/AnimatedParticle.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/AnimatedParticle.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/Particle.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/Particle.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/Particle.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/Particle.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/ParticleField.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/ParticleField.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/ParticleField.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/ParticleField.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/ParticleSystem.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/ParticleSystem.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/ParticleSystem.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/ParticleSystem.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/AccelerationInitializer.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/AccelerationInitializer.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/AccelerationInitializer.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/AccelerationInitializer.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/ParticleInitializer.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/ParticleInitializer.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/ParticleInitializer.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/ParticleInitializer.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/RotationInitializer.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/RotationInitializer.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/RotationInitializer.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/RotationInitializer.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/RotationSpeedInitializer.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/RotationSpeedInitializer.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/RotationSpeedInitializer.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/RotationSpeedInitializer.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/ScaleInitializer.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/ScaleInitializer.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/ScaleInitializer.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/ScaleInitializer.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/SpeedModuleAndRangeInitializer.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/SpeedModuleAndRangeInitializer.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/SpeedModuleAndRangeInitializer.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/SpeedModuleAndRangeInitializer.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/SpeeddByComponentsInitializer.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/SpeeddByComponentsInitializer.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/initializers/SpeeddByComponentsInitializer.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/initializers/SpeeddByComponentsInitializer.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/AccelerationModifier.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/AccelerationModifier.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/AccelerationModifier.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/AccelerationModifier.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/AlphaModifier.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/AlphaModifier.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/AlphaModifier.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/AlphaModifier.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/ParticleModifier.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/ParticleModifier.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/ParticleModifier.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/ParticleModifier.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/ScaleModifier.kt b/core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/ScaleModifier.kt
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/fireworks/modifiers/ScaleModifier.kt
rename to core-ui-android/src/main/java/com/frogobox/ui/fireworks/modifiers/ScaleModifier.kt
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/FrogoLoadingIndicatorView.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/FrogoLoadingIndicatorView.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/FrogoLoadingIndicatorView.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/FrogoLoadingIndicatorView.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/Indicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/Indicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/Indicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/Indicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallBeatIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallBeatIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallBeatIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallBeatIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateMultipleIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateMultipleIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateMultipleIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotateMultipleIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotatePulseIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotatePulseIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotatePulseIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallClipRotatePulseIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridBeatIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridBeatIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridBeatIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridBeatIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridPulseIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridPulseIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridPulseIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallGridPulseIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseRiseIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseRiseIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseRiseIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseRiseIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseSyncIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseSyncIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseSyncIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallPulseSyncIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallRotateIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallRotateIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallRotateIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallRotateIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleMultipleIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleMultipleIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleMultipleIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleMultipleIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleMultipleIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleMultipleIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleMultipleIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallScaleRippleMultipleIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallSpinFadeLoaderIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallSpinFadeLoaderIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallSpinFadeLoaderIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallSpinFadeLoaderIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallTrianglePathIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallTrianglePathIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallTrianglePathIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallTrianglePathIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagDeflectIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagDeflectIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagDeflectIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagDeflectIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/BallZigZagIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/CubeTransitionIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/CubeTransitionIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/CubeTransitionIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/CubeTransitionIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScaleIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScaleIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScaleIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScaleIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePartyIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePartyIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePartyIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePartyIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutRapidIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutRapidIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutRapidIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineScalePulseOutRapidIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineSpinFadeLoaderIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineSpinFadeLoaderIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineSpinFadeLoaderIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/LineSpinFadeLoaderIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/PacmanIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/PacmanIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/PacmanIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/PacmanIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/SemiCircleSpinIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/SemiCircleSpinIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/SemiCircleSpinIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/SemiCircleSpinIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/SquareSpinIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/SquareSpinIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/SquareSpinIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/SquareSpinIndicator.java
diff --git a/frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/TriangleSkewSpinIndicator.java b/core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/TriangleSkewSpinIndicator.java
similarity index 100%
rename from frogoui/src/main/java/com/frogobox/ui/loadingindicator/indicators/TriangleSkewSpinIndicator.java
rename to core-ui-android/src/main/java/com/frogobox/ui/loadingindicator/indicators/TriangleSkewSpinIndicator.java
diff --git a/frogoui/src/main/res/anim/blink.xml b/core-ui-android/src/main/res/anim/blink.xml
similarity index 100%
rename from frogoui/src/main/res/anim/blink.xml
rename to core-ui-android/src/main/res/anim/blink.xml
diff --git a/frogoui/src/main/res/anim/bounce.xml b/core-ui-android/src/main/res/anim/bounce.xml
similarity index 100%
rename from frogoui/src/main/res/anim/bounce.xml
rename to core-ui-android/src/main/res/anim/bounce.xml
diff --git a/frogoui/src/main/res/anim/card_enter.xml b/core-ui-android/src/main/res/anim/card_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/card_enter.xml
rename to core-ui-android/src/main/res/anim/card_enter.xml
diff --git a/frogoui/src/main/res/anim/card_exit.xml b/core-ui-android/src/main/res/anim/card_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/card_exit.xml
rename to core-ui-android/src/main/res/anim/card_exit.xml
diff --git a/frogoui/src/main/res/anim/diagonal_right_enter.xml b/core-ui-android/src/main/res/anim/diagonal_right_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/diagonal_right_enter.xml
rename to core-ui-android/src/main/res/anim/diagonal_right_enter.xml
diff --git a/frogoui/src/main/res/anim/diagonal_right_exit.xml b/core-ui-android/src/main/res/anim/diagonal_right_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/diagonal_right_exit.xml
rename to core-ui-android/src/main/res/anim/diagonal_right_exit.xml
diff --git a/frogoui/src/main/res/anim/fade_enter.xml b/core-ui-android/src/main/res/anim/fade_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/fade_enter.xml
rename to core-ui-android/src/main/res/anim/fade_enter.xml
diff --git a/frogoui/src/main/res/anim/fade_enter_2.xml b/core-ui-android/src/main/res/anim/fade_enter_2.xml
similarity index 100%
rename from frogoui/src/main/res/anim/fade_enter_2.xml
rename to core-ui-android/src/main/res/anim/fade_enter_2.xml
diff --git a/frogoui/src/main/res/anim/fade_exit.xml b/core-ui-android/src/main/res/anim/fade_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/fade_exit.xml
rename to core-ui-android/src/main/res/anim/fade_exit.xml
diff --git a/frogoui/src/main/res/anim/fade_exit_2.xml b/core-ui-android/src/main/res/anim/fade_exit_2.xml
similarity index 100%
rename from frogoui/src/main/res/anim/fade_exit_2.xml
rename to core-ui-android/src/main/res/anim/fade_exit_2.xml
diff --git a/frogoui/src/main/res/anim/fade_in.xml b/core-ui-android/src/main/res/anim/fade_in.xml
similarity index 100%
rename from frogoui/src/main/res/anim/fade_in.xml
rename to core-ui-android/src/main/res/anim/fade_in.xml
diff --git a/frogoui/src/main/res/anim/fade_out.xml b/core-ui-android/src/main/res/anim/fade_out.xml
similarity index 100%
rename from frogoui/src/main/res/anim/fade_out.xml
rename to core-ui-android/src/main/res/anim/fade_out.xml
diff --git a/frogoui/src/main/res/anim/flip.xml b/core-ui-android/src/main/res/anim/flip.xml
similarity index 100%
rename from frogoui/src/main/res/anim/flip.xml
rename to core-ui-android/src/main/res/anim/flip.xml
diff --git a/frogoui/src/main/res/anim/fly_exit.xml b/core-ui-android/src/main/res/anim/fly_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/fly_exit.xml
rename to core-ui-android/src/main/res/anim/fly_exit.xml
diff --git a/frogoui/src/main/res/anim/in_out_enter.xml b/core-ui-android/src/main/res/anim/in_out_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/in_out_enter.xml
rename to core-ui-android/src/main/res/anim/in_out_enter.xml
diff --git a/frogoui/src/main/res/anim/in_out_exit.xml b/core-ui-android/src/main/res/anim/in_out_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/in_out_exit.xml
rename to core-ui-android/src/main/res/anim/in_out_exit.xml
diff --git a/frogoui/src/main/res/anim/move.xml b/core-ui-android/src/main/res/anim/move.xml
similarity index 100%
rename from frogoui/src/main/res/anim/move.xml
rename to core-ui-android/src/main/res/anim/move.xml
diff --git a/frogoui/src/main/res/anim/rotate.xml b/core-ui-android/src/main/res/anim/rotate.xml
similarity index 100%
rename from frogoui/src/main/res/anim/rotate.xml
rename to core-ui-android/src/main/res/anim/rotate.xml
diff --git a/frogoui/src/main/res/anim/sequential.xml b/core-ui-android/src/main/res/anim/sequential.xml
similarity index 100%
rename from frogoui/src/main/res/anim/sequential.xml
rename to core-ui-android/src/main/res/anim/sequential.xml
diff --git a/frogoui/src/main/res/anim/shake_animation.xml b/core-ui-android/src/main/res/anim/shake_animation.xml
similarity index 100%
rename from frogoui/src/main/res/anim/shake_animation.xml
rename to core-ui-android/src/main/res/anim/shake_animation.xml
diff --git a/frogoui/src/main/res/anim/shrink_enter.xml b/core-ui-android/src/main/res/anim/shrink_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/shrink_enter.xml
rename to core-ui-android/src/main/res/anim/shrink_enter.xml
diff --git a/frogoui/src/main/res/anim/shrink_exit.xml b/core-ui-android/src/main/res/anim/shrink_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/shrink_exit.xml
rename to core-ui-android/src/main/res/anim/shrink_exit.xml
diff --git a/frogoui/src/main/res/anim/slide_down.xml b/core-ui-android/src/main/res/anim/slide_down.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_down.xml
rename to core-ui-android/src/main/res/anim/slide_down.xml
diff --git a/frogoui/src/main/res/anim/slide_down_enter.xml b/core-ui-android/src/main/res/anim/slide_down_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_down_enter.xml
rename to core-ui-android/src/main/res/anim/slide_down_enter.xml
diff --git a/frogoui/src/main/res/anim/slide_down_exit.xml b/core-ui-android/src/main/res/anim/slide_down_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_down_exit.xml
rename to core-ui-android/src/main/res/anim/slide_down_exit.xml
diff --git a/frogoui/src/main/res/anim/slide_in_left.xml b/core-ui-android/src/main/res/anim/slide_in_left.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_in_left.xml
rename to core-ui-android/src/main/res/anim/slide_in_left.xml
diff --git a/frogoui/src/main/res/anim/slide_left_enter.xml b/core-ui-android/src/main/res/anim/slide_left_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_left_enter.xml
rename to core-ui-android/src/main/res/anim/slide_left_enter.xml
diff --git a/frogoui/src/main/res/anim/slide_left_exit.xml b/core-ui-android/src/main/res/anim/slide_left_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_left_exit.xml
rename to core-ui-android/src/main/res/anim/slide_left_exit.xml
diff --git a/frogoui/src/main/res/anim/slide_out_right.xml b/core-ui-android/src/main/res/anim/slide_out_right.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_out_right.xml
rename to core-ui-android/src/main/res/anim/slide_out_right.xml
diff --git a/frogoui/src/main/res/anim/slide_up.xml b/core-ui-android/src/main/res/anim/slide_up.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_up.xml
rename to core-ui-android/src/main/res/anim/slide_up.xml
diff --git a/frogoui/src/main/res/anim/slide_up_enter.xml b/core-ui-android/src/main/res/anim/slide_up_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_up_enter.xml
rename to core-ui-android/src/main/res/anim/slide_up_enter.xml
diff --git a/frogoui/src/main/res/anim/slide_up_exit.xml b/core-ui-android/src/main/res/anim/slide_up_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/slide_up_exit.xml
rename to core-ui-android/src/main/res/anim/slide_up_exit.xml
diff --git a/frogoui/src/main/res/anim/spin_enter.xml b/core-ui-android/src/main/res/anim/spin_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/spin_enter.xml
rename to core-ui-android/src/main/res/anim/spin_enter.xml
diff --git a/frogoui/src/main/res/anim/spin_exit.xml b/core-ui-android/src/main/res/anim/spin_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/spin_exit.xml
rename to core-ui-android/src/main/res/anim/spin_exit.xml
diff --git a/frogoui/src/main/res/anim/split_enter.xml b/core-ui-android/src/main/res/anim/split_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/split_enter.xml
rename to core-ui-android/src/main/res/anim/split_enter.xml
diff --git a/frogoui/src/main/res/anim/split_exit.xml b/core-ui-android/src/main/res/anim/split_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/split_exit.xml
rename to core-ui-android/src/main/res/anim/split_exit.xml
diff --git a/frogoui/src/main/res/anim/swipe_left_enter.xml b/core-ui-android/src/main/res/anim/swipe_left_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/swipe_left_enter.xml
rename to core-ui-android/src/main/res/anim/swipe_left_enter.xml
diff --git a/frogoui/src/main/res/anim/swipe_left_exit.xml b/core-ui-android/src/main/res/anim/swipe_left_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/swipe_left_exit.xml
rename to core-ui-android/src/main/res/anim/swipe_left_exit.xml
diff --git a/frogoui/src/main/res/anim/swipe_right_enter.xml b/core-ui-android/src/main/res/anim/swipe_right_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/swipe_right_enter.xml
rename to core-ui-android/src/main/res/anim/swipe_right_enter.xml
diff --git a/frogoui/src/main/res/anim/swipe_right_exit.xml b/core-ui-android/src/main/res/anim/swipe_right_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/swipe_right_exit.xml
rename to core-ui-android/src/main/res/anim/swipe_right_exit.xml
diff --git a/frogoui/src/main/res/anim/together.xml b/core-ui-android/src/main/res/anim/together.xml
similarity index 100%
rename from frogoui/src/main/res/anim/together.xml
rename to core-ui-android/src/main/res/anim/together.xml
diff --git a/frogoui/src/main/res/anim/windmill_enter.xml b/core-ui-android/src/main/res/anim/windmill_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/windmill_enter.xml
rename to core-ui-android/src/main/res/anim/windmill_enter.xml
diff --git a/frogoui/src/main/res/anim/windmill_exit.xml b/core-ui-android/src/main/res/anim/windmill_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/windmill_exit.xml
rename to core-ui-android/src/main/res/anim/windmill_exit.xml
diff --git a/frogoui/src/main/res/anim/zoom_enter.xml b/core-ui-android/src/main/res/anim/zoom_enter.xml
similarity index 100%
rename from frogoui/src/main/res/anim/zoom_enter.xml
rename to core-ui-android/src/main/res/anim/zoom_enter.xml
diff --git a/frogoui/src/main/res/anim/zoom_exit.xml b/core-ui-android/src/main/res/anim/zoom_exit.xml
similarity index 100%
rename from frogoui/src/main/res/anim/zoom_exit.xml
rename to core-ui-android/src/main/res/anim/zoom_exit.xml
diff --git a/frogoui/src/main/res/anim/zoom_in.xml b/core-ui-android/src/main/res/anim/zoom_in.xml
similarity index 100%
rename from frogoui/src/main/res/anim/zoom_in.xml
rename to core-ui-android/src/main/res/anim/zoom_in.xml
diff --git a/frogoui/src/main/res/anim/zoom_out.xml b/core-ui-android/src/main/res/anim/zoom_out.xml
similarity index 100%
rename from frogoui/src/main/res/anim/zoom_out.xml
rename to core-ui-android/src/main/res/anim/zoom_out.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_accent_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_accent_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_accent_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_accent_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_accent_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_accent_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_accent_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_accent_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_accent_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_accent_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_accent_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_accent_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_accent_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_accent_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_accent_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_accent_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_amber_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_amber_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_amber_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_amber_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_amber_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_amber_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_amber_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_amber_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_amber_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_amber_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_amber_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_amber_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_amber_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_amber_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_amber_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_amber_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_black_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_black_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_black_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_black_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_black_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_black_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_black_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_black_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_black_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_black_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_black_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_black_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_black_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_black_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_black_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_black_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_blue_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_blue_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_blue_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_blue_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_blue_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_blue_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_blue_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_blue_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_blue_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_blue_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_blue_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_blue_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_blue_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_blue_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_blue_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_blue_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_card_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_card_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_card_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_card_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_card_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_card_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_card_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_card_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_card_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_card_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_card_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_card_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_card_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_card_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_card_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_card_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_cyan_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_cyan_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_cyan_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_cyan_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_cyan_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_cyan_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_cyan_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_cyan_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_cyan_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_cyan_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_cyan_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_cyan_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_cyan_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_cyan_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_cyan_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_cyan_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_dark_yellow_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_dark_yellow_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_dark_yellow_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_dark_yellow_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_dark_yellow_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_dark_yellow_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_dark_yellow_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_dark_yellow_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_dark_yellow_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_deep_purple_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_deep_purple_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_deep_purple_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_deep_purple_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_deep_purple_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_deep_purple_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_deep_purple_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_deep_purple_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_deep_purple_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_green_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_green_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_green_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_green_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_green_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_green_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_green_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_green_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_green_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_green_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_green_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_green_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_green_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_green_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_green_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_green_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_indigo_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_indigo_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_indigo_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_indigo_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_indigo_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_indigo_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_indigo_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_indigo_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_indigo_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_indigo_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_indigo_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_indigo_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_indigo_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_indigo_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_indigo_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_indigo_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_blue_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_blue_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_blue_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_blue_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_blue_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_blue_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_blue_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_blue_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_blue_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_blue_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_blue_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_blue_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_blue_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_blue_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_blue_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_blue_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_green_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_green_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_green_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_green_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_green_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_green_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_green_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_green_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_green_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_green_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_green_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_green_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_light_green_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_light_green_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_light_green_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_light_green_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_lime_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_lime_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_lime_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_lime_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_lime_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_lime_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_lime_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_lime_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_lime_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_lime_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_lime_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_lime_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_lime_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_lime_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_lime_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_lime_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_orange_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_orange_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_orange_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_orange_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_orange_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_orange_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_orange_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_orange_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_orange_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_orange_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_orange_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_orange_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_orange_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_orange_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_orange_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_orange_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_pink_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_pink_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_pink_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_pink_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_pink_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_pink_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_pink_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_pink_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_pink_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_pink_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_pink_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_pink_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_pink_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_pink_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_pink_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_pink_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_dark_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_dark_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_dark_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_dark_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_dark_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_dark_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_primary_dark_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_primary_dark_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_primary_dark_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_purple_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_purple_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_purple_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_purple_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_purple_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_purple_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_purple_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_purple_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_purple_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_purple_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_purple_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_purple_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_purple_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_purple_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_purple_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_purple_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_red_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_red_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_red_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_red_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_red_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_red_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_red_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_red_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_red_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_red_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_red_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_red_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_red_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_red_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_red_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_red_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_teal_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_teal_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_teal_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_teal_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_teal_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_teal_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_teal_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_teal_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_teal_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_teal_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_teal_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_teal_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_teal_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_teal_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_teal_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_teal_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_white_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_white_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_white_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_white_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_white_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_white_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_white_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_white_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_white_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_white_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_white_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_white_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_white_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_white_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_white_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_white_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_lime_16dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_16dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_lime_16dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_16dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_lime_32dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_32dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_lime_32dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_32dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_lime_4dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_4dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_lime_4dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_4dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_bg_yellow_lime_8dp.xml b/core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_8dp.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_bg_yellow_lime_8dp.xml
rename to core-ui-android/src/main/res/drawable/frogo_bg_yellow_lime_8dp.xml
diff --git a/frogoui/src/main/res/drawable/frogo_ic_empty_view.xml b/core-ui-android/src/main/res/drawable/frogo_ic_empty_view.xml
similarity index 100%
rename from frogoui/src/main/res/drawable/frogo_ic_empty_view.xml
rename to core-ui-android/src/main/res/drawable/frogo_ic_empty_view.xml
diff --git a/frogoui/src/main/res/layout/frogo_container_empty_view.xml b/core-ui-android/src/main/res/layout/frogo_container_empty_view.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_container_empty_view.xml
rename to core-ui-android/src/main/res/layout/frogo_container_empty_view.xml
diff --git a/frogoui/src/main/res/layout/frogo_empty_view.xml b/core-ui-android/src/main/res/layout/frogo_empty_view.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_empty_view.xml
rename to core-ui-android/src/main/res/layout/frogo_empty_view.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_grid_type_1.xml b/core-ui-android/src/main/res/layout/frogo_rv_grid_type_1.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_grid_type_1.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_grid_type_1.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_grid_type_2.xml b/core-ui-android/src/main/res/layout/frogo_rv_grid_type_2.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_grid_type_2.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_grid_type_2.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_grid_type_3.xml b/core-ui-android/src/main/res/layout/frogo_rv_grid_type_3.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_grid_type_3.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_grid_type_3.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_grid_type_4.xml b/core-ui-android/src/main/res/layout/frogo_rv_grid_type_4.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_grid_type_4.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_grid_type_4.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_grid_type_5.xml b/core-ui-android/src/main/res/layout/frogo_rv_grid_type_5.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_grid_type_5.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_grid_type_5.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_grid_type_6.xml b/core-ui-android/src/main/res/layout/frogo_rv_grid_type_6.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_grid_type_6.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_grid_type_6.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_grid_type_7.xml b/core-ui-android/src/main/res/layout/frogo_rv_grid_type_7.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_grid_type_7.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_grid_type_7.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_1.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_1.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_1.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_1.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_10.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_10.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_10.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_10.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_11.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_11.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_11.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_11.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_12.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_12.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_12.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_12.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_2.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_2.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_2.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_2.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_3.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_3.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_3.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_3.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_4.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_4.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_4.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_4.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_5.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_5.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_5.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_5.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_6.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_6.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_6.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_6.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_7.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_7.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_7.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_7.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_8.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_8.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_8.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_8.xml
diff --git a/frogoui/src/main/res/layout/frogo_rv_list_type_9.xml b/core-ui-android/src/main/res/layout/frogo_rv_list_type_9.xml
similarity index 100%
rename from frogoui/src/main/res/layout/frogo_rv_list_type_9.xml
rename to core-ui-android/src/main/res/layout/frogo_rv_list_type_9.xml
diff --git a/frogoui/src/main/res/values/attrs.xml b/core-ui-android/src/main/res/values/attrs.xml
similarity index 100%
rename from frogoui/src/main/res/values/attrs.xml
rename to core-ui-android/src/main/res/values/attrs.xml
diff --git a/frogoui/src/main/res/values/colors.xml b/core-ui-android/src/main/res/values/colors.xml
similarity index 100%
rename from frogoui/src/main/res/values/colors.xml
rename to core-ui-android/src/main/res/values/colors.xml
diff --git a/frogoui/src/main/res/values/dimens.xml b/core-ui-android/src/main/res/values/dimens.xml
similarity index 100%
rename from frogoui/src/main/res/values/dimens.xml
rename to core-ui-android/src/main/res/values/dimens.xml
diff --git a/frogoui/src/main/res/values/strings.xml b/core-ui-android/src/main/res/values/strings.xml
similarity index 100%
rename from frogoui/src/main/res/values/strings.xml
rename to core-ui-android/src/main/res/values/strings.xml
diff --git a/frogoui/src/main/res/values/styles.xml b/core-ui-android/src/main/res/values/styles.xml
similarity index 100%
rename from frogoui/src/main/res/values/styles.xml
rename to core-ui-android/src/main/res/values/styles.xml
diff --git a/frogoui/.gitignore b/core-ui/.gitignore
similarity index 100%
rename from frogoui/.gitignore
rename to core-ui/.gitignore
diff --git a/frogocoreui/build.gradle.kts b/core-ui/build.gradle.kts
similarity index 100%
rename from frogocoreui/build.gradle.kts
rename to core-ui/build.gradle.kts
diff --git a/frogocoreui/src/main/java/com/frogobox/coreui/DataBuilder.kt b/core-ui/src/main/java/com/frogobox/coreui/DataBuilder.kt
similarity index 100%
rename from frogocoreui/src/main/java/com/frogobox/coreui/DataBuilder.kt
rename to core-ui/src/main/java/com/frogobox/coreui/DataBuilder.kt
diff --git a/frogocoreui/src/main/java/com/frogobox/coreui/FrogoComposeList.kt b/core-ui/src/main/java/com/frogobox/coreui/FrogoComposeList.kt
similarity index 100%
rename from frogocoreui/src/main/java/com/frogobox/coreui/FrogoComposeList.kt
rename to core-ui/src/main/java/com/frogobox/coreui/FrogoComposeList.kt
diff --git a/frogocoreui/src/main/java/com/frogobox/coreui/theme/Color.kt b/core-ui/src/main/java/com/frogobox/coreui/theme/Color.kt
similarity index 100%
rename from frogocoreui/src/main/java/com/frogobox/coreui/theme/Color.kt
rename to core-ui/src/main/java/com/frogobox/coreui/theme/Color.kt
diff --git a/frogocoreui/src/main/java/com/frogobox/coreui/theme/Dimens.kt b/core-ui/src/main/java/com/frogobox/coreui/theme/Dimens.kt
similarity index 100%
rename from frogocoreui/src/main/java/com/frogobox/coreui/theme/Dimens.kt
rename to core-ui/src/main/java/com/frogobox/coreui/theme/Dimens.kt
diff --git a/frogocoreui/src/main/java/com/frogobox/coreui/theme/Shape.kt b/core-ui/src/main/java/com/frogobox/coreui/theme/Shape.kt
similarity index 100%
rename from frogocoreui/src/main/java/com/frogobox/coreui/theme/Shape.kt
rename to core-ui/src/main/java/com/frogobox/coreui/theme/Shape.kt
diff --git a/frogocoreui/src/main/java/com/frogobox/coreui/theme/Theme.kt b/core-ui/src/main/java/com/frogobox/coreui/theme/Theme.kt
similarity index 100%
rename from frogocoreui/src/main/java/com/frogobox/coreui/theme/Theme.kt
rename to core-ui/src/main/java/com/frogobox/coreui/theme/Theme.kt
diff --git a/frogocoreui/src/main/java/com/frogobox/coreui/theme/Type.kt b/core-ui/src/main/java/com/frogobox/coreui/theme/Type.kt
similarity index 100%
rename from frogocoreui/src/main/java/com/frogobox/coreui/theme/Type.kt
rename to core-ui/src/main/java/com/frogobox/coreui/theme/Type.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4463492..01198db 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,4 +17,8 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "FrogoUI"
-include(":app", ":frogoui", ":frogocoreui")
\ No newline at end of file
+include(
+    ":app",
+    ":core-ui",
+    ":core-ui-android"
+)
\ No newline at end of file