Restructure contents of blimp/client.

blimp/client/app/android/toolbar.h

Index: blimp/client/app/android/toolbar.h
diff --git a/blimp/client/android/toolbar.h b/blimp/client/app/android/toolbar.h
similarity index 91%
rename from blimp/client/android/toolbar.h
rename to blimp/client/app/android/toolbar.h
index 620be94e8ac51482f8c9f462c1b0861215a04f55..15a456299652a99908241ee8f78cdca7e5b2615f 100644
--- a/blimp/client/android/toolbar.h
+++ b/blimp/client/app/android/toolbar.h
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_ANDROID_TOOLBAR_H_
-#define BLIMP_CLIENT_ANDROID_TOOLBAR_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_
+#define BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_
+
+#include <string>
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
-#include "blimp/client/session/navigation_feature.h"
+#include "blimp/client/feature/navigation_feature.h"
 
 class GURL;
 class SkBitmap;
@@ -61,4 +63,4 @@ class Toolbar : public NavigationFeature::NavigationFeatureDelegate {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_ANDROID_TOOLBAR_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_