diff --git a/AndroidWearMap/app/.gitignore b/AndroidWearMap/Wearable/.gitignore
similarity index 100%
rename from AndroidWearMap/app/.gitignore
rename to AndroidWearMap/Wearable/.gitignore
diff --git a/AndroidWearMap/app/build.gradle b/AndroidWearMap/Wearable/build.gradle
similarity index 95%
rename from AndroidWearMap/app/build.gradle
rename to AndroidWearMap/Wearable/build.gradle
index c77942ce..8a449683 100644
--- a/AndroidWearMap/app/build.gradle
+++ b/AndroidWearMap/Wearable/build.gradle
@@ -45,5 +45,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
     compile 'com.google.android.support:wearable:1.1.0'
-    compile 'com.google.android.gms:play-services:7.3.0'
+    compile 'com.google.android.gms:play-services:7.5.0'
 }
diff --git a/AndroidWearMap/app/libs/.gitignore b/AndroidWearMap/Wearable/libs/.gitignore
similarity index 100%
rename from AndroidWearMap/app/libs/.gitignore
rename to AndroidWearMap/Wearable/libs/.gitignore
diff --git a/AndroidWearMap/app/proguard-rules.pro b/AndroidWearMap/Wearable/proguard-rules.pro
similarity index 100%
rename from AndroidWearMap/app/proguard-rules.pro
rename to AndroidWearMap/Wearable/proguard-rules.pro
diff --git a/AndroidWearMap/app/src/debug/res/values/google_maps_api.xml b/AndroidWearMap/Wearable/src/debug/res/values/google_maps_api.xml
similarity index 100%
rename from AndroidWearMap/app/src/debug/res/values/google_maps_api.xml
rename to AndroidWearMap/Wearable/src/debug/res/values/google_maps_api.xml
diff --git a/AndroidWearMap/app/src/main/AndroidManifest.xml b/AndroidWearMap/Wearable/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidWearMap/app/src/main/AndroidManifest.xml
rename to AndroidWearMap/Wearable/src/main/AndroidManifest.xml
diff --git a/AndroidWearMap/app/src/main/java/com/example/androidwearmap/MainActivity.java b/AndroidWearMap/Wearable/src/main/java/com/example/androidwearmap/MainActivity.java
similarity index 68%
rename from AndroidWearMap/app/src/main/java/com/example/androidwearmap/MainActivity.java
rename to AndroidWearMap/Wearable/src/main/java/com/example/androidwearmap/MainActivity.java
index 0f158a83..99ae9b60 100644
--- a/AndroidWearMap/app/src/main/java/com/example/androidwearmap/MainActivity.java
+++ b/AndroidWearMap/Wearable/src/main/java/com/example/androidwearmap/MainActivity.java
@@ -26,6 +26,9 @@ import com.google.android.gms.maps.model.MarkerOptions;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.wearable.view.DismissOverlayView;
+import android.view.View;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
 
 /**
  * Sample that shows how to set up a basic Google Map on Android Wear.
@@ -43,6 +46,7 @@ public class MainActivity extends FragmentActivity implements OnMapReadyCallback
 
     /**
      * The map. It is initialized when the map has been fully loaded and is ready to be used.
+     *
      * @see #onMapReady(com.google.android.gms.maps.GoogleMap)
      */
     private GoogleMap mMap;
@@ -53,6 +57,33 @@ public class MainActivity extends FragmentActivity implements OnMapReadyCallback
         // Set the layout. It only contains a SupportMapFragment and a DismissOverlay.
         setContentView(R.layout.activity_main);
 
+        // Retrieve the containers for the root of the layout and the map. Margins will need to be
+        // set on them to account for the system window insets.
+        final FrameLayout topFrameLayout = (FrameLayout) findViewById(R.id.root_container);
+        final FrameLayout mapFrameLayout = (FrameLayout) findViewById(R.id.map_container);
+
+        // Set the system view insets on the containers when they become available.
+        topFrameLayout.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
+            @Override
+            public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
+                // Call through to super implementation and apply insets
+                insets = topFrameLayout.onApplyWindowInsets(insets);
+
+                FrameLayout.LayoutParams params =
+                        (FrameLayout.LayoutParams) mapFrameLayout.getLayoutParams();
+
+                // Add Wearable insets to FrameLayout container holding map as margins
+                params.setMargins(
+                        insets.getSystemWindowInsetLeft(),
+                        insets.getSystemWindowInsetTop(),
+                        insets.getSystemWindowInsetRight(),
+                        insets.getSystemWindowInsetBottom());
+                mapFrameLayout.setLayoutParams(params);
+
+                return insets;
+            }
+        });
+
         // Obtain the DismissOverlayView and display the intro help text.
         mDismissOverlay = (DismissOverlayView) findViewById(R.id.dismiss_overlay);
         mDismissOverlay.setIntroText(R.string.intro_text);
diff --git a/AndroidWearMap/app/src/main/res/layout/activity_main.xml b/AndroidWearMap/Wearable/src/main/res/layout/activity_main.xml
similarity index 65%
rename from AndroidWearMap/app/src/main/res/layout/activity_main.xml
rename to AndroidWearMap/Wearable/src/main/res/layout/activity_main.xml
index 53bf2ac3..5883d3fb 100644
--- a/AndroidWearMap/app/src/main/res/layout/activity_main.xml
+++ b/AndroidWearMap/Wearable/src/main/res/layout/activity_main.xml
@@ -19,17 +19,26 @@
 
 <FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:map="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/root_container"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-    <fragment
-              android:id="@+id/map"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:name="com.google.android.gms.maps.SupportMapFragment" />
+    <FrameLayout
+            android:id="@+id/map_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <fragment
+                android:id="@+id/map"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:name="com.google.android.gms.maps.SupportMapFragment"/>
+
+    </FrameLayout>
 
     <android.support.wearable.view.DismissOverlayView
             android:id="@+id/dismiss_overlay"
             android:layout_height="match_parent"
             android:layout_width="match_parent"/>
-    </FrameLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/AndroidWearMap/app/src/main/res/mipmap-hdpi/ic_launcher.png b/AndroidWearMap/Wearable/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from AndroidWearMap/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to AndroidWearMap/Wearable/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/AndroidWearMap/app/src/main/res/mipmap-mdpi/ic_launcher.png b/AndroidWearMap/Wearable/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from AndroidWearMap/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to AndroidWearMap/Wearable/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/AndroidWearMap/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/AndroidWearMap/Wearable/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from AndroidWearMap/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to AndroidWearMap/Wearable/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/AndroidWearMap/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/AndroidWearMap/Wearable/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from AndroidWearMap/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to AndroidWearMap/Wearable/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/AndroidWearMap/app/src/main/res/values/strings.xml b/AndroidWearMap/Wearable/src/main/res/values/strings.xml
similarity index 100%
rename from AndroidWearMap/app/src/main/res/values/strings.xml
rename to AndroidWearMap/Wearable/src/main/res/values/strings.xml
diff --git a/AndroidWearMap/settings.gradle b/AndroidWearMap/settings.gradle
index 0eaf9426..ff969282 100644
--- a/AndroidWearMap/settings.gradle
+++ b/AndroidWearMap/settings.gradle
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-include ':app'
+include ':Wearable'