diff --git a/app/build.gradle b/app/build.gradle
index 67bac2b736..e1a030130c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -175,7 +175,6 @@ allprojects {
dependencies {
wearApp project(':wear')
- compile project(path: ':ruffyscripter')
compile fileTree(include: ['*.jar'], dir: 'libs')
compile("com.crashlytics.sdk.android:crashlytics:2.6.7@aar") {
diff --git a/ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl b/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl
similarity index 100%
rename from ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl
rename to app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRTHandler.aidl
diff --git a/ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl b/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl
similarity index 100%
rename from ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl
rename to app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/IRuffyService.aidl
diff --git a/ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl b/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl
similarity index 100%
rename from ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl
rename to app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/display/Menu.aidl
diff --git a/ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java b/app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java
similarity index 100%
rename from ruffyscripter/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java
rename to app/src/main/aidl/org/monkey/d/ruffy/ruffy/driver/package-info.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BasalProfile.java b/app/src/main/java/de/jotomo/ruffy/spi/BasalProfile.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BasalProfile.java
rename to app/src/main/java/de/jotomo/ruffy/spi/BasalProfile.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java b/app/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java
rename to app/src/main/java/de/jotomo/ruffy/spi/BolusProgressReporter.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/CommandResult.java b/app/src/main/java/de/jotomo/ruffy/spi/CommandResult.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/CommandResult.java
rename to app/src/main/java/de/jotomo/ruffy/spi/CommandResult.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpErrorCodes.java b/app/src/main/java/de/jotomo/ruffy/spi/PumpErrorCodes.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpErrorCodes.java
rename to app/src/main/java/de/jotomo/ruffy/spi/PumpErrorCodes.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpState.java b/app/src/main/java/de/jotomo/ruffy/spi/PumpState.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpState.java
rename to app/src/main/java/de/jotomo/ruffy/spi/PumpState.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpWarningCodes.java b/app/src/main/java/de/jotomo/ruffy/spi/PumpWarningCodes.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpWarningCodes.java
rename to app/src/main/java/de/jotomo/ruffy/spi/PumpWarningCodes.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/RuffyCommands.java b/app/src/main/java/de/jotomo/ruffy/spi/RuffyCommands.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/RuffyCommands.java
rename to app/src/main/java/de/jotomo/ruffy/spi/RuffyCommands.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/WarningOrErrorCode.java b/app/src/main/java/de/jotomo/ruffy/spi/WarningOrErrorCode.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/WarningOrErrorCode.java
rename to app/src/main/java/de/jotomo/ruffy/spi/WarningOrErrorCode.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/Bolus.java b/app/src/main/java/de/jotomo/ruffy/spi/history/Bolus.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/Bolus.java
rename to app/src/main/java/de/jotomo/ruffy/spi/history/Bolus.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/HistoryRecord.java b/app/src/main/java/de/jotomo/ruffy/spi/history/HistoryRecord.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/HistoryRecord.java
rename to app/src/main/java/de/jotomo/ruffy/spi/history/HistoryRecord.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/PumpAlert.java b/app/src/main/java/de/jotomo/ruffy/spi/history/PumpAlert.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/PumpAlert.java
rename to app/src/main/java/de/jotomo/ruffy/spi/history/PumpAlert.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/PumpHistory.java b/app/src/main/java/de/jotomo/ruffy/spi/history/PumpHistory.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/PumpHistory.java
rename to app/src/main/java/de/jotomo/ruffy/spi/history/PumpHistory.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/PumpHistoryRequest.java b/app/src/main/java/de/jotomo/ruffy/spi/history/PumpHistoryRequest.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/PumpHistoryRequest.java
rename to app/src/main/java/de/jotomo/ruffy/spi/history/PumpHistoryRequest.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/Tbr.java b/app/src/main/java/de/jotomo/ruffy/spi/history/Tbr.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/Tbr.java
rename to app/src/main/java/de/jotomo/ruffy/spi/history/Tbr.java
diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/Tdd.java b/app/src/main/java/de/jotomo/ruffy/spi/history/Tdd.java
similarity index 100%
rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/Tdd.java
rename to app/src/main/java/de/jotomo/ruffy/spi/history/Tdd.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyCommandsV1Impl.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyCommandsV1Impl.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyCommandsV1Impl.java
rename to app/src/main/java/de/jotomo/ruffyscripter/RuffyCommandsV1Impl.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
rename to app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/Command.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/Command.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
similarity index 100%
rename from ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
rename to app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
diff --git a/ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
similarity index 100%
rename from ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
rename to app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
diff --git a/ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java
similarity index 100%
rename from ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java
rename to app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuAttribute.java
diff --git a/ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java
similarity index 100%
rename from ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java
rename to app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/MenuType.java
diff --git a/ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java
similarity index 100%
rename from ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java
rename to app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/BolusType.java
diff --git a/ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java
similarity index 100%
rename from ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java
rename to app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuBlink.java
diff --git a/ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java
similarity index 100%
rename from ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java
rename to app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuDate.java
diff --git a/ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java b/app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java
similarity index 100%
rename from ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java
rename to app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuTime.java
diff --git a/ruffy-spi/.gitignore b/ruffy-spi/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/ruffy-spi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ruffy-spi/build.gradle b/ruffy-spi/build.gradle
deleted file mode 100644
index 94a3ddf90c..0000000000
--- a/ruffy-spi/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 23
- buildToolsVersion "26.0.2"
-
- defaultConfig {
- minSdkVersion 21
- targetSdkVersion 23
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-}
-
-dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:23.4.0'
- testCompile 'junit:junit:4.12'
-}
diff --git a/ruffy-spi/proguard-rules.pro b/ruffy-spi/proguard-rules.pro
deleted file mode 100644
index ae0b3241cc..0000000000
--- a/ruffy-spi/proguard-rules.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/joe/opt/android/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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ruffy-spi/src/main/AndroidManifest.xml b/ruffy-spi/src/main/AndroidManifest.xml
deleted file mode 100644
index 6ad261f527..0000000000
--- a/ruffy-spi/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/ruffyscripter/.gitignore b/ruffyscripter/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/ruffyscripter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ruffyscripter/build.gradle b/ruffyscripter/build.gradle
deleted file mode 100644
index 6f3ecbc070..0000000000
--- a/ruffyscripter/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 23
- buildToolsVersion "26.0.2"
-
- defaultConfig {
- minSdkVersion 21
- targetSdkVersion 23
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-}
-
-dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support:appcompat-v7:23.4.0'
- testCompile 'junit:junit:4.12'
- compile project(':ruffy-spi')
- compile 'org.slf4j:slf4j-api:1.7.12'
- compile 'com.google.guava:guava:20.0'
-}
diff --git a/ruffyscripter/proguard-rules.pro b/ruffyscripter/proguard-rules.pro
deleted file mode 100644
index ae0b3241cc..0000000000
--- a/ruffyscripter/proguard-rules.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/joe/opt/android/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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ruffyscripter/src/main/AndroidManifest.xml b/ruffyscripter/src/main/AndroidManifest.xml
deleted file mode 100644
index 2c730e84e5..0000000000
--- a/ruffyscripter/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/settings.gradle b/settings.gradle
index a55c0c137c..9ccfb61915 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':wear', ':ruffyscripter', ':ruffy-spi'
+include ':app', ':wear'