diff --git a/compose-vectorize-core/build.gradle.kts b/compose-vectorize-core/build.gradle.kts
index f921354..1a69155 100644
--- a/compose-vectorize-core/build.gradle.kts
+++ b/compose-vectorize-core/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
     alias(libs.plugins.composeMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.vanniktechMavenPublish)
-    id("dev.sergiobelda.compose.vectorize.spotless")
+    id("dev.sergiobelda.gradle.spotless")
 }
 
 group = "dev.sergiobelda.compose.vectorize"
diff --git a/compose-vectorize-gradle-plugin/build.gradle.kts b/compose-vectorize-gradle-plugin/build.gradle.kts
index 4a85eb1..dd78d30 100644
--- a/compose-vectorize-gradle-plugin/build.gradle.kts
+++ b/compose-vectorize-gradle-plugin/build.gradle.kts
@@ -17,7 +17,7 @@
 plugins {
     `kotlin-dsl`
     alias(libs.plugins.gradlePublish)
-    id("dev.sergiobelda.compose.vectorize.spotless")
+    id("dev.sergiobelda.gradle.spotless")
 }
 
 group = "dev.sergiobelda.compose.vectorize"
diff --git a/build-logic/.gitignore b/gradle/build-logic/.gitignore
similarity index 70%
rename from build-logic/.gitignore
rename to gradle/build-logic/.gitignore
index db060de..29d6f2b 100644
--- a/build-logic/.gitignore
+++ b/gradle/build-logic/.gitignore
@@ -4,4 +4,3 @@
 /convention/build/
 /local.properties
 .gradle
-/imagevectorgenerator/build/
\ No newline at end of file
diff --git a/build-logic/convention/build.gradle.kts b/gradle/build-logic/convention/build.gradle.kts
similarity index 64%
rename from build-logic/convention/build.gradle.kts
rename to gradle/build-logic/convention/build.gradle.kts
index 2798e85..8caea24 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/gradle/build-logic/convention/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     `kotlin-dsl`
 }
 
