11 files changed, 34 insertions, 34 deletions
diff --git a/cli/tools/bench.rs b/cli/tools/bench.rs
index b51938d13..3c40b4e95 100644
--- a/cli/tools/bench.rs
+++ b/cli/tools/bench.rs
@@ -1,5 +1,8 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+use crate::args::BenchFlags;
+use crate::args::Flags;
+use crate::args::TypeCheckMode;
 use crate::cache;
 use crate::colors;
 use crate::compat;
@@ -7,9 +10,6 @@ use crate::create_main_worker;
 use crate::emit;
 use crate::file_watcher;
 use crate::file_watcher::ResolutionResult;
-use crate::flags::BenchFlags;
-use crate::flags::Flags;
-use crate::flags::TypeCheckMode;
 use crate::fs_util::collect_specifiers;
 use crate::fs_util::is_supported_bench_path;
 use crate::graph_util::contains_specifier;
diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
index d895f8a7e..efaf19922 100644
--- a/cli/tools/coverage/mod.rs
+++ b/cli/tools/coverage/mod.rs
@@ -1,8 +1,8 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+use crate::args::CoverageFlags;
+use crate::args::Flags;
 use crate::colors;
-use crate::flags::CoverageFlags;
-use crate::flags::Flags;
 use crate::fs_util::collect_files;
 use crate::proc_state::ProcState;
 use crate::tools::fmt::format_json;
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
index a5826d1bc..684c3040e 100644
--- a/cli/tools/doc.rs
+++ b/cli/tools/doc.rs
@@ -1,9 +1,9 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+use crate::args::DocFlags;
+use crate::args::Flags;
 use crate::colors;
 use crate::file_fetcher::File;
-use crate::flags::DocFlags;
-use crate::flags::Flags;
 use crate::get_types;
 use crate::proc_state::ProcState;
 use crate::write_json_to_stdout;
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
index 7758f29f9..b2aa47373 100644
--- a/cli/tools/fmt.rs
+++ b/cli/tools/fmt.rs
@@ -7,16 +7,16 @@
 //! the future it can be easily extended to provide
 //! the same functions as ops available in JS runtime.
 
+use crate::args::Flags;
+use crate::args::FmtConfig;
+use crate::args::FmtFlags;
+use crate::args::FmtOptionsConfig;
+use crate::args::ProseWrap;
 use crate::colors;
-use crate::config_file::FmtConfig;
-use crate::config_file::FmtOptionsConfig;
-use crate::config_file::ProseWrap;
 use crate::deno_dir::DenoDir;
 use crate::diff::diff;
 use crate::file_watcher;
 use crate::file_watcher::ResolutionResult;
-use crate::flags::Flags;
-use crate::flags::FmtFlags;
 use crate::fs_util::collect_files;
 use crate::fs_util::get_extension;
 use crate::fs_util::specifier_to_file_path;
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs
index 962f16ce3..df4b46332 100644
--- a/cli/tools/installer.rs
+++ b/cli/tools/installer.rs
@@ -1,9 +1,9 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
-use crate::flags::ConfigFlag;
-use crate::flags::Flags;
-use crate::flags::InstallFlags;
-use crate::flags::TypeCheckMode;
+use crate::args::ConfigFlag;
+use crate::args::Flags;
+use crate::args::InstallFlags;
+use crate::args::TypeCheckMode;
 use crate::fs_util::canonicalize_path;
 use deno_core::error::generic_error;
 use deno_core::error::AnyError;
