diff --git a/.idea/modules.xml b/.idea/modules.xml
index c6082b6..b65155f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,11 +2,11 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/pinboard-poster.iml" filepath="$PROJECT_DIR$/pinboard-poster.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/pinboard-poster-samples-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/pinboard-poster-samples-kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/pinboard-poster.iml" filepath="$PROJECT_DIR$/pinboard-poster.iml" group="pinboard-poster" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/pinboard-poster-samples-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/pinboard-poster-samples-kotlin.iml" group="samples-kotlin" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/pinboard-poster_main.iml" filepath="$PROJECT_DIR$/.idea/modules/pinboard-poster_main.iml" group="pinboard-poster" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/pinboard-poster_test.iml" filepath="$PROJECT_DIR$/.idea/modules/pinboard-poster_test.iml" group="pinboard-poster" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-java.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-java.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-java.iml" group="samples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-java_main.iml" group="samples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-java_test.iml" group="samples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/samples-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/samples-kotlin.iml" />
diff --git a/.idea/modules/pinboard-poster_main.iml b/.idea/modules/pinboard-poster_main.iml
index a0c6ab6..90e3065 100644
--- a/.idea/modules/pinboard-poster_main.iml
+++ b/.idea/modules/pinboard-poster_main.iml
@@ -29,7 +29,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
+    <output url="file://$MODULE_DIR$/../../build/classes/java/main" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
diff --git a/.idea/modules/pinboard-poster_test.iml b/.idea/modules/pinboard-poster_test.iml
index 3b805bb..f667106 100644
--- a/.idea/modules/pinboard-poster_test.iml
+++ b/.idea/modules/pinboard-poster_test.iml
@@ -35,7 +35,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
+    <output-test url="file://$MODULE_DIR$/../../build/classes/java/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
diff --git a/.idea/modules/samples-java_main.iml b/.idea/modules/samples-java_main.iml
index f16e049..c2ac2c7 100644
--- a/.idea/modules/samples-java_main.iml
+++ b/.idea/modules/samples-java_main.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="samples-java:main" external.linked.project.path="$MODULE_DIR$/../../samples/java" external.root.project.path="$MODULE_DIR$/../../samples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../samples/java/out/production/classes" />
+    <output url="file://$MODULE_DIR$/../../samples/java/build/classes/java/main" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../samples/java/src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../samples/java/src/main/java" isTestSource="false" />
diff --git a/.idea/modules/samples-java_test.iml b/.idea/modules/samples-java_test.iml
index 56ba4d8..02e28a7 100644
--- a/.idea/modules/samples-java_test.iml
+++ b/.idea/modules/samples-java_test.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="samples-java:test" external.linked.project.path="$MODULE_DIR$/../../samples/java" external.root.project.path="$MODULE_DIR$/../../samples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../samples/java/out/test/classes" />
+    <output-test url="file://$MODULE_DIR$/../../samples/java/build/classes/java/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../samples/java/src/test" />
     <orderEntry type="inheritedJdk" />
diff --git a/.idea/modules/samples-kotlin_main.iml b/.idea/modules/samples-kotlin_main.iml
index 75362b9..2d13f30 100644
--- a/.idea/modules/samples-kotlin_main.iml
+++ b/.idea/modules/samples-kotlin_main.iml
@@ -28,7 +28,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../samples/kotlin/out/production/classes" />
+    <output url="file://$MODULE_DIR$/../../samples/kotlin/build/classes/java/main" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../samples/kotlin/src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../samples/kotlin/src/main/kotlin" isTestSource="false" />
diff --git a/.idea/modules/samples-kotlin_test.iml b/.idea/modules/samples-kotlin_test.iml
index 247421e..2f59cd5 100644
--- a/.idea/modules/samples-kotlin_test.iml
+++ b/.idea/modules/samples-kotlin_test.iml
@@ -34,7 +34,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../samples/kotlin/out/test/classes" />
+    <output-test url="file://$MODULE_DIR$/../../samples/kotlin/build/classes/java/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../samples/kotlin/src/test" />
     <orderEntry type="inheritedJdk" />
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738c..5c2d1cf 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 44e7c4d..ea13fdf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708f..b0d6d0a 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/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
+#
+#      http://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
@@ -28,7 +44,7 @@ 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"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 6d57edc..9991c50 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@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      http://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
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @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"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome