diff --git a/wear/build.gradle b/wear/build.gradle
index 02a6b13d3498eca1b105c0b6168561c143695191..7cf5b85bb871e4849831d88c63dc2f0bd54946ed 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -6,11 +6,11 @@ android {
     buildToolsVersion "26.0.0"
 
     defaultConfig {
-        applicationId "james.metronome.wear"
+        applicationId "james.metronome"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        versionCode 5
+        versionName "1.4"
     }
     buildTypes {
         release {
@@ -18,11 +18,14 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.support:wearable:2.0.1'
-    compile 'com.google.android.gms:play-services-wearable:10.2.1'
-    provided 'com.google.android.wearable:wearable:1.0.0'
+    provided 'com.google.android.wearable:wearable:2.0.3'
+    compile 'com.google.android.support:wearable:2.0.3'
+    compile 'com.google.android.gms:play-services-wearable:11.0.1'
 }
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 326e59ab66fc02ec4230c1d49b4d0f90ea0aef22..1a1106dea2dc3d51686e419e9a8ba96d2a71a0a9 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="james.metronome.wear">
+    package="james.metronome">
 
     <uses-feature android:name="android.hardware.type.watch" />
 
diff --git a/wear/src/main/java/james/metronome/wear/MainActivity.java b/wear/src/main/java/james/metronome/MainActivity.java
similarity index 75%
rename from wear/src/main/java/james/metronome/wear/MainActivity.java
rename to wear/src/main/java/james/metronome/MainActivity.java
index c41ee72a7e244816bb2eb4cfef433bea2ccf5b26..fabd30133f1135f4e161db0689e29541f01e3df1 100644
--- a/wear/src/main/java/james/metronome/wear/MainActivity.java
+++ b/wear/src/main/java/james/metronome/MainActivity.java
@@ -1,4 +1,4 @@
-package james.metronome.wear;
+package james.metronome;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -30,19 +30,19 @@ public class MainActivity extends WearableActivity implements ServiceConnection,
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(james.metronome.wear.R.layout.activity_main);
         setAmbientEnabled();
 
-        container = findViewById(R.id.container);
-        vibrationView = findViewById(R.id.vibration);
-        playView = findViewById(R.id.play);
-        bpmView = findViewById(R.id.bpm);
-        seekBar = findViewById(R.id.seekBar);
+        container = findViewById(james.metronome.wear.R.id.container);
+        vibrationView = findViewById(james.metronome.wear.R.id.vibration);
+        playView = findViewById(james.metronome.wear.R.id.play);
+        bpmView = findViewById(james.metronome.wear.R.id.bpm);
+        seekBar = findViewById(james.metronome.wear.R.id.seekBar);
 
         if (isBound()) {
-            vibrationView.setImageResource(service.isVibration() ? R.drawable.ic_vibration : R.drawable.ic_sound);
-            playView.setImageResource(service.isPlaying() ? R.drawable.ic_pause : R.drawable.ic_play);
-            bpmView.setText(String.format(Locale.getDefault(), getString(R.string.bpm), String.valueOf(service.getBpm())));
+            vibrationView.setImageResource(service.isVibration() ? james.metronome.wear.R.drawable.ic_vibration : james.metronome.wear.R.drawable.ic_sound);
+            playView.setImageResource(service.isPlaying() ? james.metronome.wear.R.drawable.ic_pause : james.metronome.wear.R.drawable.ic_play);
+            bpmView.setText(String.format(Locale.getDefault(), getString(james.metronome.wear.R.string.bpm), String.valueOf(service.getBpm())));
             seekBar.setProgress(service.getBpm());
         }
 
@@ -50,7 +50,7 @@ public class MainActivity extends WearableActivity implements ServiceConnection,
             @Override
             public void onClick(View view) {
                 service.setVibration(!service.isVibration());
-                vibrationView.setImageResource(service.isVibration() ? R.drawable.ic_vibration : R.drawable.ic_sound);
+                vibrationView.setImageResource(service.isVibration() ? james.metronome.wear.R.drawable.ic_vibration : james.metronome.wear.R.drawable.ic_sound);
             }
         });
 
@@ -86,7 +86,7 @@ public class MainActivity extends WearableActivity implements ServiceConnection,
     private void setBpm(int bpm) {
         if (isBound()) {
             service.setBpm(bpm);
-            bpmView.setText(String.format(Locale.getDefault(), getString(R.string.bpm), String.valueOf(bpm)));
+            bpmView.setText(String.format(Locale.getDefault(), getString(james.metronome.wear.R.string.bpm), String.valueOf(bpm)));
         }
     }
 
