Reorganize cvd file structure

It looks like this now:

cvd
 |-acloud -> contains the acloud translator
 |-cli -> Tools for parsing command line and handling commands
 |  |-commands -> Command handlers
 |  |-parser -> The load configs parser
 |  |-selector -> Tools related to selector parsing
 |-doc
 |-fetch
 |-instances -> Code related to the cvd instances, groups and database,
 |              including actions to be performed over the instances
 |              (i.e start, stop, etc)
 |-legacy -> Legacy code, mostly concerning the cvd server
 |-metrics
 |-unittests
 |-utils

Only the files are in their right location, code is still spread all
over the place and will be moved gradually in future commits.

base/cvd/cuttlefish/host/commands/cvd/acloud/converter.cpp

@@ -35,12 +35,12 @@
 #include "common/libs/utils/subprocess.h"
 #include "host/commands/cvd/acloud/config.h"
 #include "host/commands/cvd/acloud/create_converter_parser.h"
-#include "host/commands/cvd/common_utils.h"
-#include "host/commands/cvd/lock_file.h"
-#include "host/commands/cvd/selector/instance_database_utils.h"
-#include "host/commands/cvd/selector/selector_constants.h"
-#include "host/commands/cvd/command_request.h"
-#include "host/commands/cvd/server_command/utils.h"
+#include "host/commands/cvd/utils/common.h"
+#include "host/commands/cvd/instances/lock_file.h"
+#include "host/commands/cvd/instances/instance_database_utils.h"
+#include "host/commands/cvd/cli/selector/selector_constants.h"
+#include "host/commands/cvd/cli/command_request.h"
+#include "host/commands/cvd/cli/utils.h"
 #include "host/libs/config/config_constants.h"
 
 namespace cuttlefish {

base/cvd/cuttlefish/host/commands/cvd/acloud/converter.h

@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "host/commands/cvd/command_request.h"
+#include "host/commands/cvd/cli/command_request.h"
 
 #include "common/libs/utils/result.h"
 

base/cvd/cuttlefish/host/commands/cvd/acloud/create_converter_parser.h

@@ -20,7 +20,7 @@
 #include <string>
 
 #include "common/libs/utils/result.h"
-#include "host/commands/cvd/types.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 namespace acloud_impl {

base/cvd/cuttlefish/host/commands/cvd/command_request.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/command_request.cpp

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/command_request.h"
+#include "host/commands/cvd/cli/command_request.h"
 
 #include <string>
 #include <vector>
 
 #include "common/libs/utils/result.h"
-#include "host/commands/cvd/command_request.h"
-#include "host/commands/cvd/selector/selector_common_parser.h"
+#include "host/commands/cvd/cli/command_request.h"
+#include "host/commands/cvd/cli/selector/selector_common_parser.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/command_request.h → base/cvd/cuttlefish/host/commands/cvd/cli/command_request.h

@@ -25,12 +25,12 @@
 
 #include <google/protobuf/map.h>
 
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
 
 #include "common/libs/fs/shared_fd.h"
 #include "common/libs/utils/result.h"
-#include "host/commands/cvd/selector/selector_common_parser.h"
-#include "host/commands/cvd/types.h"
+#include "host/commands/cvd/cli/selector/selector_common_parser.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/command_sequence.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/command_sequence.cpp

@@ -13,16 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "host/commands/cvd/command_sequence.h"
+#include "host/commands/cvd/cli/command_sequence.h"
 
 #include <memory>
 
 #include <android-base/strings.h>
 
 #include "common/libs/utils/environment.h"
-#include "host/commands/cvd/request_context.h"
-#include "host/commands/cvd/command_request.h"
-#include "host/commands/cvd/types.h"
+#include "host/commands/cvd/cli/request_context.h"
+#include "host/commands/cvd/cli/command_request.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 namespace {

base/cvd/cuttlefish/host/commands/cvd/command_sequence.h → base/cvd/cuttlefish/host/commands/cvd/cli/command_sequence.h

@@ -19,9 +19,9 @@
 #include <ostream>
 #include <vector>
 
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
-#include "host/commands/cvd/command_request.h"
-#include "host/commands/cvd/server_command/server_handler.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
+#include "host/commands/cvd/cli/command_request.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_command.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_command.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/server_command/acloud_command.h"
+#include "host/commands/cvd/cli/commands/acloud_command.h"
 
 #include <thread>
 
@@ -26,14 +26,14 @@
 #include "common/libs/utils/environment.h"
 #include "common/libs/utils/files.h"
 #include "common/libs/utils/result.h"
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
 #include "host/commands/cvd/acloud/converter.h"
 #include "host/commands/cvd/acloud/create_converter_parser.h"
-#include "host/commands/cvd/command_sequence.h"
-#include "host/commands/cvd/server_command/acloud_common.h"
-#include "host/commands/cvd/server_command/server_handler.h"
-#include "host/commands/cvd/server_command/utils.h"
-#include "host/commands/cvd/types.h"
+#include "host/commands/cvd/cli/command_sequence.h"
+#include "host/commands/cvd/cli/commands/acloud_common.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
+#include "host/commands/cvd/cli/utils.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 namespace {

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_command.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_command.h

@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "host/commands/cvd/command_sequence.h"
+#include "host/commands/cvd/cli/command_sequence.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_common.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_common.cpp

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/server_command/acloud_common.h"
+#include "host/commands/cvd/cli/commands/acloud_common.h"
 
-#include "host/commands/cvd/server_command/utils.h"
+#include "host/commands/cvd/cli/utils.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_common.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_common.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "host/commands/cvd/command_request.h"
+#include "host/commands/cvd/cli/command_request.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_mixsuperimage.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_mixsuperimage.cpp

@@ -21,12 +21,12 @@
 #include "common/libs/utils/files.h"
 #include "common/libs/utils/flag_parser.h"
 #include "common/libs/utils/result.h"
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
-#include "host/commands/cvd/command_request.h"
-#include "host/commands/cvd/server_command/acloud_mixsuperimage.h"
-#include "host/commands/cvd/server_command/server_handler.h"
-#include "host/commands/cvd/server_command/utils.h"
-#include "host/commands/cvd/types.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
+#include "host/commands/cvd/cli/command_request.h"
+#include "host/commands/cvd/cli/commands/acloud_mixsuperimage.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
+#include "host/commands/cvd/cli/utils.h"
+#include "host/commands/cvd/cli/types.h"
 #include "host/libs/config/config_utils.h"
 
 namespace cuttlefish {

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_mixsuperimage.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_mixsuperimage.h

@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "host/commands/cvd/server_command/server_handler.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_translator.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_translator.cpp

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/server_command/acloud_translator.h"
+#include "host/commands/cvd/cli/commands/acloud_translator.h"
 
 #include "common/libs/utils/flag_parser.h"
 #include "common/libs/utils/result.h"
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
-#include "host/commands/cvd/command_request.h"
-#include "host/commands/cvd/server_command/server_handler.h"
-#include "host/commands/cvd/server_command/utils.h"
-#include "host/commands/cvd/types.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
+#include "host/commands/cvd/cli/command_request.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
+#include "host/commands/cvd/cli/utils.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/acloud_translator.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/acloud_translator.h

@@ -18,8 +18,8 @@
 
 #include <memory>
 
-#include "host/commands/cvd/instance_manager.h"
-#include "host/commands/cvd/server_command/server_handler.h"
+#include "host/commands/cvd/instances/instance_manager.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/bugreport.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/server_command/bugreport.h"
+#include "host/commands/cvd/cli/commands/bugreport.h"
 
 #include <sys/types.h>
 
@@ -29,14 +29,14 @@
 #include "common/libs/utils/result.h"
 #include "common/libs/utils/subprocess.h"
 #include "common/libs/utils/users.h"
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
-#include "host/commands/cvd/common_utils.h"
-#include "host/commands/cvd/group_selector.h"
-#include "host/commands/cvd/instance_manager.h"
-#include "host/commands/cvd/interruptible_terminal.h"
-#include "host/commands/cvd/server_command/server_handler.h"
-#include "host/commands/cvd/server_command/utils.h"
-#include "host/commands/cvd/types.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
+#include "host/commands/cvd/utils/common.h"
+#include "host/commands/cvd/cli/group_selector.h"
+#include "host/commands/cvd/instances/instance_manager.h"
+#include "host/commands/cvd/cli/interruptible_terminal.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
+#include "host/commands/cvd/cli/utils.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 namespace {

base/cvd/cuttlefish/host/commands/cvd/server_command/bugreport.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/bugreport.h

@@ -18,8 +18,8 @@
 
 #include <memory>
 
-#include "host/commands/cvd/instance_manager.h"
-#include "host/commands/cvd/server_command/server_handler.h"
+#include "host/commands/cvd/instances/instance_manager.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/clear.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/server_command/clear.h"
+#include "host/commands/cvd/cli/commands/clear.h"
 
 #include <sys/types.h>
 
@@ -23,11 +23,11 @@
 #include <android-base/scopeguard.h>
 
 #include "common/libs/utils/result.h"
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
-#include "host/commands/cvd/instance_manager.h"
-#include "host/commands/cvd/server_command/server_handler.h"
-#include "host/commands/cvd/server_command/utils.h"
-#include "host/commands/cvd/types.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
+#include "host/commands/cvd/instances/instance_manager.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
+#include "host/commands/cvd/cli/utils.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 namespace {

base/cvd/cuttlefish/host/commands/cvd/server_command/clear.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/clear.h

@@ -18,8 +18,8 @@
 
 #include <memory>
 
-#include "host/commands/cvd/instance_manager.h"
-#include "host/commands/cvd/server_command/server_handler.h"
+#include "host/commands/cvd/instances/instance_manager.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/cmd_list.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/cmd_list.cpp

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/server_command/cmd_list.h"
+#include "host/commands/cvd/cli/commands/cmd_list.h"
 
 #include <vector>
 
 #include <android-base/strings.h>
 #include <json/value.h>
 
-#include "host/commands/cvd/server_command/server_handler.h"
-#include "host/commands/cvd/server_command/utils.h"
-#include "host/commands/cvd/types.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
+#include "host/commands/cvd/cli/utils.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/cmd_list.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/cmd_list.h

@@ -18,8 +18,8 @@
 
 #include <memory>
 
-#include "host/commands/cvd/command_sequence.h"
-#include "host/commands/cvd/server_command/server_handler.h"
+#include "host/commands/cvd/cli/command_sequence.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
 
 namespace cuttlefish {
 

base/cvd/cuttlefish/host/commands/cvd/server_command/create.cpp → base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "host/commands/cvd/server_command/create.h"
+#include "host/commands/cvd/cli/commands/create.h"
 
 #include <sys/types.h>
 
@@ -32,18 +32,18 @@
 #include "common/libs/utils/flag_parser.h"
 #include "common/libs/utils/result.h"
 #include "common/libs/utils/users.h"
-#include "cuttlefish/host/commands/cvd/cvd_server.pb.h"
-#include "cuttlefish/host/commands/cvd/selector/cvd_persistent_data.pb.h"
-#include "host/commands/cvd/command_sequence.h"
-#include "host/commands/cvd/common_utils.h"
-#include "host/commands/cvd/selector/creation_analyzer.h"
-#include "host/commands/cvd/selector/instance_database_types.h"
-#include "host/commands/cvd/selector/instance_group_record.h"
-#include "host/commands/cvd/selector/selector_constants.h"
-#include "host/commands/cvd/server_command/host_tool_target.h"
-#include "host/commands/cvd/server_command/server_handler.h"
-#include "host/commands/cvd/server_command/utils.h"
-#include "host/commands/cvd/types.h"
+#include "cuttlefish/host/commands/cvd/legacy/cvd_server.pb.h"
+#include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
+#include "host/commands/cvd/cli/command_sequence.h"
+#include "host/commands/cvd/utils/common.h"
+#include "host/commands/cvd/cli/selector/creation_analyzer.h"
+#include "host/commands/cvd/instances/instance_database_types.h"
+#include "host/commands/cvd/instances/instance_group_record.h"
+#include "host/commands/cvd/cli/selector/selector_constants.h"
+#include "host/commands/cvd/cli/commands/host_tool_target.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
+#include "host/commands/cvd/cli/utils.h"
+#include "host/commands/cvd/cli/types.h"
 
 namespace cuttlefish {
 namespace {

base/cvd/cuttlefish/host/commands/cvd/server_command/create.h → base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.h

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "host/commands/cvd/command_sequence.h"
-#include "host/commands/cvd/instance_manager.h"
-#include "host/commands/cvd/server_command/server_handler.h"
+#include "host/commands/cvd/cli/command_sequence.h"
+#include "host/commands/cvd/instances/instance_manager.h"
+#include "host/commands/cvd/cli/commands/server_handler.h"
 
 namespace cuttlefish {