diff --git a/.gitignore b/.gitignore
index c507849..c76426c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
+build
 target
 .idea
+.gradle
+
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
new file mode 100644
index 0000000..b753219
--- /dev/null
+++ b/benchmark/build.gradle
@@ -0,0 +1,11 @@
+plugins {
+    id 'application'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation project(':')
+}
\ No newline at end of file
diff --git a/benchmark/build.sbt b/benchmark/build.sbt
deleted file mode 100644
index 50f7dd4..0000000
--- a/benchmark/build.sbt
+++ /dev/null
@@ -1,15 +0,0 @@
-organization := (organization in LocalRootProject).value
-name := "jwo-benchmark"
-version := (version in LocalRootProject).value
-resourceDirectory in Compile := (resourceDirectory in(LocalRootProject, Test)).value
-skip in publish := true
-maintainer := (maintainer in LocalRootProject).value
-mainClass := Some("net.woggioni.jwo.benchmark.Main")
-fork := true
-//    libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.6",
-//    libraryDependencies += "org.tukaani" % "xz" % "1.8",
-//    libraryDependencies += "com.beust" % "jcommander" % "1.72",
-//    libraryDependencies += "org.projectlombok" % "lombok" % "1.18.8" % Provided
-
-enablePlugins(JavaAppPackaging)
-enablePlugins(UniversalPlugin)
\ No newline at end of file
diff --git a/benchmark/src/main/java/net/woggioni/jwo/benchmark/Main.java b/benchmark/src/main/java/net/woggioni/jwo/benchmark/Main.java
new file mode 100644
index 0000000..5a1915c
--- /dev/null
+++ b/benchmark/src/main/java/net/woggioni/jwo/benchmark/Main.java
@@ -0,0 +1,50 @@
+package net.woggioni.jwo.benchmark;
+
+import lombok.SneakyThrows;
+import net.woggioni.jwo.Chronometer;
+import net.woggioni.jwo.CollectionUtils;
+import net.woggioni.jwo.JWO;
+import net.woggioni.jwo.io.CircularInputStream;
+import net.woggioni.jwo.tuple.Tuple2;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+public class Main {
+
+    @SneakyThrows
+    private static void withBenchmarkReader(Consumer<Reader> fn) {
+        Reader reader = new InputStreamReader(JWO.class.getResourceAsStream("/render_template_test.txt"));
+        InputStream is = new CircularInputStream(JWO.readAll(reader).getBytes(), 10000);
+        try {
+            fn.accept(new InputStreamReader(is));
+        } finally {
+            if (reader != null) reader.close();
+        }
+    }
+
+    public static void main(String... args)  {
+        Map<String, Object> valuesMap = Stream.of(
+                new Tuple2<>("author", "John Doe"),
+                new Tuple2<>("date", "2020-03-25 16:22"),
+                new Tuple2<>("adjective", "simple"))
+            .collect(CollectionUtils.toUnmodifiableTreeMap(it -> it._1, it -> it._2));
+        withBenchmarkReader(
+                reader -> {
+                Chronometer chronometer = new Chronometer();
+                String result = JWO.renderTemplate(reader, valuesMap);
+                System.out.printf("Elapsed time: %.3f\n", chronometer.elapsed(Chronometer.UnitOfMeasure.SECONDS));
+        });
+
+        withBenchmarkReader(
+                reader -> {
+                Chronometer chronometer = new Chronometer();
+                String result = NaiveTemplateRenderer.renderTemplateNaive(JWO.readAll(reader), valuesMap);
+                System.out.printf("Elapsed time: %.3f\n", chronometer.elapsed(Chronometer.UnitOfMeasure.SECONDS));
+        });
+    }
+}
diff --git a/benchmark/src/main/scala/net/woggioni/jwo/benchmark/Main.scala b/benchmark/src/main/scala/net/woggioni/jwo/benchmark/Main.scala
deleted file mode 100644
index 354a569..0000000
--- a/benchmark/src/main/scala/net/woggioni/jwo/benchmark/Main.scala
+++ /dev/null
@@ -1,47 +0,0 @@
-package net.woggioni.jwo.benchmark
-
-import java.io.{InputStream, InputStreamReader, Reader}
-
-import net.woggioni.jwo.io.CircularInputStream
-import net.woggioni.jwo.{Chronometer, JWO}
-
-import scala.collection.JavaConverters._
-
-object Main {
-
-    def withBenchmarkReader(fn : Reader => Unit) = {
-        val reader = new InputStreamReader(classOf[JWO].getResourceAsStream("/render_template_test.txt"))
-        val is : InputStream = new CircularInputStream(JWO.readAll(reader).getBytes, 10000)
-        try {
-            fn(new InputStreamReader(is))
-        } finally {
-            if (reader != null) reader.close()
-        }
-    }
-
-    def renderTemplateBenchmark() {
-        val valuesMap = Map[String, Object]("author" -> "John Doe",
-                            "date" -> "2020-03-25 16:22",
-                            "adjective" -> "simple")
-        withBenchmarkReader(
-            reader => {
-                val chronometer = new Chronometer
-                val result = JWO.renderTemplate(reader, valuesMap.asJava)
-                printf("Elapsed time: %.3f\n", chronometer.elapsed(Chronometer.UnitOfMeasure.SECONDS))
-            }
-        )
-
-        withBenchmarkReader(
-            reader => {
-                val chronometer = new Chronometer
-                val result = NaiveTemplateRenderer.renderTemplateNaive(JWO.readAll(reader), valuesMap.asJava)
-                printf("Elapsed time: %.3f\n", chronometer.elapsed(Chronometer.UnitOfMeasure.SECONDS))
-            }
-        )
-    }
-
-    def main(argv : Array[String]) = {
-        renderTemplateBenchmark()
-    }
-
-}
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..ee68d0e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,44 @@
+allprojects {
+    apply plugin: 'java-library'
+    group = "net.woggioni"
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        jcenter()
+    }
+    dependencies {
+        ['', 'test'].each {sourceSetName ->
+            ['compileOnly', 'annotationProcessor'].each { configurationSuffix ->
+                String configurationName
+                if(sourceSetName) configurationName = sourceSetName + configurationSuffix.capitalize()
+                else configurationName = configurationSuffix
+                add(configurationName,  [group: "org.projectlombok", name: "lombok", version: lombokVersion])
+            }
+        }
+        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion
+        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junitJupiterVersion
+        testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
+    }
+
+}
+
+dependencies {
+    implementation group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
+}
+
+compileJava {
+    options.compilerArgs << '--release' << '8'
+}
+
+jar {
+    manifest{
+        attributes([
+            "Automatic-Module-Name": "net.woggioni.jwo"
+        ])
+    }
+}
+
+wrapper {
+    distributionType = Wrapper.DistributionType.BIN
+    gradleVersion = "6.8.2"
+}
\ No newline at end of file
diff --git a/build.sbt b/build.sbt
deleted file mode 100644
index 7f219ea..0000000
--- a/build.sbt
+++ /dev/null
@@ -1,30 +0,0 @@
-name := "jwo"
-
-organization := "net.woggioni"
-
-maintainer := "oggioni.walter@gmail.com"
-
-version := "1.0"
-resolvers += Resolver.mavenLocal
-resolvers in ThisBuild += Resolver.jcenterRepo
-
-git.useGitDescribe := true
-crossPaths := false
-
-autoScalaLibrary := false
-
-libraryDependencies += "org.projectlombok" % "lombok" % Versions.lombok % Provided
-
-libraryDependencies += "org.slf4j" % "slf4j-api" % Versions.slf4j
-
-libraryDependencies += "net.aichler" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test
-libraryDependencies += "org.junit.jupiter" % "junit-jupiter-params" % JupiterKeys.junitJupiterVersion.value % Test
-
-javacOptions in (Compile, compile) ++= Seq("--release", "8")
-
-Compile / packageBin / packageOptions +=
-  Package.ManifestAttributes("Automatic-Module-Name" -> "net.woggioni.jwo")
-
-enablePlugins(Delombok)
-enablePlugins(DelombokJavadoc)
-lazy val benchmark = (project in file("benchmark")).dependsOn(LocalRootProject)
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..9b01c77
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,4 @@
+jwoVersion=1.0
+junitJupiterVersion=5.7.0
+lombokVersion=1.18.16
+slf4jVersion=1.7.30
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e708b1c
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..2a56324
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..4f906e0
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..ac1b06f
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@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=.
+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%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+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%"=="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!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..3c2a8d0
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,3 @@
+rootProject.name = 'jwo'
+
+include('benchmark')