diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ab02233
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# Created by .ignore support plugin (hsz.mobi)
+.idea
+*.iml
+local.properties
+.gradle
+/cucumber-android/build/
+
diff --git a/.travis.yml b/.travis.yml
index 23df2d1..2ec3053 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,33 +2,42 @@ language: android
 jdk: oraclejdk8
 sudo: false
 
-cache:
-  directories:
-  - "$HOME/.m2"
-
-before_cache:
-- rm -rf $HOME/.m2/repository/io/cucumber
-
 android:
   components:
-  - tools
-  - platform-tools
-  - tools
-  - build-tools-26.0.0
-  - android-21
-  - sys-img-armeabi-v7a-android-21
+    - build-tools-28.0.2
+    - android-21
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 
 before_install:
-  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
+  - yes | sdkmanager tools
+  - yes | sdkmanager "platform-tools"
+  - yes | sdkmanager "emulator"
+  - yes | sdkmanager "build-tools;28.0.2"
+  - yes | sdkmanager "system-images;android-21;default;armeabi-v7a"
+  - echo no | avdmanager create avd --force -n test -k "system-images;android-21;default;armeabi-v7a" -c 200M
+  - $ANDROID_HOME/emulator/emulator -avd test -skin 1920x1080 -no-audio -no-window -no-boot-anim &
 
 install:
-  - mvn -q install --also-make --projects android,picocontainer -DskipTests=true
-    -Dmaven.javadoc.skip=true
+ - ./gradlew clean build
 
 before_script:
   - android-wait-for-emulator
+  - adb shell input keyevent 82
+  - adb logcat *:e &
 
 script:
