diff --git a/.idea/modules.xml b/.idea/modules.xml
index 65c2e22..75b2526 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,20 +2,12 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/annotation-processor/annotation-processor.iml" filepath="$PROJECT_DIR$/.idea/modules/annotation-processor/annotation-processor.iml" group="annotation-processor" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/annotation-processor/java/annotation-processor-java.iml" filepath="$PROJECT_DIR$/.idea/modules/annotation-processor/java/annotation-processor-java.iml" group="annotation-processor/java" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml" group="annotation-processor/java" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml" group="annotation-processor/java" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin.iml" group="annotation-processor/kotlin" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml" group="annotation-processor/kotlin" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml" group="annotation-processor/kotlin" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-java.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-java.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-java_main.iml" group="ap-examples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-java_test.iml" group="ap-examples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-kotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_main.iml" group="ap-examples-kotlin" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_test.iml" group="ap-examples-kotlin" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/examples.iml" filepath="$PROJECT_DIR$/.idea/modules/examples.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/examples-java.iml" filepath="$PROJECT_DIR$/.idea/modules/examples-java.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/examples-java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/examples-java_main.iml" group="examples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/examples-java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/examples-java_test.iml" group="examples-java" />
diff --git a/.idea/modules/annotation-processor/annotation-processor.iml b/.idea/modules/annotation-processor/annotation-processor.iml
deleted file mode 100644
index 465fff5..0000000
--- a/.idea/modules/annotation-processor/annotation-processor.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":annotation-processor" external.linked.project.path="$MODULE_DIR$/../../../examples/annotation-processor" external.root.project.path="$MODULE_DIR$/../../../examples" external.system.id="GRADLE" external.system.module.group="examples" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../examples/annotation-processor">
-      <excludeFolder url="file://$MODULE_DIR$/../../../examples/annotation-processor/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../examples/annotation-processor/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/annotation-processor/java/annotation-processor-java.iml b/.idea/modules/annotation-processor/java/annotation-processor-java.iml
deleted file mode 100644
index ce39038..0000000
--- a/.idea/modules/annotation-processor/java/annotation-processor-java.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":annotation-processor:java" external.linked.project.path="$MODULE_DIR$/../../../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../../../examples" external.system.id="GRADLE" external.system.module.group="examples.annotation-processor" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java">
-      <excludeFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/build" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/out" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml b/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml
deleted file mode 100644
index 1868216..0000000
--- a/.idea/modules/annotation-processor/java/annotation-processor-java_main.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":annotation-processor:java:main" external.linked.project.path="$MODULE_DIR$/../../../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../../../examples" external.system.id="GRADLE" external.system.module.group="examples.annotation-processor" external.system.module.type="sourceSet" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.1.0-beta" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.5" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml b/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml
deleted file mode 100644
index 684de73..0000000
--- a/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":annotation-processor:java:test" external.linked.project.path="$MODULE_DIR$/../../../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../../../examples" external.system.id="GRADLE" external.system.module.group="examples.annotation-processor" external.system.module.type="sourceSet" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/out/test/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/java/src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotation-processor-java_main" />
-  </component>
-  <component name="TestModuleProperties" production-module="annotation-processor-java_main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin.iml b/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin.iml
deleted file mode 100644
index fcdfcab..0000000
--- a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":annotation-processor:kotlin" external.linked.project.path="$MODULE_DIR$/../../../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../../../examples" external.system.id="GRADLE" external.system.module.group="examples.annotation-processor" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin">
-      <excludeFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/out" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml b/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml
deleted file mode 100644
index a14be09..0000000
--- a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_main.iml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":annotation-processor:kotlin:main" external.linked.project.path="$MODULE_DIR$/../../../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../../../examples" external.system.id="GRADLE" external.system.module.group="examples.annotation-processor" external.system.module.type="sourceSet" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/classes/kotlin/main" />
-          <option name="noStdlib" value="true" />
-          <option name="noReflect" value="true" />
-          <option name="moduleName" value="kotlin" />
-          <option name="addCompilerBuiltIns" value="true" />
-          <option name="loadBuiltInsFromDependencies" value="true" />
-          <option name="languageVersion" value="1.2" />
-          <option name="apiVersion" value="1.2" />
-          <option name="pluginOptions">
-            <array />
-          </option>
-          <option name="pluginClasspaths">
-            <array />
-          </option>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kapt/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kapt/main" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kaptKotlin/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kaptKotlin/main" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/src/main/kotlin" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.50" level="project" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/tmp/kapt3/classes/main" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.50" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.1.0-beta" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.5" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml b/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml
deleted file mode 100644
index a17a98b..0000000
--- a/.idea/modules/annotation-processor/kotlin/annotation-processor-kotlin_test.iml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":annotation-processor:kotlin:test" external.linked.project.path="$MODULE_DIR$/../../../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../../../examples" external.system.id="GRADLE" external.system.module.group="examples.annotation-processor" external.system.module.type="sourceSet" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/classes/kotlin/test" />
-          <option name="noStdlib" value="true" />
-          <option name="noReflect" value="true" />
-          <option name="moduleName" value="kotlin" />
-          <option name="addCompilerBuiltIns" value="true" />
-          <option name="loadBuiltInsFromDependencies" value="true" />
-          <option name="languageVersion" value="1.2" />
-          <option name="apiVersion" value="1.2" />
-          <option name="pluginOptions">
-            <array />
-          </option>
-          <option name="pluginClasspaths">
-            <array />
-          </option>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/out/test/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kapt/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kapt/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kaptKotlin/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/generated/source/kaptKotlin/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotation-processor-kotlin_main" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../../examples/annotation-processor/kotlin/build/tmp/kapt3/classes/test" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.50" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.50" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="annotation-processor-kotlin_main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/examples.iml b/.idea/modules/examples.iml
deleted file mode 100644
index 7e87d80..0000000
--- a/.idea/modules/examples.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="examples" external.linked.project.path="$MODULE_DIR$/../../examples" external.root.project.path="$MODULE_DIR$/../../examples" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../examples">
-      <excludeFolder url="file://$MODULE_DIR$/../../examples/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../examples/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="groovy-2.5.0" level="application" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/semver.iml b/.idea/modules/semver.iml
index 41ae9a8..5d2160b 100644
--- a/.idea/modules/semver.iml
+++ b/.idea/modules/semver.iml
@@ -9,5 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="groovy-2.5.0" level="application" />
+    <orderEntry type="library" name="groovy-2.5.0" level="application" />
   </component>
 </module>
\ No newline at end of file