Cleanup blimp/client/core code organization.

blimp/client/core/switches/blimp_client_switches.h

Index: blimp/client/core/switches/blimp_client_switches.h
diff --git a/blimp/client/core/blimp_client_switches.h b/blimp/client/core/switches/blimp_client_switches.h
similarity index 86%
rename from blimp/client/core/blimp_client_switches.h
rename to blimp/client/core/switches/blimp_client_switches.h
index 50b88cfcb1f5bf0ccb0ee43f655d54496568164f..9100628b76b486d41af5eaac9efebfbaed609d3c 100644
--- a/blimp/client/core/blimp_client_switches.h
+++ b/blimp/client/core/switches/blimp_client_switches.h
@@ -4,8 +4,8 @@
 
 // Defines all the command-line switches used by //blimp/client/core.
 
-#ifndef BLIMP_CLIENT_CORE_BLIMP_CLIENT_SWITCHES_H_
-#define BLIMP_CLIENT_CORE_BLIMP_CLIENT_SWITCHES_H_
+#ifndef BLIMP_CLIENT_CORE_SWITCHES_BLIMP_CLIENT_SWITCHES_H_
+#define BLIMP_CLIENT_CORE_SWITCHES_BLIMP_CLIENT_SWITCHES_H_
 
 namespace blimp {
 namespace switches {
@@ -36,4 +36,4 @@ extern const char kDownloadWholeDocument[];
 }  // namespace switches
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_CORE_BLIMP_CLIENT_SWITCHES_H_
+#endif  // BLIMP_CLIENT_CORE_SWITCHES_BLIMP_CLIENT_SWITCHES_H_