-  - mvn install --activate-profiles android-examples --projects examples/android
-    --also-make-dependents -Dandroid.device=test
+  - ./gradlew runInstrumentationTests
+
+deploy:
+  provider: script
+  script: ./gradlew publish
+  on:
+    branch: master
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..9aa839c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,13 @@
+## 4.0.0-SNAPSHOT
+
+### Changed
+ * migrate everything to Gradle
+ 
+### Removed
+  * android-studio sample - now [cukeulator](https://github.com/cucumber/cucumber-android/tree/master/cukeulator) is the only valid sample (for Gradle and Android Studio)
+  * cukeulator-test and cucumber-android-test
+
+### Fixed
+ * [#5](https://github.com/cucumber/cucumber-android/issues/5) - Sample Does Not Work
+ * [#4](https://github.com/cucumber/cucumber-android/issues/4) - Support for parallel cukes 
+ * [#3](https://github.com/cucumber/cucumber-android/issues/3) - Reported duration time of scenario is about 0ms on Android  
\ No newline at end of file
diff --git a/README.md b/README.md
index fdeed65..69e6edb 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ Taken from the [maven-android-plugin](https://code.google.com/p/maven-android-pl
 1. JDK 1.6+ installed as required for Android development
 2. [Android SDK](http://developer.android.com/sdk/index.html) (r21 or later, latest is best supported) installed, preferably with all platforms.
 
-Integration-tests are in `examples/android/android-test/cucumber-test/`.
+Integration-tests are in `cukeulator/src/androidTest`.
 
 ### Building
 
 ```sh
-mvn package -pl android -am
+./gradlew assemble
 ```
 
 ### Setting up the dependency
@@ -66,24 +66,7 @@ Please read [the Android documentation on debugging](https://developer.android.c
 
 ### Examples
 
-To *build* all android example modules with maven:
-
-```
-mvn package -pl examples/android -am -amd -P android,android-examples
-```
-
-To *clean* all android example modules with maven:
-
-```
-mvn clean -pl examples/android -amd -P android-examples
-```
-
-The example projects depend on the current (unreleased) Cucumber-JVM modules.
-If any of the examples fail to build, just build the android module and its dependencies once first:
-
-```
-mvn clean install -pl android -am
-```
+Currently there is one example in subproject [cukeulator](https://github.com/cucumber/cucumber-android/tree/master/cukeulator)
 
 To create a virtual device and start an [Android emulator](https://developer.android.com/tools/devices/index.html):
 
diff --git a/android-studio/Cukeulator/.gitignore b/android-studio/Cukeulator/.gitignore
deleted file mode 100644
index 4c5d941..0000000
--- a/android-studio/Cukeulator/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-# Built application files
-/*/build/
-build/
-
-# Crashlytics configuations
-com_crashlytics_export_strings.xml
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Gradle generated files
-.gradle/
-
-# Signing files
-.signing/
-
-# User-specific configurations
-.idea/
-*.iml
-
-# OS-specific files
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
diff --git a/android-studio/Cukeulator/README.md b/android-studio/Cukeulator/README.md
deleted file mode 100644
index 85a7000..0000000
--- a/android-studio/Cukeulator/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-## Cukeulator Example Test
-This is the example test-project for the Cukeulator app for Android Studio 3.0+
-
-### Setup
-Features must be placed in `assets/features/`. Subdirectories are allowed.
-
-The rest of the dependencies are added automatically in `app/build.gradle`.
-
-The cucumber-android dependency is added as (see `app/build.gradle`):
-
-```
-androidTestCompile 'io.cucumber:cucumber-android:<version>'
-```
-
-### Using gradle
-
-To build the test apk:
-
-```
-cd cucumber-jvm/examples/android/android-studio/Cukeulator
-
-./gradlew --parallel :app:assembleDebugTest
-```
-
-The build generates an apk in app/build/outputs/apk/app-debug.apk.
-
-To install the apk on a device:
-
-```
-adb install -r app/build/outputs/apk/app-debug.apk
-```
-
-To verify that the test is installed, run:
-
-```
-adb shell pm list instrumentation
-```
-
-The command output should display;
-
-```
-instrumentation:cucumber.cukeulator.test/cucumber.api.android.CucumberInstrumentation (target=cucumber.cukeulator)
-```
-
-To run the test:
-
-```
-cd cucumber-jvm/examples/android/android-studio/Cukeulator;
-./gradlew connectedCheck
-```
-
-As an alternative option, the test can be run with adb:
-
-```
-adb shell am instrument -w cucumber.cukeulator.test/cucumber.cukeulator.test.Instrumentation
-```
-
-### Using an Android Studio IDE
-1. Import the example to Android Studio: `File > Import Project`.
-2. Create a test run configuration:
-    1.  Run > Edit Configurations
-    2. Click `+` button and select Android Tests
-    3. Specify test name: `CalculatorTest`
-    4. Select module: `app`
-    5. Enter a Specific instrumentation runner: `cucumber.cukeulator.test.Instrumentation`
-    6. Click Ok
-
-### Output
-Filter for the logcat tag `cucumber-android` in [DDMS](https://developer.android.com/tools/debugging/ddms.html).
-
-### Using this project with locally built Cucumber-JVM
-See [app/build.gradle](app/build.gradle) under `dependencies`.  
-There is a source-code comment which explains how to use a locally built Cucumber-JVM Android library.
\ No newline at end of file
diff --git a/android-studio/Cukeulator/app/.gitignore b/android-studio/Cukeulator/app/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/android-studio/Cukeulator/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/android-studio/Cukeulator/app/proguard-rules.pro b/android-studio/Cukeulator/app/proguard-rules.pro
deleted file mode 100644
index 178b533..0000000
--- a/android-studio/Cukeulator/app/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/mdzyuba/Code/android/adt-bundle-mac-x86_64-20140702/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/android-studio/Cukeulator/app/src/main/AndroidManifest.xml b/android-studio/Cukeulator/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 3f5d610..0000000
--- a/android-studio/Cukeulator/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cucumber.cukeulator">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="cucumber.cukeulator.CalculatorActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/android-studio/Cukeulator/app/src/main/res/drawable-hdpi/ic_launcher.png b/android-studio/Cukeulator/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 019f515..0000000
Binary files a/android-studio/Cukeulator/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android-studio/Cukeulator/app/src/main/res/drawable-mdpi/ic_launcher.png b/android-studio/Cukeulator/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 1838c33..0000000
Binary files a/android-studio/Cukeulator/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android-studio/Cukeulator/app/src/main/res/drawable-xhdpi/ic_launcher.png b/android-studio/Cukeulator/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index 2f5cc8f..0000000
Binary files a/android-studio/Cukeulator/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android-studio/Cukeulator/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/android-studio/Cukeulator/app/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index 1814a25..0000000
Binary files a/android-studio/Cukeulator/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android-studio/Cukeulator/app/src/main/res/layout/activity_calculator.xml b/android-studio/Cukeulator/app/src/main/res/layout/activity_calculator.xml
deleted file mode 100644
index 9956688..0000000
--- a/android-studio/Cukeulator/app/src/main/res/layout/activity_calculator.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-    <TextView
-            android:id="@+id/txt_calc_operator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:textSize="24dp"
-            android:gravity="center"
-            android:layout_alignLeft="@+id/layout_calc_btns"
-            android:layout_above="@+id/layout_calc_btns"/>
-
-    <TextView
-            android:id="@+id/txt_calc_display"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:textSize="24dp"
-            android:gravity="right"
-            android:layout_alignRight="@+id/layout_calc_btns"
-            android:layout_above="@+id/layout_calc_btns"
-            android:layout_toRightOf="@+id/txt_calc_operator"
-            android:hint="@string/txt_calc_display_hint"/>
-
-    <GridLayout
-            android:id="@+id/layout_calc_btns"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:useDefaultMargins="true"
-            android:columnCount="4">
-
-        <!-- row 4 -->
-        <Button
-                android:id="@+id/btn_spec_sqroot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onSpecialPressed"
-                android:text="√"/>
-
-        <Button
-                android:id="@+id/btn_spec_pi"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onSpecialPressed"
-                android:text="π"/>
-
-        <Button
-                android:id="@+id/btn_spec_percent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onSpecialPressed"
-                android:text="%"/>
-
-        <Button
-                android:id="@+id/btn_spec_clear"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onSpecialPressed"
-                android:text="C"/>
-
-        <!-- row 3 -->
-        <Button
-                android:id="@+id/btn_d_7"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="7"/>
-
-        <Button
-                android:id="@+id/btn_d_8"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="8"/>
-
-        <Button
-                android:id="@+id/btn_d_9"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="9"/>
-
-        <Button
-                android:id="@+id/btn_op_divide"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onOperatorPressed"
-                android:text="/"/>
-
-        <!-- row 2 -->
-        <Button
-                android:id="@+id/btn_d_4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="4"/>
-
-        <Button
-                android:id="@+id/btn_d_5"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="5"/>
-
-        <Button
-                android:id="@+id/btn_d_6"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="6"/>
-
-        <Button
-                android:id="@+id/btn_op_multiply"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onOperatorPressed"
-                android:text="x"/>
-
-        <!-- row 1 -->
-        <Button
-                android:id="@+id/btn_d_1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="1"/>
-
-        <Button
-                android:id="@+id/btn_d_2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="2"/>
-
-        <Button
-                android:id="@+id/btn_d_3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="3"/>
-
-        <Button
-                android:id="@+id/btn_op_subtract"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onOperatorPressed"
-                android:text="–"/>
-
-        <!-- row 0 -->
-        <Button
-                android:id="@+id/btn_d_0"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onDigitPressed"
-                android:text="0"/>
-
-        <Button
-                android:id="@+id/btn_spec_comma"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onSpecialPressed"
-                android:text="."/>
-
-        <Button
-                android:id="@+id/btn_op_equals"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onOperatorPressed"
-                android:text="="/>
-
-        <Button
-                android:id="@+id/btn_op_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onOperatorPressed"
-                android:text="+"/>
-    </GridLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/android-studio/Cukeulator/app/src/main/res/values/strings.xml b/android-studio/Cukeulator/app/src/main/res/values/strings.xml
deleted file mode 100644
index 1d58a11..0000000
--- a/android-studio/Cukeulator/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">Cukeulator</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
-    <string name="txt_calc_display_hint">0.0</string>
-
-</resources>
diff --git a/android-studio/Cukeulator/build.gradle b/android-studio/Cukeulator/build.gradle
deleted file mode 100644
index 61049f0..0000000
--- a/android-studio/Cukeulator/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        jcenter()
-        google()
-        // The locally built Cucumber-JVM libraries are also available for this example project.
-        mavenLocal()
-    }
-}
diff --git a/android-studio/Cukeulator/settings.gradle b/android-studio/Cukeulator/settings.gradle
deleted file mode 100644
index e7b4def..0000000
--- a/android-studio/Cukeulator/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..2508ee9
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,74 @@
+group = 'io.cucumber.android'
+
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        mavenLocal()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'digital.wup:android-maven-publish:3.6.2'
+        classpath "com.jaredsburrows:gradle-spoon-plugin:1.4.0"
+    }
+}
+
+ext {
+    targetSdkVersion = 27
+    buildToolsVersion = '28.0.2'
+    minSdkVersion = '14'
+
+    snapshotRepository = "https://oss.sonatype.org/content/repositories/snapshots"
+    releaseRepository = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+}
+allprojects {
+    repositories {
+        mavenLocal()
+        jcenter()
+        google()
+        maven {
+            url snapshotRepository
+        }
+        maven {
+            url releaseRepository
+        }
+    }
+    version = "4.0.0-SNAPSHOT"
+
+}
+
+
+subprojects { subproject ->
+
+
+    ext.addAndroidConfig ={
+        android {
+            compileSdkVersion rootProject.ext.targetSdkVersion
+            buildToolsVersion rootProject.ext.buildToolsVersion
+
+            defaultConfig {
+                minSdkVersion rootProject.ext.minSdkVersion
+                targetSdkVersion rootProject.ext.targetSdkVersion
+            }
+
+            compileOptions {
+                sourceCompatibility JavaVersion.VERSION_1_8
+                targetCompatibility JavaVersion.VERSION_1_8
+            }
+
+            lintOptions {
+                abortOnError false
+            }
+
+            testOptions {
+                unitTests {
+                    includeAndroidResources = true
+                }
+            }
+        }
+
+
+    }
+}
diff --git a/cucumber-android-test/.gitignore b/cucumber-android-test/.gitignore
deleted file mode 100644
index e6446c4..0000000
--- a/cucumber-android-test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gen-external-apklibs
diff --git a/cucumber-android-test/README.md b/cucumber-android-test/README.md
deleted file mode 100644
index f1e552d..0000000
--- a/cucumber-android-test/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Developers
-This maven module contains an Android project with integration tests for cucumber-android.
-
-### Prerequisites *(taken from the [maven-android-plugin](https://code.google.com/p/maven-android-plugin) documentation)*
-1. JDK 1.6+ installed as required for Android development
-2. [Android SDK](http://developer.android.com/sdk/index.html) (r17 or later, latest is best supported) installed, preferably with all platforms.
-3. [Maven 3.0.3+](http://maven.apache.org/download.html) installed
-4. Set environment variable `ANDROID_HOME` to the path of your installed Android SDK and add `$ANDROID_HOME/tools` as well as `$ANDROID_HOME/platform-tools` to your `$PATH`.
-
-On Windows: use `%ANDROID_HOME%\tools` and `%ANDROID_HOME%\platform-tools` instead.
-
-On OS X: Note that for the path to work on the commandline and in IDE's started by launchd [you have to set it](http://stackoverflow.com/questions/135688/setting-environment-variables-in-os-x/588442) in `/etc/launchd.conf` and **NOT** in .bashrc or something else.
-
-### Building using Maven
-
-```
-mvn package -pl examples/android/android-test -am -P android-examples
-```
-
-### Debugging using Maven
-Please read [the Android documentation on debugging](https://developer.android.com/tools/debugging/index.html).
-
-```
-mvn install -pl examples/android/android-test -am -P android-examples
-```
diff --git a/cucumber-android-test/pom.xml b/cucumber-android-test/pom.xml
deleted file mode 100644
index ed608b9..0000000
--- a/cucumber-android-test/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>io.cucumber.android</groupId>
-        <artifactId>cucumber-android-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>cucumber-android-test</artifactId>
-    <packaging>apk</packaging>
-    <name>Examples: Android-Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-android</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-picocontainer</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.simpligility.maven.plugins</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <!-- hack to workaround https://github.com/simpligility/android-maven-plugin/issues/548 -->
-                    <testCoverageFile>foo</testCoverageFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/cucumber-android-test/project.properties b/cucumber-android-test/project.properties
deleted file mode 100644
index a2bff58..0000000
--- a/cucumber-android-test/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-18
-android.library=false
diff --git a/cucumber-android-test/src/main/AndroidManifest.xml b/cucumber-android-test/src/main/AndroidManifest.xml
deleted file mode 100644
index 9275268..0000000
--- a/cucumber-android-test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This is the manifest for the android-test project, an Android project
-that is both an Android app-project and a test-project.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cucumber.example.android.test"
-          android:versionCode="1"
-          android:versionName="1.0">
-
-    <!--
-    We are using targetSdkVersion 18 (Android 4.3) in the manifest even though at most level 16
-    (Android 4.1) is available through maven. Users are expected to always build their apps with
-    the latest sdk level whilst maintaining backwards compatibility with minSdkVersion.
-    -->
-    <uses-sdk
-            android:minSdkVersion="8"
-            android:targetSdkVersion="18"/>
-    <application
-            android:label="@string/app_name"
-            android:icon="@drawable/ic_launcher">
-        <uses-library android:name="android.test.runner"/>
-        <activity
-                android:name=".CucumberActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-    </application>
-    <!--
-    It is essential to use CucumberInstrumentation as instrumentation.
-    targetPackage is the package name of the application you want to test; In this case
-    it is the the same as the test package because we are using only this one project to
-    test itself.
-    -->
-    <instrumentation
-            android:name="cucumber.api.android.CucumberInstrumentation"
-            android:targetPackage="cucumber.example.android.test"/>
-</manifest>
\ No newline at end of file
diff --git a/cucumber-android-test/src/main/assets/features/Test.feature b/cucumber-android-test/src/main/assets/features/Test.feature
deleted file mode 100644
index 7e0dd3d..0000000
--- a/cucumber-android-test/src/main/assets/features/Test.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Test
-
-  Scenario: Testing
-    Given I have a test
-    When I test
-    Then I succeed
diff --git a/cucumber-android-test/src/main/java/cucumber/example/android/test/CucumberActivity.java b/cucumber-android-test/src/main/java/cucumber/example/android/test/CucumberActivity.java
deleted file mode 100644
index 89b9559..0000000
--- a/cucumber-android-test/src/main/java/cucumber/example/android/test/CucumberActivity.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cucumber.example.android.test;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class CucumberActivity extends Activity {
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-    }
-}
diff --git a/cucumber-android-test/src/main/java/cucumber/example/android/test/CucumberActivitySteps.java b/cucumber-android-test/src/main/java/cucumber/example/android/test/CucumberActivitySteps.java
deleted file mode 100644
index 3f0974a..0000000
--- a/cucumber-android-test/src/main/java/cucumber/example/android/test/CucumberActivitySteps.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package cucumber.example.android.test;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import cucumber.api.CucumberOptions;
-import cucumber.api.java.After;
-import cucumber.api.java.Before;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-/**
- * We extend ActivityInstrumentationTestCase2 in order to have access to methods like getActivity
- * and getInstrumentation. Depending on what methods we are going to need, we can put our
- * step definitions inside classes extending any of the following Android test classes:
- * <p/>
- * ActivityInstrumentationTestCase2
- * InstrumentationTestCase
- * AndroidTestCase
- * <p/>
- * The CucumberOptions annotation is mandatory for exactly one of the classes in the test project.
- * Only the first annotated class that is found will be used, others are ignored. If no class is
- * annotated, an exception is thrown.
- * <p/>
- * The options need to at least specify features = "features". The default value that is set by
- * Cucumber internally does not work because features are not on the classpath under Android.
- * Features must be placed inside assets/features/ of the test project (or a subdirectory thereof).
- */
-@CucumberOptions(features = "features")
-public class CucumberActivitySteps extends ActivityInstrumentationTestCase2<CucumberActivity> {
-    private int steps;
-
-    public CucumberActivitySteps(SomeDependency dependency) {
-        super(CucumberActivity.class);
-        assertNotNull(dependency);
-    }
-
-    @Before
-    public void before() {
-        assertEquals(0, steps);
-        Instrumentation instrumentation = getInstrumentation();
-        assertNotNull(instrumentation);
-        assertNotNull(getActivity());
-        String testPackageName = instrumentation.getContext().getPackageName();
-        String targetPackageName = instrumentation.getContext().getPackageName();
-        assertEquals(testPackageName, targetPackageName);
-    }
-
-    @After
-    public void after() {
-        assertEquals(3, steps);
-    }
-
-    @Given("I have a test")
-    public void I_have_a_test() {
-        assertEquals(1, ++steps);
-    }
-
-    @When("I test")
-    public void I_test() {
-        assertEquals(2, ++steps);
-    }
-
-    @Then("I succeed")
-    public void I_succeed() {
-        assertEquals(3, ++steps);
-    }
-}
diff --git a/cucumber-android-test/src/main/java/cucumber/example/android/test/SomeDependency.java b/cucumber-android-test/src/main/java/cucumber/example/android/test/SomeDependency.java
deleted file mode 100644
index e704a35..0000000
--- a/cucumber-android-test/src/main/java/cucumber/example/android/test/SomeDependency.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package cucumber.example.android.test;
-
-// Dummy class to demonstrate dependency injection
-public class SomeDependency {
-}
diff --git a/cucumber-android-test/src/main/res/drawable-hdpi/ic_launcher.png b/cucumber-android-test/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index d0bdf36..0000000
Binary files a/cucumber-android-test/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/cucumber-android-test/src/main/res/layout/main.xml b/cucumber-android-test/src/main/res/layout/main.xml
deleted file mode 100644
index c496312..0000000
--- a/cucumber-android-test/src/main/res/layout/main.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-    <TextView
-            android:id="@+id/txt_main"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/cucumber-android-test/src/main/res/values/strings.xml b/cucumber-android-test/src/main/res/values/strings.xml
deleted file mode 100644
index 103bce0..0000000
--- a/cucumber-android-test/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Cucumber Android Test</string>
-</resources>
diff --git a/cucumber-android/build.gradle b/cucumber-android/build.gradle
new file mode 100644
index 0000000..089d46c
--- /dev/null
+++ b/cucumber-android/build.gradle
@@ -0,0 +1,69 @@
+apply plugin: 'com.android.library'
+apply plugin: 'digital.wup.android-maven-publish'
+
+addAndroidConfig()
+
+configurations.all {
+    // check for updates every build
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
+dependencies {
+    api "io.cucumber:cucumber-java:$version"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:3.8"
+    //noinspection GradleDependency compatibility with PowerMock
+    testImplementation "org.mockito:mockito-core:2.8.9"
+    testImplementation "org.powermock:powermock-api-mockito2:1.7.3"
+    testImplementation "org.powermock:powermock-module-junit4:1.7.3"
+}
+
+task("generateJavadoc", type: Javadoc, group: 'documentation') {
+    source = android.sourceSets.main.java.srcDirs
+    destinationDir = new File("${project.buildDir}/javadoc")
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
+task javadocJar(type: Jar, dependsOn: generateJavadoc) {
+    classifier = 'javadoc'
+    from generateJavadoc.destinationDir
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+
+publishing {
+    publications {
+        mavenAar(MavenPublication) {
+            from components.android
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                url = 'https://github.com/cucumber/cucumber-android/'
+                scm {
+                    connection = 'scm:git:https://github.com/cucumber/cucumber-android.git'
+                    developerConnection = 'scm:git:git@github.com:cucumber/cucumber-android.git'
+                    url = 'https://github.com/cucumber/cucumber-android'
+                }
+
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'http://www.opensource.org/licenses/mit-license'
+                        distribution = 'repo'
+                    }
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            url project.version.endsWith('-SNAPSHOT') ? snapshotRepository : releaseRepository
+        }
+    }
+}
diff --git a/cucumber-android/pom.xml b/cucumber-android/pom.xml
deleted file mode 100644
index 56beb4a..0000000
--- a/cucumber-android/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>io.cucumber.android</groupId>
-        <artifactId>cucumber-android-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>cucumber-android</artifactId>
-    <name>Cucumber-Android: Main</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android-test</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>17.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <!--Override parent pom. Android is stuck on Powermock. Which is stuck on Mockito 1.x-->
-            <version>1.10.19</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-integration</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.robolectric</groupId>
-            <artifactId>robolectric</artifactId>
-            <version>2.3</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.android.support</groupId>
-                    <artifactId>support-v4</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-mockito-release-full</artifactId>
-            <version>1.6.4</version>
-            <classifier>full</classifier>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>powermock-module-testng</artifactId>
-                    <groupId>org.powermock</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>powermock-module-testng-common</artifactId>
-                    <groupId>org.powermock</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/cucumber-android/src/main/AndroidManifest.xml b/cucumber-android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..0f542b8
--- /dev/null
+++ b/cucumber-android/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="io.cucumber.android"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
+</manifest>
\ No newline at end of file
diff --git a/cucumber-android/src/main/java/cucumber/runtime/android/AndroidObjectFactory.java b/cucumber-android/src/main/java/cucumber/runtime/android/AndroidObjectFactory.java
index b70a3d2..feec4d2 100644
--- a/cucumber-android/src/main/java/cucumber/runtime/android/AndroidObjectFactory.java
+++ b/cucumber-android/src/main/java/cucumber/runtime/android/AndroidObjectFactory.java
@@ -12,6 +12,7 @@
  * make sure that created test classes have all necessary references to the executing {@link android.app.Instrumentation}
  * and the associated {@link android.content.Context}.
  */
+@SuppressWarnings("deprecation")
 final class AndroidObjectFactory implements ObjectFactory {
 
     /**
diff --git a/cucumber-android/src/main/java/cucumber/runtime/android/CucumberExecutor.java b/cucumber-android/src/main/java/cucumber/runtime/android/CucumberExecutor.java
index e14906b..7d64078 100644
--- a/cucumber-android/src/main/java/cucumber/runtime/android/CucumberExecutor.java
+++ b/cucumber-android/src/main/java/cucumber/runtime/android/CucumberExecutor.java
@@ -3,44 +3,44 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.util.Log;
-import cucumber.api.TypeRegistryConfigurer;
 import cucumber.api.CucumberOptions;
 import cucumber.api.StepDefinitionReporter;
+import cucumber.api.TypeRegistryConfigurer;
+import cucumber.api.event.TestRunFinished;
 import cucumber.api.event.TestRunStarted;
+import cucumber.api.java.ObjectFactory;
 import cucumber.runner.EventBus;
 import cucumber.runner.Runner;
+import cucumber.runner.ThreadLocalRunnerSupplier;
 import cucumber.runner.TimeService;
-import cucumber.runtime.BackendSupplier;
-import cucumber.runtime.FeaturePathFeatureSupplier;
-import cucumber.runtime.filter.Filters;
-import cucumber.runtime.formatter.Plugins;
-import cucumber.runtime.filter.RerunFilters;
-import cucumber.runtime.formatter.PluginFactory;
-import cucumber.runtime.model.FeatureLoader;
-import cucumber.runtime.ThreadLocalRunnerSupplier;
-import cucumber.runtime.RuntimeGlueSupplier;
-import io.cucumber.stepexpression.TypeRegistry;
-import cucumber.api.event.TestRunFinished;
-import cucumber.api.java.ObjectFactory;
+import cucumber.runner.TimeServiceEventBus;
 import cucumber.runtime.Backend;
+import cucumber.runtime.BackendSupplier;
 import cucumber.runtime.ClassFinder;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.DefaultTypeRegistryConfiguration;
 import cucumber.runtime.Env;
+import cucumber.runtime.FeaturePathFeatureSupplier;
 import cucumber.runtime.Reflections;
 import cucumber.runtime.RuntimeOptions;
 import cucumber.runtime.RuntimeOptionsFactory;
-import cucumber.runtime.formatter.Stats;
 import cucumber.runtime.UndefinedStepsTracker;
+import cucumber.runtime.filter.Filters;
+import cucumber.runtime.filter.RerunFilters;
 import cucumber.runtime.formatter.AndroidInstrumentationReporter;
 import cucumber.runtime.formatter.AndroidLogcatReporter;
+import cucumber.runtime.formatter.PluginFactory;
+import cucumber.runtime.formatter.Plugins;
+import cucumber.runtime.formatter.Stats;
 import cucumber.runtime.io.MultiLoader;
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.java.JavaBackend;
 import cucumber.runtime.java.ObjectFactoryLoader;
 import cucumber.runtime.model.CucumberFeature;
+import cucumber.runtime.model.FeatureLoader;
 import dalvik.system.DexFile;
 import gherkin.events.PickleEvent;
+import io.cucumber.stepexpression.TypeRegistry;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -101,10 +101,9 @@ public CucumberExecutor(final Arguments arguments, final Instrumentation instrum
 
         ResourceLoader resourceLoader = new AndroidResourceLoader(context);
 
-        this.bus = new EventBus(TimeService.SYSTEM);
+        this.bus = new TimeServiceEventBus(TimeService.SYSTEM);
         this.plugins = new Plugins(classLoader, new PluginFactory(), bus, runtimeOptions);
-        RuntimeGlueSupplier glueSupplier = new RuntimeGlueSupplier();
-        this.runner = new ThreadLocalRunnerSupplier(runtimeOptions, bus, createBackends(), glueSupplier).get();
+        this.runner = new ThreadLocalRunnerSupplier(runtimeOptions, bus, createBackends()).get();
         FeatureLoader featureLoader = new FeatureLoader(resourceLoader);
         FeaturePathFeatureSupplier featureSupplier = new FeaturePathFeatureSupplier(featureLoader, runtimeOptions);
         RerunFilters rerunFilters = new RerunFilters(runtimeOptions, featureLoader);
diff --git a/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidInstrumentationReporter.java b/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidInstrumentationReporter.java
index cd6579c..cc12471 100644
--- a/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidInstrumentationReporter.java
+++ b/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidInstrumentationReporter.java
@@ -4,13 +4,13 @@
 import android.os.Bundle;
 import cucumber.api.Result;
 import cucumber.api.TestCase;
+import cucumber.api.event.ConcurrentEventListener;
 import cucumber.api.event.EventHandler;
 import cucumber.api.event.EventPublisher;
 import cucumber.api.event.TestCaseFinished;
 import cucumber.api.event.TestCaseStarted;
 import cucumber.api.event.TestSourceRead;
 import cucumber.api.event.TestStepFinished;
-import cucumber.api.formatter.Formatter;
 import cucumber.runtime.UndefinedStepsTracker;
 import cucumber.runtime.Utils;
 
@@ -41,7 +41,7 @@
  *     hook threw an exception other than an {@link AssertionError}</li>
  * </ul>
  */
-public final class AndroidInstrumentationReporter implements Formatter {
+public final class AndroidInstrumentationReporter implements ConcurrentEventListener {
 
     /**
      * Tests status keys.
diff --git a/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidLogcatReporter.java b/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidLogcatReporter.java
index bc87847..5b786eb 100644
--- a/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidLogcatReporter.java
+++ b/cucumber-android/src/main/java/cucumber/runtime/formatter/AndroidLogcatReporter.java
@@ -2,18 +2,18 @@
 
 import android.util.Log;
 import cucumber.api.PickleStepTestStep;
+import cucumber.api.event.ConcurrentEventListener;
 import cucumber.api.event.EventHandler;
 import cucumber.api.event.EventPublisher;
 import cucumber.api.event.TestCaseStarted;
 import cucumber.api.event.TestRunFinished;
 import cucumber.api.event.TestStepStarted;
-import cucumber.api.formatter.Formatter;
 import cucumber.runtime.UndefinedStepsTracker;
 
 /**
  * Logs information about the currently executed statements to androids logcat.
  */
-public final class AndroidLogcatReporter implements Formatter {
+public final class AndroidLogcatReporter implements ConcurrentEventListener {
 
     /**
      * The log tag to be used when logging to logcat.
diff --git a/cucumber-android/src/test/java/cucumber/runtime/android/AndroidObjectFactoryTest.java b/cucumber-android/src/test/java/cucumber/runtime/android/AndroidObjectFactoryTest.java
index 707372a..ff4f742 100644
--- a/cucumber-android/src/test/java/cucumber/runtime/android/AndroidObjectFactoryTest.java
+++ b/cucumber-android/src/test/java/cucumber/runtime/android/AndroidObjectFactoryTest.java
@@ -9,14 +9,17 @@
 import cucumber.api.java.ObjectFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.internal.stubbing.answers.Returns;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@SuppressWarnings("deprecation")
 @RunWith(RobolectricTestRunner.class)
-@Config(emulateSdk = 16, manifest = Config.NONE)
+@Config(manifest = Config.NONE)
 public class AndroidObjectFactoryTest {
 
     private final ObjectFactory delegate = mock(ObjectFactory.class);
@@ -76,7 +79,7 @@ public void injects_instrumentation_into_ActivityInstrumentationTestCase2() {
         // given
         final Class<?> activityInstrumentationTestCase2Class = ActivityInstrumentationTestCase2.class;
         final ActivityInstrumentationTestCase2 activityInstrumentationTestCase2 = mock(ActivityInstrumentationTestCase2.class);
-        when(delegate.getInstance(activityInstrumentationTestCase2Class)).thenReturn(activityInstrumentationTestCase2);
+        when(delegate.getInstance(activityInstrumentationTestCase2Class)).then(new Returns(activityInstrumentationTestCase2));
 
         // when
         androidObjectFactory.getInstance(activityInstrumentationTestCase2Class);
@@ -91,14 +94,13 @@ public void sets_activity_intent_with_FLAG_ACTIVITY_CLEAR_TOP_to_prevent_stallin
         // given
         final Class<?> activityInstrumentationTestCase2Class = ActivityInstrumentationTestCase2.class;
         final ActivityInstrumentationTestCase2 activityInstrumentationTestCase2 = mock(ActivityInstrumentationTestCase2.class);
-        when(delegate.getInstance(activityInstrumentationTestCase2Class)).thenReturn(activityInstrumentationTestCase2);
-        final Intent intent = new Intent().addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        when(delegate.getInstance(activityInstrumentationTestCase2Class)).then(new Returns(activityInstrumentationTestCase2));
 
         // when
         androidObjectFactory.getInstance(activityInstrumentationTestCase2Class);
 
         // then
-        verify(activityInstrumentationTestCase2).setActivityIntent(intent);
+        verify(activityInstrumentationTestCase2).setActivityIntent(Mockito.argThat(argument -> argument.getFlags()==Intent.FLAG_ACTIVITY_CLEAR_TOP));
     }
 
     @Test
@@ -107,7 +109,7 @@ public void injects_instrumentation_into_InstrumentationTestCase() {
         // given
         final Class<?> instrumentationTestCaseClass = InstrumentationTestCase.class;
         final InstrumentationTestCase instrumentationTestCase = mock(InstrumentationTestCase.class);
-        when(delegate.getInstance(instrumentationTestCaseClass)).thenReturn(instrumentationTestCase);
+        when(delegate.getInstance(instrumentationTestCaseClass)).then(new Returns(instrumentationTestCase));
 
         // when
         androidObjectFactory.getInstance(instrumentationTestCaseClass);
@@ -122,7 +124,7 @@ public void injects_instrumentation_context_into_AndroidTestCase() {
         // given
         final Class<?> androidTestCaseClass = AndroidTestCase.class;
         final AndroidTestCase androidTestCase = mock(AndroidTestCase.class);
-        when(delegate.getInstance(androidTestCaseClass)).thenReturn(androidTestCase);
+        when(delegate.getInstance(androidTestCaseClass)).then(new Returns(androidTestCase));
         final Context context = mock(Context.class);
         when(instrumentation.getTargetContext()).thenReturn(context);
 
diff --git a/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceLoaderTest.java b/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceLoaderTest.java
index a252b9a..451cea1 100644
--- a/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceLoaderTest.java
+++ b/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceLoaderTest.java
@@ -4,8 +4,6 @@
 import android.content.res.AssetManager;
 import com.google.common.collect.Lists;
 import cucumber.runtime.io.Resource;
-import java.io.IOException;
-import java.util.List;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -14,6 +12,10 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+
+import java.io.IOException;
+import java.util.List;
+
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -22,7 +24,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(emulateSdk = 16, manifest = Config.NONE)
+@Config(manifest = Config.NONE)
 public class AndroidResourceLoaderTest {
 
     private final Context context = mock(Context.class);
diff --git a/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceTest.java b/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceTest.java
index 5a2aafe..d2df7da 100644
--- a/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceTest.java
+++ b/cucumber-android/src/test/java/cucumber/runtime/android/AndroidResourceTest.java
@@ -5,21 +5,22 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(emulateSdk = 16, manifest = Config.NONE)
+@Config(manifest = Config.NONE)
 public class AndroidResourceTest {
 
     @Rule
     public final TemporaryFolder temporaryFolder = new TemporaryFolder();
     
-    private final Context context = Robolectric.application;
+    private final Context context = RuntimeEnvironment.application;
 
     @Test
     public void getPath_returns_given_path() {
diff --git a/cucumber-android/src/test/java/cucumber/runtime/android/CoverageDumperTest.java b/cucumber-android/src/test/java/cucumber/runtime/android/CoverageDumperTest.java
index 2f75391..9fbfa4c 100644
--- a/cucumber-android/src/test/java/cucumber/runtime/android/CoverageDumperTest.java
+++ b/cucumber-android/src/test/java/cucumber/runtime/android/CoverageDumperTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(emulateSdk = 16, manifest = Config.NONE)
+@Config(manifest = Config.NONE)
 public class CoverageDumperTest {
 
     @Rule
diff --git a/cucumber-android/src/test/java/cucumber/runtime/android/DexClassFinderTest.java b/cucumber-android/src/test/java/cucumber/runtime/android/DexClassFinderTest.java
index f309980..c393aa9 100644
--- a/cucumber-android/src/test/java/cucumber/runtime/android/DexClassFinderTest.java
+++ b/cucumber-android/src/test/java/cucumber/runtime/android/DexClassFinderTest.java
@@ -7,10 +7,6 @@
 import cucumber.runtime.android.stub.wanted.R;
 import cucumber.runtime.android.stub.wanted.SomeClass;
 import dalvik.system.DexFile;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.List;
 import org.hamcrest.Matcher;
 import org.hamcrest.collection.IsIterableContainingInOrder;
 import org.junit.Before;
@@ -18,10 +14,16 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.List;
+
 import static org.junit.Assert.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowDexFile.class}, emulateSdk = 16, manifest = Config.NONE)
+@Config(shadows = {ShadowDexFile.class}, manifest = Config.NONE)
 public class DexClassFinderTest {
 
     private DexFile dexFile;
diff --git a/cucumber-android/src/test/java/cucumber/runtime/formatter/AndroidInstrumentationReporterTest.java b/cucumber-android/src/test/java/cucumber/runtime/formatter/AndroidInstrumentationReporterTest.java
index 124be16..251e294 100644
--- a/cucumber-android/src/test/java/cucumber/runtime/formatter/AndroidInstrumentationReporterTest.java
+++ b/cucumber-android/src/test/java/cucumber/runtime/formatter/AndroidInstrumentationReporterTest.java
@@ -1,16 +1,5 @@
 package cucumber.runtime.formatter;
 
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import android.app.Instrumentation;
 import android.os.Bundle;
 import cucumber.api.PendingException;
@@ -32,6 +21,17 @@
 
 import java.util.List;
 
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @Config(manifest = Config.NONE)
 @RunWith(RobolectricTestRunner.class)
 public class AndroidInstrumentationReporterTest {
@@ -47,8 +47,8 @@ public class AndroidInstrumentationReporterTest {
         "path/file.feature",
         "Feature: feature name\n  Scenario: some important scenario\n");
     private final TestCase testCase = mock(TestCase.class);
-    private final Result firstResult = mock(Result.class);
-    private final Result secondResult = mock(Result.class);
+    private Result firstResult ;
+    private Result secondResult;
 
 
     @Before
@@ -83,7 +83,7 @@ public void feature_name_and_keyword_is_contained_in_end_signal() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult= createResultStatus(Result.Type.PASSED);
 
         // when
         formatter.testSourceRead(testSourceRead);
@@ -127,7 +127,7 @@ public void scenario_name_is_contained_in_end_signal() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult=createResultStatus(Result.Type.PASSED);
 
         // when
         formatter.setNumberOfTests(1);
@@ -150,8 +150,7 @@ public void any_step_exception_causes_test_error() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.FAILED);
-        when(firstResult.getError()).thenReturn(new RuntimeException("some random runtime exception"));
+        firstResult=createResultStatus(Result.Type.FAILED,new RuntimeException("some random runtime exception"));
 
         // when
         formatter.setNumberOfTests(1);
@@ -173,9 +172,7 @@ public void any_failing_step_causes_test_failure() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.FAILED);
-        when(firstResult.getError()).thenReturn(new AssertionError("some test assertion went wrong"));
-        when(firstResult.getErrorMessage()).thenReturn("some test assertion went wrong");
+        firstResult=createResultStatus(Result.Type.FAILED,new AssertionError("some test assertion went wrong"));
 
         // when
         formatter.setNumberOfTests(1);
@@ -191,12 +188,16 @@ public void any_failing_step_causes_test_failure() {
         assertThat(actualBundle.getString(AndroidInstrumentationReporter.StatusKeys.STACK), containsString("some test assertion went wrong"));
     }
 
+    private Result createResultStatus(Result.Type type, Throwable error) {
+        return new Result(type, 0L,error);
+    }
+
     @Test
     public void any_undefined_step_causes_test_error() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.UNDEFINED);
+        firstResult=createResultStatus(Result.Type.UNDEFINED);
         when(runtime.getSnippets()).thenReturn(Collections.singletonList("some snippet"));
 
         // when
@@ -218,7 +219,7 @@ public void passing_step_causes_test_success() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult=createResultStatus(Result.Type.PASSED);
 
         // when
         formatter.setNumberOfTests(1);
@@ -235,8 +236,8 @@ public void skipped_step_causes_test_success() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
-        mockResultStatus(secondResult, Result.Type.SKIPPED);
+        firstResult=createResultStatus(Result.Type.PASSED);
+        secondResult=createResultStatus(Result.Type.SKIPPED);
 
         // when
         formatter.setNumberOfTests(2);
@@ -255,11 +256,9 @@ public void first_step_result_exception_is_reported() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.FAILED);
-        when(firstResult.getError()).thenReturn(new RuntimeException("first exception"));
+        firstResult=createResultStatus(Result.Type.FAILED,new RuntimeException("first exception"));
 
-        mockResultStatus(secondResult, Result.Type.FAILED);
-        when(secondResult.getError()).thenReturn(new RuntimeException("second exception"));
+        secondResult=createResultStatus(Result.Type.FAILED,new RuntimeException("second exception"));
 
         // when
         formatter.setNumberOfTests(2);
@@ -281,9 +280,9 @@ public void undefined_step_overrides_preceding_passed_step() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult=createResultStatus(Result.Type.PASSED);
 
-        mockResultStatus(secondResult, Result.Type.UNDEFINED);
+        secondResult=createResultStatus(Result.Type.UNDEFINED);
         when(runtime.getSnippets()).thenReturn(Collections.singletonList("some snippet"));
 
         // when
@@ -306,11 +305,9 @@ public void pending_step_overrides_preceding_passed_step() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult=createResultStatus(Result.Type.PASSED);
 
-        mockResultStatus(secondResult, Result.Type.PENDING);
-        when(secondResult.getError()).thenReturn(new PendingException("step is pending"));
-        when(secondResult.getErrorMessage()).thenReturn("step is pending");
+        secondResult=createResultStatus(Result.Type.PENDING,new PendingException("step is pending"));
 
         // when
         formatter.setNumberOfTests(2);
@@ -332,11 +329,9 @@ public void failed_step_overrides_preceding_passed_step() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult=createResultStatus(Result.Type.PASSED);
 
-        mockResultStatus(secondResult, Result.Type.FAILED);
-        when(secondResult.getError()).thenReturn(new AssertionError("some assertion went wrong"));
-        when(secondResult.getErrorMessage()).thenReturn("some assertion went wrong");
+        secondResult=createResultStatus(Result.Type.FAILED,new AssertionError("some assertion went wrong"));
 
         // when
         formatter.setNumberOfTests(2);
@@ -358,10 +353,9 @@ public void error_step_overrides_preceding_passed_step() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult=createResultStatus(Result.Type.PASSED);
 
-        mockResultStatus(secondResult, Result.Type.FAILED);
-        when(secondResult.getError()).thenReturn(new RuntimeException("some exception"));
+        secondResult=createResultStatus(Result.Type.FAILED,new RuntimeException("some exception"));
 
         // when
         formatter.setNumberOfTests(2);
@@ -383,12 +377,10 @@ public void failed_step_does_not_overrides_preceding_undefined_step() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.UNDEFINED);
+        firstResult=createResultStatus(Result.Type.UNDEFINED);
         when(runtime.getSnippets()).thenReturn(Collections.singletonList("some snippet"));
 
-        mockResultStatus(secondResult, Result.Type.FAILED);
-        when(secondResult.getError()).thenReturn(new AssertionError("some assertion went wrong"));
-        when(secondResult.getErrorMessage()).thenReturn("some assertion went wrong");
+        secondResult=createResultStatus(Result.Type.FAILED,new AssertionError("some assertion went wrong"));
 
         // when
         formatter.setNumberOfTests(2);
@@ -410,12 +402,9 @@ public void error_step_does_not_override_preceding_failed_step() {
 
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.FAILED);
-        when(firstResult.getError()).thenReturn(new AssertionError("some assertion went wrong"));
-        when(firstResult.getErrorMessage()).thenReturn("some assertion went wrong");
+        firstResult=createResultStatus(Result.Type.FAILED,new AssertionError("some assertion went wrong"));
 
-        mockResultStatus(secondResult, Result.Type.FAILED);
-        when(secondResult.getError()).thenReturn(new RuntimeException("some exception"));
+        secondResult=createResultStatus( Result.Type.FAILED,new RuntimeException("some exception"));
 
         // when
         formatter.setNumberOfTests(2);
@@ -436,11 +425,9 @@ public void error_step_does_not_override_preceding_failed_step() {
     public void step_result_contains_only_the_current_scenarios_severest_result() {
         // given
         final AndroidInstrumentationReporter formatter = new AndroidInstrumentationReporter(runtime, instrumentation);
-        mockResultStatus(firstResult, Result.Type.FAILED);
-        when(firstResult.getError()).thenReturn(new AssertionError("some assertion went wrong"));
-        when(firstResult.getErrorMessage()).thenReturn("some assertion went wrong");
+        firstResult=createResultStatus(Result.Type.FAILED,new AssertionError("some assertion went wrong"));
 
-        mockResultStatus(secondResult, Result.Type.PASSED);
+        secondResult=createResultStatus(Result.Type.PASSED);
 
         // when
         formatter.setNumberOfTests(2);
@@ -476,9 +463,9 @@ public void test_names_within_feature_are_made_unique_by_appending_blank_and_num
 
         // then
         final InOrder inOrder = inOrder(instrumentation);
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not unique name"));
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not unique name 2"));
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not unique name 3"));
+        assertThat(captureTestName(inOrder), equalTo("not unique name"));
+        assertThat(captureTestName(inOrder), equalTo("not unique name 2"));
+        assertThat(captureTestName(inOrder), equalTo("not unique name 3"));
     }
 
     @Test
@@ -495,9 +482,9 @@ public void test_names_within_are_made_unique_by_appending_underscore_and_number
 
         // then
         final InOrder inOrder = inOrder(instrumentation);
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not_unique_name"));
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not_unique_name_2"));
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not_unique_name_3"));
+        assertThat(captureTestName(inOrder), equalTo("not_unique_name"));
+        assertThat(captureTestName(inOrder), equalTo("not_unique_name_2"));
+        assertThat(captureTestName(inOrder), equalTo("not_unique_name_3"));
     }
 
     @Test
@@ -513,8 +500,8 @@ public void test_names_in_different_features_can_be_the_same() {
 
         // then
         final InOrder inOrder = inOrder(instrumentation);
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not unique name"));
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not unique name"));
+        assertThat(captureTestName(inOrder), equalTo("not unique name"));
+        assertThat(captureTestName(inOrder), equalTo("not unique name"));
     }
 
     @Test
@@ -531,14 +518,13 @@ public void test_names_are_made_unique_also_when_not_consecutive() {
 
         // then
         final InOrder inOrder = inOrder(instrumentation);
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not unique name"));
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("unique name"));
-        assertThat(captureTestName(inOrder, instrumentation), equalTo("not unique name 2"));
+        assertThat(captureTestName(inOrder), equalTo("not unique name"));
+        assertThat(captureTestName(inOrder), equalTo("unique name"));
+        assertThat(captureTestName(inOrder), equalTo("not unique name 2"));
     }
 
-    private void mockResultStatus(Result result, Result.Type status) {
-        when(result.getStatus()).thenReturn(status);
-        when(result.is(Result.Type.PASSED)).thenReturn(status == Result.Type.PASSED);
+    private Result createResultStatus(Result.Type status) {
+        return createResultStatus(status, null);
     }
 
     private TestCase mockTestCase(String testCaseName) {
@@ -561,7 +547,7 @@ private String featureUri(String uri) {
     }
 
     private void simulateRunningTestCases(AndroidInstrumentationReporter formatter, List<TestCase> testCases) {
-        mockResultStatus(firstResult, Result.Type.PASSED);
+        firstResult=createResultStatus(Result.Type.PASSED);
         formatter.setNumberOfTests(testCases.size());
         for (TestCase testCase : testCases) {
             formatter.startTestCase(testCase);
@@ -570,7 +556,7 @@ private void simulateRunningTestCases(AndroidInstrumentationReporter formatter,
         }
     }
 
-    private String captureTestName(InOrder inOrder, Instrumentation intrumentation) {
+    private String captureTestName(InOrder inOrder) {
         final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
         inOrder.verify(instrumentation).sendStatus(eq(StatusCodes.START), captor.capture());
         final Bundle actualBundle = captor.getValue();
diff --git a/cukeulator-test/.gitignore b/cukeulator-test/.gitignore
deleted file mode 100644
index 2173b33..0000000
--- a/cukeulator-test/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.iml
-*.class
-local.properties
-libs/*.jar
-.idea/
-bin/
-gen/
-out/
\ No newline at end of file
diff --git a/cukeulator-test/README.md b/cukeulator-test/README.md
deleted file mode 100644
index 04cd953..0000000
--- a/cukeulator-test/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-## Cukeulator Example Test
-This is the example test-project for the Cukeulator app. Running the test assumes that the application itself has been install in your local repository like so:
-
-```
-mvn install -pl examples/android/cukeulator -P android-examples
-```
-
-### Setup
-Features must be placed in `assets/features/`. Subdirectories are allowed.
-
-Read `libs/README.md` for details on dependencies.
-
-### Using Ant
-1. Please read ["Building and Running from the Command Line"](https://developer.android.com/tools/building/building-cmdline.html).
-2. Run `ant clean debug install test`.
-
-### Using an IDE
-1. Please read ["Building and Running from Eclipse with ADT"](https://developer.android.com/tools/building/building-eclipse.html).
-2. Create an Android test-project from these sources with `cucumber-example/` as the tested project.
-3. Create a run configuration with `cucumber.android.api.CucumberInstrumentation` as the instrumentation.
-4. Make sure you have the required jar dependencies in `libs/`.
-
-### Using Maven
-To build:
-
-```
-mvn package -pl examples/android/cukeulator-test -am -P android-examples
-```
-
-To install and run:
-
-```
-mvn install -pl examples/android/cukeulator-test -am -P android-examples
-```
-
-To re-run already installed package:
-
-```
-mvn android:instrument -pl examples/android/cukeulator-test -P android-examples
-```
-
-View [all available goals](http://maven-android-plugin-m2site.googlecode.com/svn/plugin-info.html):
-
-```
-mvn android:help -pl examples/android/cukeulator-test -P android-examples
-```
-
-### Output
-Filter for the logcat tag `cucumber-android` in [DDMS](https://developer.android.com/tools/debugging/ddms.html).
diff --git a/cukeulator-test/ant.properties b/cukeulator-test/ant.properties
deleted file mode 100644
index 5bd523b..0000000
--- a/cukeulator-test/ant.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-tested.project.dir=../cukeulator
-test.runner=cucumber.api.android.CucumberInstrumentation
diff --git a/cukeulator-test/build.xml b/cukeulator-test/build.xml
deleted file mode 100644
index ed4e80f..0000000
--- a/cukeulator-test/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="AndroidCucumberExampleTest" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties"/>
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties"/>
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env"/>
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME"/>
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties"/>
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-            />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true"/>
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml"/>
-
-</project>
diff --git a/cukeulator-test/custom_rules.xml b/cukeulator-test/custom_rules.xml
deleted file mode 100644
index 415c303..0000000
--- a/cukeulator-test/custom_rules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="AndroidCucumberExampleTestCustomRules">
-    <!--
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="./libs/init.xml"/>
-
-    <target name="-pre-build">
-        <antcall target="libs.init"/>
-    </target>
-</project>
diff --git a/cukeulator-test/libs/README.md b/cukeulator-test/libs/README.md
deleted file mode 100644
index e30c7e7..0000000
--- a/cukeulator-test/libs/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-If you intend to build this project with Ant or with an IDE,
-you will need to have the required jars inside this directory.
-
-If you're building this project with **Ant,** just run ../build.xml
-and the required jars will **automatically be downloaded.**
-
-### Required jars for Cukeulator Test App
-* cucumber-core
-* cucumber-java
-* cucumber-android
-* cucumber-jvm-deps-1.0.3 (shouldn't be necessary)
-* cucumber-picocontainer (shouldn't be necessary)
-* picocontainer-2.14.3 (shouldn't be necessary)
-* gherkin-2.12.1 (shouldn't be necessary)
-* cucumber-html (only required for HTML reports)
-
-
-* To download the release versions run `ant -f init.xml`.
-* Or run `./init.sh` to build snaphsots with Maven.
-
-*Note for Eclipse users: The IDE should automatically include all .jars from the libs/ directory.*
-
-*Note for IDEA users: You need to manually include jars from /libs for your module.*
diff --git a/cukeulator-test/libs/init.sh b/cukeulator-test/libs/init.sh
deleted file mode 100755
index 828e276..0000000
--- a/cukeulator-test/libs/init.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Build required jars
-mvn package -pl android -am -f ../../../../pom.xml
-
-# Copy jars to this location
-cp ../../../../core/target/cucumber-core-*.jar ./
-cp ../../../../java/target/cucumber-java-*.jar ./
-cp ../../../../android/target/cucumber-android-*.jar ./
diff --git a/cukeulator-test/libs/init.xml b/cukeulator-test/libs/init.xml
deleted file mode 100644
index 20e9345..0000000
--- a/cukeulator-test/libs/init.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="AndroidCucumberExampleTest" default="libs.init">
-    <property name="url.variant" value="releases"/>
-    <property name="url.base" value="https://oss.sonatype.org/content/repositories/${url.variant}/info/cukes"/>
-    <property name="name.cucumber" value="cucumber-jvm"/>
-    <property name="name.core" value="cucumber-core"/>
-    <property name="name.java" value="cucumber-java"/>
-    <property name="name.android" value="cucumber-android"/>
-    <property name="file.metadata" value="maven-metadata.xml"/>
-    <property name="file.dest" value="."/>
-    <property name="file.libs" value="libs"/>
-    <available file="${file.libs}" type="dir" property="file.libs.present"/>
-
-    <target name="libs.getmetadata">
-        <get src="${url.base}/${name.cucumber}/${file.metadata}" dest="./"/>
-    </target>
-
-    <target name="libs.getjar.libs" depends="libs.getmetadata" if="file.libs.present">
-        <xmlproperty file="${file.metadata}" collapseAttributes="true"/>
-        <get dest="${file.dest}/${file.libs}/">
-            <url url="${url.base}/${name.core}/${metadata.versioning.latest}/${name.core}-${metadata.versioning.latest}.jar"/>
-            <url url="${url.base}/${name.java}/${metadata.versioning.latest}/${name.java}-${metadata.versioning.latest}.jar"/>
-            <url url="${url.base}/${name.android}/${metadata.versioning.latest}/${name.android}-${metadata.versioning.latest}.jar"/>
-        </get>
-        <delete file="${file.metadata}"/>
-    </target>
-
-    <target name="libs.getjar.root" depends="libs.getmetadata" unless="file.libs.present">
-        <xmlproperty file="${file.metadata}" collapseAttributes="true"/>
-        <get dest="${file.dest}/">
-            <url url="${url.base}/${name.core}/${metadata.versioning.latest}/${name.core}-${metadata.versioning.latest}.jar"/>
-            <url url="${url.base}/${name.java}/${metadata.versioning.latest}/${name.java}-${metadata.versioning.latest}.jar"/>
-            <url url="${url.base}/${name.android}/${metadata.versioning.latest}/${name.android}-${metadata.versioning.latest}.jar"/>
-        </get>
-        <delete file="${file.metadata}"/>
-    </target>
-
-    <target name="libs.init" depends="libs.getjar.libs, libs.getjar.root"/>
-</project>
diff --git a/cukeulator-test/pom.xml b/cukeulator-test/pom.xml
deleted file mode 100644
index f07cdab..0000000
--- a/cukeulator-test/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>io.cucumber.android</groupId>
-        <artifactId>cucumber-android-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>cukelator-test</artifactId>
-    <packaging>apk</packaging>
-    <name>Examples: Android Cukeulator Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-android</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-picocontainer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.cucumber.android</groupId>
-            <artifactId>cukelator</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- declare apk dependency for android:deploy-dependencies target -->
-        <dependency>
-            <groupId>io.cucumber.android</groupId>
-            <artifactId>cukelator</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-            <type>apk</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!--Disable maven enforcer plugin. Makes apk declaration pass above pass. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>com.simpligility.maven.plugins</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <!-- hack to workaround https://github.com/simpligility/android-maven-plugin/issues/548 -->
-                    <testCoverageFile>foo</testCoverageFile>
-                    <failOnNonStandardStructure>false</failOnNonStandardStructure>
-                    <!--Breaks the build when the tests fail-->
-                    <testFailSafe>false</testFailSafe>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/cukeulator-test/proguard-project.txt b/cukeulator-test/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/cukeulator-test/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/cukeulator-test/project.properties b/cukeulator-test/project.properties
deleted file mode 100644
index 6df9ff8..0000000
--- a/cukeulator-test/project.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-21
-android.library=false
-project.type=0
diff --git a/cukeulator-test/src/main/AndroidManifest.xml b/cukeulator-test/src/main/AndroidManifest.xml
deleted file mode 100644
index 959ac36..0000000
--- a/cukeulator-test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cucumber.example.android.cukeulator.test"
-          android:versionCode="1"
-          android:versionName="1.0">
-
-    <application>
-        <uses-library android:name="android.test.runner"/>
-    </application>
-    <!--
-    This declares that this application uses the instrumentation test runner targeting
-    the package of cucumber.example.android.cukeulator. To run the tests use the command:
-    "adb shell am instrument -w cucumber.example.android.cukeulator.test/cucumber.api.android.CucumberInstrumentation"
-    -->
-    <instrumentation
-            android:name="cucumber.api.android.CucumberInstrumentation"
-            android:targetPackage="cucumber.example.android.cukeulator"
-            android:label="Tests for cucumber.example.android.cukeulator"/>
-</manifest>
diff --git a/cukeulator-test/src/main/assets/features/extra/calculate.feature b/cukeulator-test/src/main/assets/features/extra/calculate.feature
deleted file mode 100644
index ad05180..0000000
--- a/cukeulator-test/src/main/assets/features/extra/calculate.feature
+++ /dev/null
@@ -1,20 +0,0 @@
-Feature: Calculate a result
-  Perform an arithmetic operation on two numbers using a mathematical operator
-  """The purpose of this feature is to illustrate how existing step-definitions
-  can be efficiently reused."""
-
-  Scenario Outline: Enter a digit, an operator and another digit
-    Given I have a CalculatorActivity
-    When I press <num1>
-    And I press <op>
-    And I press <num2>
-    And I press =
-    Then I should see "<result>" on the display
-
-  Examples:
-    | num1 | num2 | op | result   |
-    | 9    | 8    | +  | 17.0     |
-    | 7    | 6    | –  | 1.0      |
-    | 5    | 4    | x  | 20.0     |
-    | 3    | 2    | /  | 1.5      |
-    | 1    | 0    | /  | Infinity |
diff --git a/cukeulator-test/src/main/assets/features/operations/addition.feature b/cukeulator-test/src/main/assets/features/operations/addition.feature
deleted file mode 100644
index 9199cd5..0000000
--- a/cukeulator-test/src/main/assets/features/operations/addition.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-Feature: Add two numbers
-  Calculate the sum of two numbers which consist of one or more digits
-
-  Scenario Outline: Enter one digit per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    And I press +
-    And I press <num2>
-    And I press =
-    Then I should see "<sum>" on the display
-
-  Examples:
-    | num1 | num2 | sum |
-    | 0    | 0    | 0.0 |
-    | 0    | 1    | 1.0 |
-    | 1    | 1    | 2.0 |
-
-  Scenario Outline: Enter two digits per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    When I press <num2>
-    And I press +
-    And I press <num3>
-    And I press <num4>
-    And I press =
-    Then I should see "<sum>" on the display
-
-  Examples:
-    | num1 | num2 | num3 | num4 | sum   |
-    | 0    | 0    | 2    | 0    | 20.0  |
-    | 9    | 8    | 7    | 6    | 174.0 |
diff --git a/cukeulator-test/src/main/assets/features/operations/division.feature b/cukeulator-test/src/main/assets/features/operations/division.feature
deleted file mode 100644
index e6dc09a..0000000
--- a/cukeulator-test/src/main/assets/features/operations/division.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-Feature: Divide two numbers
-  Calculate the quotient of two numbers which consist of one or more digits
-
-  Scenario Outline: Enter one digit per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    And I press /
-    And I press <num2>
-    And I press =
-    Then I should see "<quotient>" on the display
-
-  Examples:
-    | num1 | num2 | quotient |
-    | 0    | 0    | NaN      |
-    | 1    | 0    | Infinity |
-    | 1    | 2    | 0.5      |
-
-  Scenario Outline: Enter two digits per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    When I press <num2>
-    And I press /
-    And I press <num3>
-    And I press <num4>
-    And I press =
-    Then I should see "<quotient>" on the display
-
-  Examples:
-    | num1 | num2 | num3 | num4 | quotient |
-    | 2    | 2    | 2    | 2    | 1.0      |
-    | 2    | 0    | 1    | 0    | 2.0      |
diff --git a/cukeulator-test/src/main/assets/features/operations/multiplication.feature b/cukeulator-test/src/main/assets/features/operations/multiplication.feature
deleted file mode 100644
index 311d4ec..0000000
--- a/cukeulator-test/src/main/assets/features/operations/multiplication.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-Feature: Multiply two numbers
-  Calculate the product of two numbers which consist of one or more digits
-
-  Scenario Outline: Enter one digit per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    And I press x
-    And I press <num2>
-    And I press =
-    Then I should see "<product>" on the display
-
-  Examples:
-    | num1 | num2 | product |
-    | 0    | 0    | 0.0     |
-    | 0    | 1    | 0.0     |
-    | 1    | 2    | 2.0     |
-
-  Scenario Outline: Enter two digits per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    When I press <num2>
-    And I press x
-    And I press <num3>
-    And I press <num4>
-    And I press =
-    Then I should see "<product>" on the display
-
-  Examples:
-    | num1 | num2 | num3 | num4 | product |
-    | 2    | 2    | 2    | 2    | 484.0   |
-    | 2    | 0    | 1    | 0    | 200.0   |
diff --git a/cukeulator-test/src/main/assets/features/operations/subtraction.feature b/cukeulator-test/src/main/assets/features/operations/subtraction.feature
deleted file mode 100644
index 51a3771..0000000
--- a/cukeulator-test/src/main/assets/features/operations/subtraction.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-Feature: Subtract two numbers
-  Calculate the difference of two numbers which consist of one or more digits
-
-  Scenario Outline: Enter one digit per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    And I press –
-    And I press <num2>
-    And I press =
-    Then I should see "<delta>" on the display
-
-  Examples:
-    | num1 | num2 | delta |
-    | 0    | 0    | 0.0   |
-    | 0    | 1    | -1.0  |
-    | 1    | 2    | -1.0  |
-
-  Scenario Outline: Enter two digits per number and press =
-    Given I have a CalculatorActivity
-    When I press <num1>
-    When I press <num2>
-    And I press –
-    And I press <num3>
-    And I press <num4>
-    And I press =
-    Then I should see "<delta>" on the display
-
-  Examples:
-    | num1 | num2 | num3 | num4 | delta |
-    | 2    | 2    | 2    | 2    | 0.0   |
-    | 2    | 0    | 1    | 0    | 10.0  |
diff --git a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/CalculatorActivitySteps.java b/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/CalculatorActivitySteps.java
deleted file mode 100644
index bcccf62..0000000
--- a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/CalculatorActivitySteps.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package cucumber.example.android.cukeulator.test;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.TextView;
-import cucumber.api.CucumberOptions;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-import cucumber.example.android.cukeulator.CalculatorActivity;
-import cucumber.example.android.cukeulator.R;
-
-import static cucumber.example.android.cukeulator.test.Utils.clickOnView;
-
-/**
- * We extend ActivityInstrumentationTestCase2 in order to have access to methods like getActivity
- * and getInstrumentation. Depending on what methods we are going to need, we can put our
- * step definitions inside classes extending any of the following Android test classes:
- * <p/>
- * ActivityInstrumentationTestCase2
- * InstrumentationTestCase
- * AndroidTestCase
- * <p/>
- * The CucumberOptions annotation is mandatory for exactly one of the classes in the test project.
- * Only the first annotated class that is found will be used, others are ignored. If no class is
- * annotated, an exception is thrown.
- * <p/>
- * The options need to at least specify features = "features". Features must be placed inside
- * assets/features/ of the test project (or a subdirectory thereof).
- */
-@CucumberOptions(features = "features")
-public class CalculatorActivitySteps extends ActivityInstrumentationTestCase2<CalculatorActivity> {
-
-    public CalculatorActivitySteps(SomeDependency dependency) {
-        super(CalculatorActivity.class);
-        assertNotNull(dependency);
-    }
-
-    @Given("I have a CalculatorActivity")
-    public void I_have_a_CalculatorActivity() {
-        assertNotNull(getActivity());
-    }
-
-    @When("I press {digit}")
-    public void I_press_d(int d) {
-        CalculatorActivity activity = getActivity();
-
-        switch (d) {
-            case 0:
-                clickOnView(activity, R.id.btn_d_0);
-                break;
-            case 1:
-                clickOnView(activity, R.id.btn_d_1);
-                break;
-            case 2:
-                clickOnView(activity, R.id.btn_d_2);
-                break;
-            case 3:
-                clickOnView(activity, R.id.btn_d_3);
-                break;
-            case 4:
-                clickOnView(activity, R.id.btn_d_4);
-                break;
-            case 5:
-                clickOnView(activity, R.id.btn_d_5);
-                break;
-            case 6:
-                clickOnView(activity, R.id.btn_d_6);
-                break;
-            case 7:
-                clickOnView(activity, R.id.btn_d_7);
-                break;
-            case 8:
-                clickOnView(activity, R.id.btn_d_8);
-                break;
-            case 9:
-                clickOnView(activity, R.id.btn_d_9);
-                break;
-        }
-    }
-
-    @When("I press {operator}")
-    public void I_press_op(char op) {
-        CalculatorActivity activity = getActivity();
-
-        switch (op) {
-            case '+':
-                clickOnView(activity, R.id.btn_op_add);
-                break;
-            case '–':
-                clickOnView(activity, R.id.btn_op_subtract);
-                break;
-            case 'x':
-                clickOnView(activity, R.id.btn_op_multiply);
-                break;
-            case '/':
-                clickOnView(activity, R.id.btn_op_divide);
-                break;
-            case '=':
-                clickOnView(activity, R.id.btn_op_equals);
-                break;
-        }
-    }
-
-    @Then("I should see {string} on the display")
-    public void I_should_see_s_on_the_display(String s) {
-        TextView display = (TextView) getActivity().findViewById(R.id.txt_calc_display);
-        String displayed_result = display.getText().toString();
-        assertEquals(s, displayed_result);
-    }
-}
diff --git a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/SomeDependency.java b/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/SomeDependency.java
deleted file mode 100644
index 9d6e168..0000000
--- a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/SomeDependency.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package cucumber.example.android.cukeulator.test;
-
-// Dummy class to demonstrate dependency injection
-public class SomeDependency {
-}
diff --git a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/TypeRegistryConfiguration.java b/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/TypeRegistryConfiguration.java
deleted file mode 100644
index 55bf640..0000000
--- a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/TypeRegistryConfiguration.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cucumber.example.android.cukeulator.test;
-
-import cucumber.api.TypeRegistryConfigurer;
-import cucumber.api.TypeRegistry;
-import io.cucumber.cucumberexpressions.ParameterType;
-import io.cucumber.cucumberexpressions.Transformer;
-
-import java.util.Locale;
-
-import static java.util.Locale.ENGLISH;
-
-public class TypeRegistryConfiguration implements TypeRegistryConfigurer {
-
-    @Override
-    public Locale locale() {
-        return ENGLISH;
-    }
-
-    @Override
-    public void configureTypeRegistry(TypeRegistry typeRegistry) {
-        typeRegistry.defineParameterType(new ParameterType<Integer>(
-            "digit",
-            "[0-9]",
-            Integer.class,
-            new Transformer<Integer>() {
-                @Override
-                public Integer transform(String s) throws Throwable {
-                    return Integer.parseInt(s);
-                }
-            })
-        );
-
-        typeRegistry.defineParameterType(new ParameterType<Character>(
-            "operator",
-            "[+–x\\/=]",
-            Character.class,
-            new Transformer<Character>() {
-                @Override
-                public Character transform(String s) throws Throwable {
-                    return s.charAt(0);
-                }
-            })
-        );
-    }
-}
diff --git a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/Utils.java b/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/Utils.java
deleted file mode 100644
index b78381e..0000000
--- a/cukeulator-test/src/main/java/cucumber/example/android/cukeulator/test/Utils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cucumber.example.android.cukeulator.test;
-
-import android.app.Activity;
-import android.util.Log;
-import android.view.View;
-
-public final class Utils {
-    private static final MultiLock lock = new MultiLock();
-
-    public static class MultiLock {
-        private int mLocks;
-
-        public synchronized void acquire() throws InterruptedException {
-            if (mLocks++ >= 0) {
-                wait();
-            }
-        }
-
-        public synchronized void release() {
-            if (--mLocks <= 0) {
-                notifyAll();
-            }
-        }
-    }
-
-    private Utils() {
-    }
-
-    public static void clickOnView(Activity activity, int id) {
-        View view = activity.findViewById(id);
-        if (view != null) clickOnView(activity, view);
-    }
-
-    public static void clickOnView(Activity activity, final View view) {
-        activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.callOnClick();
-                lock.release();
-            }
-        });
-        try {
-            lock.acquire();
-        } catch (InterruptedException e) {
-            Log.e("cucumber-android", e.toString());
-            Thread.currentThread().interrupt();
-        }
-    }
-}
diff --git a/cukeulator/.gitignore b/cukeulator/.gitignore
index ca842a1..4c5d941 100644
--- a/cukeulator/.gitignore
+++ b/cukeulator/.gitignore
@@ -1,7 +1,28 @@
-*.iml
-*.class
+# Built application files
+/*/build/
+build/
+
+# Crashlytics configuations
+com_crashlytics_export_strings.xml
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+
+# User-specific configurations
 .idea/
-bin/
-gen/
-out/
\ No newline at end of file
+*.iml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/cukeulator/README.md b/cukeulator/README.md
index 6881832..099f25b 100644
--- a/cukeulator/README.md
+++ b/cukeulator/README.md
@@ -1,33 +1,73 @@
-## Cukeulator Example App
-This is a simple Android example application for illustration purposes.
+## Cukeulator Example Test
+This is the example test-project for the Cukeulator app for Android Studio 3.0+
 
-### Build with ant
-See ["Building and Running from the Command Line"](https://developer.android.com/tools/building/building-cmdline.html).
+### Setup
+Features must be placed in `assets/features/`. Subdirectories are allowed.
 
-### Build with Eclipse
-See ["Building and Running from Eclipse with ADT"](https://developer.android.com/tools/building/building-eclipse.html).
+The rest of the dependencies are added automatically in `app/build.gradle`.
 
-### Build with Maven
-To build:
+The cucumber-android dependency is added as (see `app/build.gradle`):
 
 ```
-mvn package -pl examples/android/cukeulator -am -P android-examples
+androidTestCompile 'io.cucumber:cucumber-android:<version>'
 ```
 
-To install:
+### Using gradle
+
+To build the test apk:
+
+```
+cd cucumber-jvm/examples/android/android-studio/Cukeulator
+
+./gradlew --parallel :app:assembleDebugTest
+```
+
+The build generates an apk in app/build/outputs/apk/app-debug.apk.
+
+To install the apk on a device:
+
+```
+adb install -r app/build/outputs/apk/app-debug.apk
+```
+
+To verify that the test is installed, run:
 
 ```
-mvn android:deploy -pl examples/android/cukeulator -P android-examples
+adb shell pm list instrumentation
 ```
 
-To run:
+The command output should display;
 
 ```
-mvn android:run -pl examples/android/cukeulator -P android-examples
+instrumentation:cucumber.cukeulator.test/cucumber.api.android.CucumberInstrumentation (target=cucumber.cukeulator)
 ```
 
-View [all available goals](http://maven-android-plugin-m2site.googlecode.com/svn/plugin-info.html):
+To run the test:
 
 ```
-mvn android:help -pl examples/android/cukeulator -P android-examples
+cd cucumber-jvm/examples/android/android-studio/Cukeulator;
+./gradlew connectedCheck
+```
+
+As an alternative option, the test can be run with adb:
+
 ```
+adb shell am instrument -w cucumber.cukeulator.test/cucumber.cukeulator.test.Instrumentation
+```
+
+### Using an Android Studio IDE
+1. Import the example to Android Studio: `File > Import Project`.
+2. Create a test run configuration:
+    1.  Run > Edit Configurations
+    2. Click `+` button and select Android Tests
+    3. Specify test name: `CalculatorTest`
+    4. Select module: `app`
+    5. Enter a Specific instrumentation runner: `cucumber.cukeulator.test.Instrumentation`
+    6. Click Ok
+
+### Output
+Filter for the logcat tag `cucumber-android` in [DDMS](https://developer.android.com/tools/debugging/ddms.html).
+
+### Using this project with locally built Cucumber-JVM
+See [app/build.gradle](build.gradle) under `dependencies`.  
+There is a source-code comment which explains how to use a locally built Cucumber-JVM Android library.
\ No newline at end of file
diff --git a/cukeulator/ant.properties b/cukeulator/ant.properties
deleted file mode 100644
index 73031c7..0000000
--- a/cukeulator/ant.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
diff --git a/android-studio/Cukeulator/app/build.gradle b/cukeulator/build.gradle
similarity index 81%
rename from android-studio/Cukeulator/app/build.gradle
rename to cukeulator/build.gradle
index 9e16821..a3b2a15 100644
--- a/android-studio/Cukeulator/app/build.gradle
+++ b/cukeulator/build.gradle
@@ -1,21 +1,17 @@
 apply plugin: 'com.android.application'
 apply plugin: 'jacoco'
+apply plugin: "com.jaredsburrows.spoon"
 
 // ==================================================================
 // Android configuration
 // ==================================================================
 
-android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+addAndroidConfig()
 
+android {
+   
     defaultConfig {
         applicationId "cucumber.cukeulator"
-        minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
-
         testApplicationId "cucumber.cukeulator.test"
         testInstrumentationRunner "cucumber.cukeulator.test.CucumberRunner"
     }
@@ -24,10 +20,6 @@ android {
         exclude 'LICENSE.txt'
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     // With the following option we does not have to mock everything,
     // e.g. super calls cannot be mocked with Mockito only (just with Powermock).
     testOptions {
@@ -35,18 +27,6 @@ android {
         animationsDisabled true
     }
 
-    sourceSets {
-        androidTest {
-            assets.srcDirs = ['src/androidTest/assets']
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
 }
 
 // ==================================================================
@@ -96,14 +76,29 @@ dependencies {
     androidTestImplementation 'com.android.support:support-annotations:27.1.1'
 
     // Use the stable Cucumber version
-    androidTestImplementation 'io.cucumber:cucumber-android:3.0.2'
-    androidTestImplementation 'io.cucumber:cucumber-picocontainer:3.0.2'
+    androidTestImplementation project(":cucumber-android")
+    androidTestImplementation "io.cucumber:cucumber-picocontainer:$version"
 }
 
 // ==================================================================
 // Custom tasks
 // ==================================================================
 
+
+task runInstrumentationTests {
+    group "verification"
+    mustRunAfter "deleteExistingCucumberReports"
+    dependsOn "deleteExistingCucumberReports","spoonDebugAndroidTest"
+    finalizedBy "downloadCucumberReports"
+}
+
+spoon {
+    debug = true
+    singleInstrumentationCall = true
+    grantAll = true
+}
+
+
 /*
  * Downloads all Cucumber reports from the connected device.
  */
@@ -162,16 +157,6 @@ task grantPermissions(dependsOn: 'installDebug') {
     }
 }
 
-// Delete existing Cucumber reports on the device before connected test-run
-connectedCheck.dependsOn deleteExistingCucumberReports
-connectedCheck.mustRunAfter deleteExistingCucumberReports
-
-// Grant storage permissions to store Cucumber reports before connected test-run
-connectedCheck.dependsOn grantPermissions
-connectedCheck.mustRunAfter grantPermissions
-
-// Store the new cucumber reports to the reports directory after connected test-run
-connectedCheck.finalizedBy downloadCucumberReports
 
 // ==================================================================
 // Utility methods
@@ -209,24 +194,12 @@ def executeAdb(String program) {
     return fixAdbOutput(text)
 }
 
-/**
- * Gets the 'external' storage path which is confusingly the internal storage of the phone.
- * @return
- */
-def getExternalStoragePath() {
-    String r = executeAdb('echo $EXTERNAL_STORAGE')
-    if (!r.matches('(/[^/]+)+')) {
-        throw new GradleException("Could not detect external storage path")
-    }
-    return r
-}
-
 /**
  * The path which is used to store the Cucumber files.
  * @return
  */
 def getCucumberDevicePath() {
-    return getExternalStoragePath() + '/cucumber'
+    return 'sdcard/Android/data/cucumber.cukeulator/files/reports'
 }
 
 /**
diff --git a/cukeulator/build.xml b/cukeulator/build.xml
deleted file mode 100644
index 0d77cf4..0000000
--- a/cukeulator/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="AndroidCucumberExample" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties"/>
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties"/>
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env"/>
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME"/>
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties"/>
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-            />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true"/>
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml"/>
-
-</project>
diff --git a/cukeulator/pom.xml b/cukeulator/pom.xml
deleted file mode 100644
index 6c27890..0000000
--- a/cukeulator/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>io.cucumber.android</groupId>
-        <artifactId>cucumber-android-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>cukelator</artifactId>
-    <packaging>apk</packaging>
-    <name>Examples: Android Cukeulator</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.simpligility.maven.plugins</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/cukeulator/proguard-project.txt b/cukeulator/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/cukeulator/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/cukeulator/project.properties b/cukeulator/project.properties
deleted file mode 100644
index 6df9ff8..0000000
--- a/cukeulator/project.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-21
-android.library=false
-project.type=0
diff --git a/android-studio/Cukeulator/app/src/androidTest/assets/features/extra/calculate.feature b/cukeulator/src/androidTest/assets/features/extra/calculate.feature
similarity index 100%
rename from android-studio/Cukeulator/app/src/androidTest/assets/features/extra/calculate.feature
rename to cukeulator/src/androidTest/assets/features/extra/calculate.feature
diff --git a/android-studio/Cukeulator/app/src/androidTest/assets/features/operations/addition.feature b/cukeulator/src/androidTest/assets/features/operations/addition.feature
similarity index 100%
rename from android-studio/Cukeulator/app/src/androidTest/assets/features/operations/addition.feature
rename to cukeulator/src/androidTest/assets/features/operations/addition.feature
diff --git a/android-studio/Cukeulator/app/src/androidTest/assets/features/operations/division.feature b/cukeulator/src/androidTest/assets/features/operations/division.feature
similarity index 100%
rename from android-studio/Cukeulator/app/src/androidTest/assets/features/operations/division.feature
rename to cukeulator/src/androidTest/assets/features/operations/division.feature
diff --git a/android-studio/Cukeulator/app/src/androidTest/assets/features/operations/multiplication.feature b/cukeulator/src/androidTest/assets/features/operations/multiplication.feature
similarity index 100%
rename from android-studio/Cukeulator/app/src/androidTest/assets/features/operations/multiplication.feature
rename to cukeulator/src/androidTest/assets/features/operations/multiplication.feature
diff --git a/android-studio/Cukeulator/app/src/androidTest/assets/features/operations/subtraction.feature b/cukeulator/src/androidTest/assets/features/operations/subtraction.feature
similarity index 100%
rename from android-studio/Cukeulator/app/src/androidTest/assets/features/operations/subtraction.feature
rename to cukeulator/src/androidTest/assets/features/operations/subtraction.feature
diff --git a/android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/CalculatorActivitySteps.java b/cukeulator/src/androidTest/java/cucumber/cukeulator/test/CalculatorActivitySteps.java
similarity index 99%
rename from android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/CalculatorActivitySteps.java
rename to cukeulator/src/androidTest/java/cucumber/cukeulator/test/CalculatorActivitySteps.java
index e3e9673..7912ebc 100644
--- a/android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/CalculatorActivitySteps.java
+++ b/cukeulator/src/androidTest/java/cucumber/cukeulator/test/CalculatorActivitySteps.java
@@ -38,7 +38,6 @@ public class CalculatorActivitySteps {
      * test lifecycle, activity test rules must not be launched automatically. Automatic launching of test rules is only
      * feasible for JUnit tests. Fortunately, we are able to launch the activity in Cucumber's {@link Before} method.
      */
-    @Rule
     ActivityTestRule rule = new ActivityTestRule<>(CalculatorActivity.class, false, false);
 
     public CalculatorActivitySteps(SomeDependency dependency) {
diff --git a/android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/CucumberRunner.java b/cukeulator/src/androidTest/java/cucumber/cukeulator/test/CucumberRunner.java
similarity index 83%
rename from android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/CucumberRunner.java
rename to cukeulator/src/androidTest/java/cucumber/cukeulator/test/CucumberRunner.java
index 98c6544..1056a43 100644
--- a/android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/CucumberRunner.java
+++ b/cukeulator/src/androidTest/java/cucumber/cukeulator/test/CucumberRunner.java
@@ -1,17 +1,12 @@
 package cucumber.cukeulator.test;
 
 import android.os.Bundle;
-import android.os.Environment;
-import android.support.test.runner.AndroidJUnit4;
 import android.support.test.runner.MonitoringInstrumentation;
-
-import org.junit.runner.RunWith;
-
-import java.io.File;
-
 import cucumber.api.CucumberOptions;
 import cucumber.api.android.CucumberInstrumentationCore;
 
+import java.io.File;
+
 /**
  * A modern replacement for {@link cucumber.api.android.CucumberInstrumentation}.
  * Supports Cucumber steps without base classes plus activity test rules.
@@ -20,7 +15,6 @@
  * Only the first annotated class that is found will be used, others are ignored. If no class is
  * annotated, an exception is thrown.
  */
-@RunWith(AndroidJUnit4.class)
 @CucumberOptions(
         features = "features"
 )
@@ -64,10 +58,10 @@ private String getPluginConfigurationString() {
      * @return the absolute path for the report files
      */
     private String getAbsoluteFilesPath() {
-        // Since stupidly, connected-check tasks uninstall the applications,
-        // we have to find a directory outside the application directory.
-        File directory = Environment.getExternalStorageDirectory();
-        return new File(directory, "/cucumber").getAbsolutePath();
+
+        //sdcard/Android/data/cucumber.cukeulator
+        File directory = getTargetContext().getExternalFilesDir(null);
+        return new File(directory,"reports").getAbsolutePath();
     }
 
 }
\ No newline at end of file
diff --git a/android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/SomeDependency.java b/cukeulator/src/androidTest/java/cucumber/cukeulator/test/SomeDependency.java
similarity index 100%
rename from android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/SomeDependency.java
rename to cukeulator/src/androidTest/java/cucumber/cukeulator/test/SomeDependency.java
diff --git a/android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/TypeRegistryConfiguration.java b/cukeulator/src/androidTest/java/cucumber/cukeulator/test/TypeRegistryConfiguration.java
similarity index 100%
rename from android-studio/Cukeulator/app/src/androidTest/java/cucumber/cukeulator/test/TypeRegistryConfiguration.java
rename to cukeulator/src/androidTest/java/cucumber/cukeulator/test/TypeRegistryConfiguration.java
diff --git a/android-studio/Cukeulator/app/src/debug/AndroidManifest.xml b/cukeulator/src/debug/AndroidManifest.xml
similarity index 100%
rename from android-studio/Cukeulator/app/src/debug/AndroidManifest.xml
rename to cukeulator/src/debug/AndroidManifest.xml
diff --git a/cukeulator/src/main/AndroidManifest.xml b/cukeulator/src/main/AndroidManifest.xml
index d5ec536..3f5d610 100644
--- a/cukeulator/src/main/AndroidManifest.xml
+++ b/cukeulator/src/main/AndroidManifest.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cucumber.example.android.cukeulator"
-          android:versionCode="1"
-          android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cucumber.cukeulator">
 
-    <uses-sdk
-            android:minSdkVersion="8"
-            android:targetSdkVersion="18"/>
     <application
-            android:label="@string/app_name"
-            android:icon="@drawable/ic_launcher">
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
         <activity
-                android:name=".CalculatorActivity">
+            android:name="cucumber.cukeulator.CalculatorActivity"
+            android:label="@string/app_name" >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
+
 </manifest>
diff --git a/android-studio/Cukeulator/app/src/main/java/cucumber/cukeulator/CalculatorActivity.java b/cukeulator/src/main/java/cucumber/cukeulator/CalculatorActivity.java
similarity index 100%
rename from android-studio/Cukeulator/app/src/main/java/cucumber/cukeulator/CalculatorActivity.java
rename to cukeulator/src/main/java/cucumber/cukeulator/CalculatorActivity.java
diff --git a/cukeulator/src/main/java/cucumber/example/android/cukeulator/CalculatorActivity.java b/cukeulator/src/main/java/cucumber/example/android/cukeulator/CalculatorActivity.java
deleted file mode 100644
index 0e3c9a3..0000000
--- a/cukeulator/src/main/java/cucumber/example/android/cukeulator/CalculatorActivity.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package cucumber.example.android.cukeulator;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-public class CalculatorActivity extends Activity {
-    private static enum Operation {ADD, SUB, MULT, DIV, NONE}
-
-    private TextView txtCalcDisplay;
-    private TextView txtCalcOperator;
-    private Operation operation;
-    private boolean decimals;
-    private boolean resetDisplay;
-    private boolean performOperation;
-    private double value;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_calculator);
-        txtCalcDisplay = (TextView) findViewById(R.id.txt_calc_display);
-        txtCalcOperator = (TextView) findViewById(R.id.txt_calc_operator);
-        operation = Operation.NONE;
-    }
-
-    public void onDigitPressed(View v) {
-        if (resetDisplay) {
-            txtCalcDisplay.setText(null);
-            resetDisplay = false;
-        }
-        txtCalcOperator.setText(null);
-
-        if (decimals || !only0IsDisplayed()) txtCalcDisplay.append(((Button) v).getText());
-
-        if (operation != Operation.NONE) performOperation = true;
-    }
-
-    public void onOperatorPressed(View v) {
-        if (performOperation) {
-            performOperation();
-            performOperation = false;
-        }
-        switch (v.getId()) {
-            case R.id.btn_op_divide:
-                operation = Operation.DIV;
-                txtCalcOperator.setText("/");
-                break;
-            case R.id.btn_op_multiply:
-                operation = Operation.MULT;
-                txtCalcOperator.setText("x");
-                break;
-            case R.id.btn_op_subtract:
-                operation = Operation.SUB;
-                txtCalcOperator.setText("–");
-                break;
-            case R.id.btn_op_add:
-                operation = Operation.ADD;
-                txtCalcOperator.setText("+");
-                break;
-            case R.id.btn_op_equals:
-                break;
-            default:
-                throw new RuntimeException("Unsupported operation.");
-        }
-        resetDisplay = true;
-        value = getDisplayValue();
-    }
-
-    public void onSpecialPressed(View v) {
-        switch (v.getId()) {
-            case R.id.btn_spec_sqroot: {
-                double value = getDisplayValue();
-                double sqrt = Math.sqrt(value);
-                txtCalcDisplay.setText(Double.toString(sqrt));
-                break;
-            }
-            case R.id.btn_spec_pi: {
-                resetDisplay = false;
-                txtCalcOperator.setText(null);
-                txtCalcDisplay.setText(Double.toString(Math.PI));
-                if (operation != Operation.NONE) performOperation = true;
-                return;
-            }
-            case R.id.btn_spec_percent: {
-                double value = getDisplayValue();
-                double percent = value / 100.0F;
-                txtCalcDisplay.setText(Double.toString(percent));
-                break;
-            }
-            case R.id.btn_spec_comma: {
-                if (!decimals) {
-                    String text = displayIsEmpty() ? "0." : ".";
-                    txtCalcDisplay.append(text);
-                    decimals = true;
-                }
-                break;
-            }
-            case R.id.btn_spec_clear: {
-                value = 0;
-                decimals = false;
-                operation = Operation.NONE;
-                txtCalcDisplay.setText(null);
-                txtCalcOperator.setText(null);
-                break;
-            }
-        }
-        resetDisplay = false;
-        performOperation = false;
-    }
-
-    private void performOperation() {
-        double display = getDisplayValue();
-
-        switch (operation) {
-            case DIV:
-                value = value / display;
-                break;
-            case MULT:
-                value = value * display;
-                break;
-            case SUB:
-                value = value - display;
-                break;
-            case ADD:
-                value = value + display;
-                break;
-            case NONE:
-                return;
-            default:
-                throw new RuntimeException("Unsupported operation.");
-        }
-        txtCalcOperator.setText(null);
-        txtCalcDisplay.setText(Double.toString(value));
-    }
-
-    private boolean only0IsDisplayed() {
-        CharSequence text = txtCalcDisplay.getText();
-        return text.length() == 1 && text.charAt(0) == '0';
-    }
-
-    private boolean displayIsEmpty() {
-        return txtCalcDisplay.getText().length() == 0;
-    }
-
-    private double getDisplayValue() {
-        String display = txtCalcDisplay.getText().toString();
-        return display.isEmpty() ? 0.0F : Double.parseDouble(display);
-    }
-}
diff --git a/cukeulator/src/main/res/layout/activity_calculator.xml b/cukeulator/src/main/res/layout/activity_calculator.xml
index 9956688..7daba3d 100644
--- a/cukeulator/src/main/res/layout/activity_calculator.xml
+++ b/cukeulator/src/main/res/layout/activity_calculator.xml
@@ -36,7 +36,7 @@
             android:layout_marginBottom="24dp"
             android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true"
-            android:useDefaultMargins="true"
+            android:useDefaultMargins="false"
             android:columnCount="4">
 
         <!-- row 4 -->
diff --git a/android-studio/Cukeulator/app/src/main/res/menu/menu_main.xml b/cukeulator/src/main/res/menu/menu_main.xml
similarity index 100%
rename from android-studio/Cukeulator/app/src/main/res/menu/menu_main.xml
rename to cukeulator/src/main/res/menu/menu_main.xml
diff --git a/android-studio/Cukeulator/app/src/main/res/values-v21/styles.xml b/cukeulator/src/main/res/values-v21/styles.xml
similarity index 100%
rename from android-studio/Cukeulator/app/src/main/res/values-v21/styles.xml
rename to cukeulator/src/main/res/values-v21/styles.xml
diff --git a/android-studio/Cukeulator/app/src/main/res/values-w820dp/dimens.xml b/cukeulator/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from android-studio/Cukeulator/app/src/main/res/values-w820dp/dimens.xml
rename to cukeulator/src/main/res/values-w820dp/dimens.xml
diff --git a/android-studio/Cukeulator/app/src/main/res/values/dimens.xml b/cukeulator/src/main/res/values/dimens.xml
similarity index 100%
rename from android-studio/Cukeulator/app/src/main/res/values/dimens.xml
rename to cukeulator/src/main/res/values/dimens.xml
diff --git a/cukeulator/src/main/res/values/strings.xml b/cukeulator/src/main/res/values/strings.xml
index 1233858..1d58a11 100644
--- a/cukeulator/src/main/res/values/strings.xml
+++ b/cukeulator/src/main/res/values/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">Cukeulator</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
     <string name="txt_calc_display_hint">0.0</string>
+
 </resources>
diff --git a/android-studio/Cukeulator/app/src/main/res/values/styles.xml b/cukeulator/src/main/res/values/styles.xml
similarity index 100%
rename from android-studio/Cukeulator/app/src/main/res/values/styles.xml
rename to cukeulator/src/main/res/values/styles.xml
diff --git a/android-studio/Cukeulator/gradle.properties b/gradle.properties
similarity index 100%
rename from android-studio/Cukeulator/gradle.properties
rename to gradle.properties
diff --git a/android-studio/Cukeulator/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android-studio/Cukeulator/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/android-studio/Cukeulator/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 93%
rename from android-studio/Cukeulator/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
index c08ea83..dbb6a1a 100644
--- a/android-studio/Cukeulator/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/android-studio/Cukeulator/gradlew b/gradlew
similarity index 100%
rename from android-studio/Cukeulator/gradlew
rename to gradlew
diff --git a/android-studio/Cukeulator/gradlew.bat b/gradlew.bat
similarity index 96%
rename from android-studio/Cukeulator/gradlew.bat
rename to gradlew.bat
index aec9973..8a0b282 100644
--- a/android-studio/Cukeulator/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,90 @@
-@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
-
-@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=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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 init
-
-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 init
-
-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
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-: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 %CMD_LINE_ARGS%
-
-: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
+@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
+
+@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=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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 init
+
+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 init
+
+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
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+: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 %CMD_LINE_ARGS%
+
+: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/pom.xml b/pom.xml
deleted file mode 100644
index 326518e..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>io.cucumber</groupId>
-        <artifactId>cucumber-jvm</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>io.cucumber.android</groupId>
-    <artifactId>cucumber-android-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>Cucumber-Android: Parent</name>
-
-    <modules>
-        <module>cucumber-android</module>
-        <module>cucumber-android-test</module>
-        <module>cukeulator</module>
-        <module>cukeulator-test</module>
-    </modules>
-
-    <properties>
-        <android-maven-plugin.version>4.4.3</android-maven-plugin.version>
-        <android.version>4.1.1.4</android.version>
-        <android.device>emulator</android.device>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-android</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.android</groupId>
-                <artifactId>android</artifactId>
-                <version>4.1.1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.android</groupId>
-                <artifactId>android-test</artifactId>
-                <version>4.1.1.4</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>com.simpligility.maven.plugins</groupId>
-                    <artifactId>android-maven-plugin</artifactId>
-                    <version>${android-maven-plugin.version}</version>
-                    <configuration>
-                        <sdk>
-                            <platform>21</platform>
-                        </sdk>
-                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-</project>
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..3cc890b
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,3 @@
+rootProject.name = 'cucumber-android-parent'
+
+include ':cucumber-android', ':cukeulator'
\ No newline at end of file
diff --git a/wait_for_emulator b/wait_for_emulator
deleted file mode 100755
index 3178838..0000000
--- a/wait_for_emulator
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-bootanim=""
-failcounter=0
-until [[ "$bootanim" =~ "stopped" ]]; do
-   bootanim=`adb -e shell getprop init.svc.bootanim 2>&1`
-   echo "$bootanim"
-   if [[ "$bootanim" =~ "not found" ]]; then
-      let "failcounter += 1"
-      if [[ $failcounter -gt 3 ]]; then
-        echo "Failed to start emulator"
-        exit 1
-      fi
-   fi
-   sleep 1
-done
-echo "Done"