@@ -144,13 +144,13 @@ public class MainActivity extends WearableActivity implements ServiceConnection,
         isBound = true;
 
         if (vibrationView != null)
-            vibrationView.setImageResource(service.isVibration() ? R.drawable.ic_vibration : R.drawable.ic_sound);
+            vibrationView.setImageResource(service.isVibration() ? james.metronome.wear.R.drawable.ic_vibration : james.metronome.wear.R.drawable.ic_sound);
 
         if (playView != null)
-            playView.setImageResource(service.isPlaying() ? R.drawable.ic_pause : R.drawable.ic_play);
+            playView.setImageResource(service.isPlaying() ? james.metronome.wear.R.drawable.ic_pause : james.metronome.wear.R.drawable.ic_play);
 
         if (bpmView != null)
-            bpmView.setText(String.format(Locale.getDefault(), getString(R.string.bpm), String.valueOf(service.getBpm())));
+            bpmView.setText(String.format(Locale.getDefault(), getString(james.metronome.wear.R.string.bpm), String.valueOf(service.getBpm())));
 
         if (seekBar != null)
             seekBar.setProgress(service.getBpm());
@@ -163,11 +163,11 @@ public class MainActivity extends WearableActivity implements ServiceConnection,
 
     @Override
     public void onStartTicks() {
-        playView.setImageResource(R.drawable.ic_pause);
+        playView.setImageResource(james.metronome.wear.R.drawable.ic_pause);
     }
 
     @Override
     public void onStopTicks() {
-        playView.setImageResource(R.drawable.ic_play);
+        playView.setImageResource(james.metronome.wear.R.drawable.ic_play);
     }
 }
diff --git a/wear/src/main/java/james/metronome/wear/MetronomeService.java b/wear/src/main/java/james/metronome/MetronomeService.java
similarity index 91%
rename from wear/src/main/java/james/metronome/wear/MetronomeService.java
rename to wear/src/main/java/james/metronome/MetronomeService.java
index 2015ddbfe4b01b5c889193cbad336233cdaac588..72b74175bda3ffedd29ef41af97b2989da415391 100644
--- a/wear/src/main/java/james/metronome/wear/MetronomeService.java
+++ b/wear/src/main/java/james/metronome/MetronomeService.java
@@ -1,4 +1,4 @@
-package james.metronome.wear;
+package james.metronome;
 
 import android.app.PendingIntent;
 import android.app.Service;
@@ -59,7 +59,7 @@ public class MetronomeService extends Service implements Runnable {
 
         isVibration = prefs.getBoolean(PREF_VIBRATION, true);
         if (!isVibration)
-            soundId = soundPool.load(this, R.raw.click, 1);
+            soundId = soundPool.load(this, james.metronome.wear.R.raw.click, 1);
 
         interval = prefs.getLong(PREF_INTERVAL, 500);
         bpm = toBpm(interval);
@@ -95,9 +95,9 @@ public class MetronomeService extends Service implements Runnable {
 
         startForeground(530,
                 new NotificationCompat.Builder(this)
-                        .setContentTitle(getString(R.string.notification_title))
-                        .setContentText(getString(R.string.notification_desc))
-                        .setSmallIcon(R.drawable.ic_notification)
+                        .setContentTitle(getString(james.metronome.wear.R.string.notification_title))
+                        .setContentText(getString(james.metronome.wear.R.string.notification_desc))
+                        .setSmallIcon(james.metronome.wear.R.drawable.ic_notification)
                         .setContentIntent(PendingIntent.getService(this, 0, intent, PendingIntent.FLAG_ONE_SHOT))
                         .build()
         );
@@ -124,7 +124,7 @@ public class MetronomeService extends Service implements Runnable {
     public void setVibration(boolean vibration) {
         isVibration = vibration;
         if (!isVibration)
-            soundId = soundPool.load(this, R.raw.click, 1);
+            soundId = soundPool.load(this, james.metronome.wear.R.raw.click, 1);
         else soundId = -1;
 
         prefs.edit().putBoolean(PREF_VIBRATION, isVibration).apply();
diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml
index 3afc8e3524e2bc16589f9f0d120ddf4efdb05cd4..888001b0870fdacea4bd0d06594033078f369069 100644
--- a/wear/src/main/res/layout/activity_main.xml
+++ b/wear/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
         <SeekBar
             android:id="@+id/seekBar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="42dp"
             android:max="300" />
 
         <TextView