Restructure contents of blimp/client.

blimp/client/feature/compositor/blimp_output_surface.h

Index: blimp/client/feature/compositor/blimp_output_surface.h
diff --git a/blimp/client/compositor/blimp_output_surface.h b/blimp/client/feature/compositor/blimp_output_surface.h
similarity index 80%
rename from blimp/client/compositor/blimp_output_surface.h
rename to blimp/client/feature/compositor/blimp_output_surface.h
index f2535bdd877ba4beda935dbec79d08679126e6e0..b98804c819ec35c01024f964b702286603ca5f25 100644
--- a/blimp/client/compositor/blimp_output_surface.h
+++ b/blimp/client/feature/compositor/blimp_output_surface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_COMPOSITOR_BLIMP_OUTPUT_SURFACE_H_
-#define BLIMP_CLIENT_COMPOSITOR_BLIMP_OUTPUT_SURFACE_H_
+#ifndef BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_OUTPUT_SURFACE_H_
+#define BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_OUTPUT_SURFACE_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -30,4 +30,4 @@ class BlimpOutputSurface : public cc::OutputSurface {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_COMPOSITOR_BLIMP_OUTPUT_SURFACE_H_
+#endif  // BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_OUTPUT_SURFACE_H_