@@ -403,7 +403,7 @@ fn is_in_path(dir: &Path) -> bool {
 mod tests {
   use super::*;
 
-  use crate::flags::ConfigFlag;
+  use crate::args::ConfigFlag;
   use std::process::Command;
   use test_util::testdata_path;
   use test_util::TempDir;
diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs
index f251dc647..60cda9f90 100644
--- a/cli/tools/lint.rs
+++ b/cli/tools/lint.rs
@@ -6,9 +6,9 @@
 //! At the moment it is only consumed using CLI but in
 //! the future it can be easily extended to provide
 //! the same functions as ops available in JS runtime.
-use crate::config_file::LintConfig;
+use crate::args::LintConfig;
+use crate::args::{Flags, LintFlags};
 use crate::file_watcher::ResolutionResult;
-use crate::flags::{Flags, LintFlags};
 use crate::fmt_errors;
 use crate::fs_util::{collect_files, is_supported_ext, specifier_to_file_path};
 use crate::proc_state::ProcState;
@@ -590,7 +590,7 @@ mod test {
   use deno_lint::rules::get_recommended_rules;
 
   use super::*;
-  use crate::config_file::LintRulesConfig;
+  use crate::args::LintRulesConfig;
 
   #[test]
   fn recommended_rules_when_no_tags_in_config() {
diff --git a/cli/tools/standalone.rs b/cli/tools/standalone.rs
index e29545b2f..2561188ca 100644
--- a/cli/tools/standalone.rs
+++ b/cli/tools/standalone.rs
@@ -1,11 +1,11 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+use crate::args::CompileFlags;
+use crate::args::DenoSubcommand;
+use crate::args::Flags;
+use crate::args::RunFlags;
+use crate::args::TypeCheckMode;
 use crate::deno_dir::DenoDir;
-use crate::flags::CompileFlags;
-use crate::flags::DenoSubcommand;
-use crate::flags::Flags;
-use crate::flags::RunFlags;
-use crate::flags::TypeCheckMode;
 use crate::fs_util;
 use crate::standalone::Metadata;
 use crate::standalone::MAGIC_TRAILER;
diff --git a/cli/tools/task.rs b/cli/tools/task.rs
index 28dd0a853..1b6846e7c 100644
--- a/cli/tools/task.rs
+++ b/cli/tools/task.rs
@@ -1,9 +1,9 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+use crate::args::ConfigFile;
+use crate::args::Flags;
+use crate::args::TaskFlags;
 use crate::colors;
-use crate::config_file::ConfigFile;
-use crate::flags::Flags;
-use crate::flags::TaskFlags;
 use crate::fs_util;
 use crate::proc_state::ProcState;
 use deno_core::anyhow::bail;
diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index 94412a3ae..ac146fdbf 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -1,5 +1,8 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+use crate::args::Flags;
+use crate::args::TestFlags;
+use crate::args::TypeCheckMode;
 use crate::cache;
 use crate::colors;
 use crate::compat;
@@ -9,9 +12,6 @@ use crate::emit;
 use crate::file_fetcher::File;
 use crate::file_watcher;
 use crate::file_watcher::ResolutionResult;
-use crate::flags::Flags;
-use crate::flags::TestFlags;
-use crate::flags::TypeCheckMode;
 use crate::fmt_errors::format_js_error;
 use crate::fs_util::collect_specifiers;
 use crate::fs_util::is_supported_test_ext;
diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs
index d72fb1b0a..db1383eb0 100644
--- a/cli/tools/upgrade.rs
+++ b/cli/tools/upgrade.rs
@@ -2,7 +2,7 @@
 
 //! This module provides feature to upgrade deno executable
 
-use crate::flags::UpgradeFlags;
+use crate::args::UpgradeFlags;
 use deno_core::anyhow::bail;
 use deno_core::error::AnyError;
 use deno_core::futures::StreamExt;
diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index 69c759154..15b149e2e 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -11,8 +11,8 @@ use deno_core::resolve_url_or_path;
 use deno_runtime::permissions::Permissions;
 use log::warn;
 
-use crate::config_file::FmtOptionsConfig;
-use crate::flags::VendorFlags;
+use crate::args::FmtOptionsConfig;
+use crate::args::VendorFlags;
 use crate::fs_util;
 use crate::fs_util::relative_specifier;
 use crate::fs_util::specifier_to_file_path;