-group = "dev.sergiobelda.compose.vectorize.buildlogic"
+group = "dev.sergiobelda.gradle"
 
 java {
     toolchain {
@@ -19,9 +19,9 @@ dependencies {
 gradlePlugin {
     plugins {
         register("spotless") {
-            id = "dev.sergiobelda.compose.vectorize.spotless"
+            id = "dev.sergiobelda.gradle.spotless"
             implementationClass =
-                "dev.sergiobelda.compose.vectorize.buildlogic.convention.SpotlessConventionPlugin"
+                "dev.sergiobelda.gradle.buildlogic.convention.SpotlessConventionPlugin"
         }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/dev/sergiobelda/compose/vectorize/buildlogic/convention/SpotlessConventionPlugin.kt b/gradle/build-logic/convention/src/main/kotlin/dev/sergiobelda/gradle/buildlogic/convention/SpotlessConventionPlugin.kt
similarity index 98%
rename from build-logic/convention/src/main/kotlin/dev/sergiobelda/compose/vectorize/buildlogic/convention/SpotlessConventionPlugin.kt
rename to gradle/build-logic/convention/src/main/kotlin/dev/sergiobelda/gradle/buildlogic/convention/SpotlessConventionPlugin.kt
index 885b667..a0d9aec 100644
--- a/build-logic/convention/src/main/kotlin/dev/sergiobelda/compose/vectorize/buildlogic/convention/SpotlessConventionPlugin.kt
+++ b/gradle/build-logic/convention/src/main/kotlin/dev/sergiobelda/gradle/buildlogic/convention/SpotlessConventionPlugin.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.sergiobelda.compose.vectorize.buildlogic.convention
+package dev.sergiobelda.gradle.buildlogic.convention
 
 import com.diffplug.gradle.spotless.SpotlessExtension
 import org.gradle.api.Plugin
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.jar b/gradle/build-logic/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from build-logic/gradle/wrapper/gradle-wrapper.jar
rename to gradle/build-logic/gradle/wrapper/gradle-wrapper.jar
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/gradle/build-logic/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from build-logic/gradle/wrapper/gradle-wrapper.properties
rename to gradle/build-logic/gradle/wrapper/gradle-wrapper.properties
diff --git a/build-logic/gradlew b/gradle/build-logic/gradlew
similarity index 100%
rename from build-logic/gradlew
rename to gradle/build-logic/gradlew
diff --git a/build-logic/gradlew.bat b/gradle/build-logic/gradlew.bat
similarity index 96%
rename from build-logic/gradlew.bat
rename to gradle/build-logic/gradlew.bat
index 7101f8e..25da30d 100644
--- a/build-logic/gradlew.bat
+++ b/gradle/build-logic/gradlew.bat
@@ -1,92 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts
similarity index 82%
rename from build-logic/settings.gradle.kts
rename to gradle/build-logic/settings.gradle.kts
index 065ea7a..0e0eddf 100644
--- a/build-logic/settings.gradle.kts
+++ b/gradle/build-logic/settings.gradle.kts
@@ -9,7 +9,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from(files("../gradle/libs.versions.toml"))
+            from(files("../libs.versions.toml"))
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4607d88..7507270 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,8 +22,8 @@ android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", ver
 androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-compose-composeBom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
-androidx-compose-ui = { module = "androidx.compose.ui:ui-tooling-preview" }
-androidx-compose-uiGraphics = { module = "androidx.compose.ui:ui-tooling-preview" }
+androidx-compose-ui = { module = "androidx.compose.ui:ui" }
+androidx-compose-uiGraphics = { module = "androidx.compose.ui:ui-graphics" }
 androidx-compose-uiTooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-coreKtx = { module = "androidx.core:core-ktx", version.ref = "androidCore" }
diff --git a/sample-mpp/android/build.gradle.kts b/sample-mpp/android/build.gradle.kts
index 1238163..d9f404e 100644
--- a/sample-mpp/android/build.gradle.kts
+++ b/sample-mpp/android/build.gradle.kts
@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlin)
-    id("dev.sergiobelda.compose.vectorize.spotless")
+    id("dev.sergiobelda.gradle.spotless")
 }
 
 android {
diff --git a/sample-mpp/common/build.gradle.kts b/sample-mpp/common/build.gradle.kts
index 042785c..19c5e4f 100644
--- a/sample-mpp/common/build.gradle.kts
+++ b/sample-mpp/common/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.composeMultiplatform)
     id("dev.sergiobelda.compose.vectorize")
-    id("dev.sergiobelda.compose.vectorize.spotless")
+    id("dev.sergiobelda.gradle.spotless")
 }
 
 group = "dev.sergiobelda.compose.vectorize.sample.common"
diff --git a/sample-mpp/desktop/build.gradle.kts b/sample-mpp/desktop/build.gradle.kts
index 006383a..bdbb7fa 100644
--- a/sample-mpp/desktop/build.gradle.kts
+++ b/sample-mpp/desktop/build.gradle.kts
@@ -19,7 +19,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 plugins {
     kotlin("multiplatform")
     alias(libs.plugins.composeMultiplatform)
-    id("dev.sergiobelda.compose.vectorize.spotless")
+    id("dev.sergiobelda.gradle.spotless")
 }
 
 kotlin {
diff --git a/sample-mpp/settings.gradle.kts b/sample-mpp/settings.gradle.kts
index 3e98140..6de508f 100644
--- a/sample-mpp/settings.gradle.kts
+++ b/sample-mpp/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
-    includeBuild("../build-logic")
+    includeBuild("../gradle/build-logic")
     repositories {
         google()
         mavenCentral()
diff --git a/sample-mpp/web/build.gradle.kts b/sample-mpp/web/build.gradle.kts
index a869afd..4a63ac2 100644
--- a/sample-mpp/web/build.gradle.kts
+++ b/sample-mpp/web/build.gradle.kts
@@ -17,7 +17,7 @@
 plugins {
     kotlin("multiplatform")
     alias(libs.plugins.composeMultiplatform)
-    id("dev.sergiobelda.compose.vectorize.spotless")
+    id("dev.sergiobelda.gradle.spotless")
 }
 
 group = "dev.sergiobelda.compose.vectorize.sample.web"
diff --git a/sample/app/build.gradle.kts b/sample/app/build.gradle.kts
index 6a4b1dd..08b0b43 100644
--- a/sample/app/build.gradle.kts
+++ b/sample/app/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("dev.sergiobelda.compose.vectorize")
-    id("dev.sergiobelda.compose.vectorize.spotless")
+    id("dev.sergiobelda.gradle.spotless")
 }
 
 group = "dev.sergiobelda.compose.vectorize"
diff --git a/sample/settings.gradle.kts b/sample/settings.gradle.kts
index a6c9602..eb0e4cd 100644
--- a/sample/settings.gradle.kts
+++ b/sample/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
-    includeBuild("../build-logic")
+    includeBuild("../gradle/build-logic")
     repositories {
         google()
         mavenCentral()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2018237..cef80a6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
-    includeBuild("build-logic")
+    includeBuild("gradle/build-logic")
     repositories {
         google()
         mavenCentral()