refactor(symfony): hide leaf modules behind their parent re-exports

Every parent module in the symfony-* crates already re-exported its leaf
modules with `pub use`, so each item was reachable by two paths. Make the
leaf modules private and route all callers through the single re-exported
path.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

54 files changed, 198 insertions, 207 deletions

diff --git a/crates/shirabe/src/command/about_command.rs b/crates/shirabe/src/command/about_command.rs
index 0d680727..3a72ac3a 100644
--- a/crates/shirabe/src/command/about_command.rs
+++ b/crates/shirabe/src/command/about_command.rs
@@ -5,7 +5,7 @@ use crate::command::BaseCommandData;
 use crate::command::base_command::base_command_initialize;
 use crate::composer;
 use shirabe_php_shim::impl_php_class;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -69,8 +69,8 @@ impl Command for AboutCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs
index d863b8b3..452103d9 100644
--- a/crates/shirabe/src/command/archive_command.rs
+++ b/crates/shirabe/src/command/archive_command.rs
@@ -28,7 +28,7 @@ use crate::util::r#loop::Loop;
 use indexmap::IndexMap;
 use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::{LogicException, get_debug_type, impl_php_class, php_regex};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -451,8 +451,8 @@ impl Command for ArchiveCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs
index c631a870..b6a3a150 100644
--- a/crates/shirabe/src/command/audit_command.rs
+++ b/crates/shirabe/src/command/audit_command.rs
@@ -17,7 +17,7 @@ use shirabe_php_shim::{
     InvalidArgumentException, PhpMixed, UnexpectedValueException, impl_php_class, implode,
     in_array_strict,
 };
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -287,8 +287,8 @@ impl Command for AuditCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs
index ceb71bf1..9eb28dd8 100644
--- a/crates/shirabe/src/command/base_command.rs
+++ b/crates/shirabe/src/command/base_command.rs
@@ -23,7 +23,7 @@ use shirabe_php_shim::{
     UnexpectedValueException, count, explode, in_array_strict, is_string,
 };
 use shirabe_symfony_console::Terminal;
-use shirabe_symfony_console::command::command::{Command, CommandData, SetDefinitionArg};
+use shirabe_symfony_console::command::{Command, CommandData, SetDefinitionArg};
 use shirabe_symfony_console::helper::Table;
 use shirabe_symfony_console::helper::TableSeparator;
 use shirabe_symfony_console::input::InputInterface;
@@ -741,10 +741,10 @@ fn apply_application_defaults(
 /// each command's `Command::complete` forwards here.
 pub fn base_command_complete(
     cmd: &dyn BaseCommand,
-    input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-    suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+    input: &shirabe_symfony_console::completion::CompletionInput,
+    suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
 ) -> anyhow::Result<()> {
-    use shirabe_symfony_console::completion::completion_input::CompletionInput;
+    use shirabe_symfony_console::completion::CompletionInput;
 
     // PHP: (string) $input->getCompletionName()
     let name = input.get_completion_name().unwrap_or_default();
diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs
index 99761b18..87109d20 100644
--- a/crates/shirabe/src/command/bump_command.rs
+++ b/crates/shirabe/src/command/bump_command.rs
@@ -21,7 +21,7 @@ use shirabe_php_shim::{
     PhpMixed, file_get_contents, file_put_contents, impl_php_class, is_writable, php_regex,
     strtolower,
 };
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -442,8 +442,8 @@ impl Command for BumpCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs
index b69f4190..3742cdac 100644
--- a/crates/shirabe/src/command/check_platform_reqs_command.rs
+++ b/crates/shirabe/src/command/check_platform_reqs_command.rs
@@ -15,7 +15,7 @@ use indexmap::IndexMap;
 use shirabe_php_shim::{PhpMixed, array_merge_map, impl_php_class, strip_tags};
 use shirabe_semver::constraint::AnyConstraint;
 use shirabe_semver::constraint::SimpleConstraint;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -413,8 +413,8 @@ impl Command for CheckPlatformReqsCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/clear_cache_command.rs b/crates/shirabe/src/command/clear_cache_command.rs
index fcc237af..2252a75e 100644
--- a/crates/shirabe/src/command/clear_cache_command.rs
+++ b/crates/shirabe/src/command/clear_cache_command.rs
@@ -9,7 +9,7 @@ use crate::console::input::InputOption;
 use crate::factory::Factory;
 use crate::io::IOInterfaceImmutable;
 use shirabe_php_shim::{impl_php_class, realpath};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -188,8 +188,8 @@ impl Command for ClearCacheCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs
index a0660aca..df47d934 100644
--- a/crates/shirabe/src/command/config_command.rs
+++ b/crates/shirabe/src/command/config_command.rs
@@ -26,7 +26,7 @@ use shirabe_php_shim::{
     php_regex, str_replace, strpos, strtolower, system, touch, var_export,
 };
 use shirabe_semver::VersionParser;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -1578,8 +1578,8 @@ impl Command for ConfigCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs
index e8f7d187..787e31d7 100644
--- a/crates/shirabe/src/command/create_project_command.rs
+++ b/crates/shirabe/src/command/create_project_command.rs
@@ -44,7 +44,7 @@ use shirabe_php_shim::{
     mkdir, realpath, rtrim, strtolower, unlink,
 };
 use shirabe_seld_signal::SignalHandler;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 use shirabe_symfony_finder::Finder;
@@ -1021,8 +1021,8 @@ impl Command for CreateProjectCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs
index 7ffa9281..f22682e8 100644
--- a/crates/shirabe/src/command/depends_command.rs
+++ b/crates/shirabe/src/command/depends_command.rs
@@ -8,7 +8,7 @@ use crate::command::base_command::base_command_initialize;
 use crate::console::input::InputArgument;
 use crate::console::input::InputOption;
 use shirabe_php_shim::impl_php_class;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -119,8 +119,8 @@ impl Command for DependsCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs
index 5094f06a..ca71c0e5 100644
--- a/crates/shirabe/src/command/diagnose_command.rs
+++ b/crates/shirabe/src/command/diagnose_command.rs
@@ -41,7 +41,7 @@ use shirabe_php_shim::{
     is_string, php_regex, rtrim, str_contains, str_replace, str_starts_with, strpos, strstr,
     strstr3, strtolower, trim, version_compare,
 };
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 use shirabe_symfony_process::ExecutableFinder;
@@ -637,7 +637,7 @@ impl DiagnoseCommand {
         let io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>> =
             std::rc::Rc::new(std::cell::RefCell::new(BufferIO::new(
                 String::new(),
-                shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL,
+                shirabe_symfony_console::output::VERBOSITY_NORMAL,
                 None,
             )?));
         let result = match auditor.audit(
@@ -1499,8 +1499,8 @@ impl Command for DiagnoseCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs
index 8bf491cb..d9ac44ba 100644
--- a/crates/shirabe/src/command/dump_autoload_command.rs
+++ b/crates/shirabe/src/command/dump_autoload_command.rs
@@ -8,7 +8,7 @@ use crate::io::IOInterfaceImmutable;
 use crate::plugin::CommandEvent;
 use crate::plugin::PluginEvents;
 use shirabe_php_shim::{InvalidArgumentException, PhpMixed, file_exists, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -303,8 +303,8 @@ impl Command for DumpAutoloadCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs
index e5825e3b..92e46c8b 100644
--- a/crates/shirabe/src/command/exec_command.rs
+++ b/crates/shirabe/src/command/exec_command.rs
@@ -8,7 +8,7 @@ use crate::console::input::InputArgument;
 use crate::console::input::InputOption;
 use crate::io::IOInterfaceImmutable;
 use shirabe_php_shim::{PhpMixed, RuntimeException, basename, chdir, getcwd, glob, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -256,8 +256,8 @@ impl Command for ExecCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs
index 1151c365..7f2dd24c 100644
--- a/crates/shirabe/src/command/fund_command.rs
+++ b/crates/shirabe/src/command/fund_command.rs
@@ -14,7 +14,7 @@ use shirabe_pcre::Preg;
 use shirabe_php_shim::{PhpMixed, impl_php_class, php_regex};
 use shirabe_semver::constraint::AnyConstraint;
 use shirabe_semver::constraint::MatchAllConstraint;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::formatter::OutputFormatter;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
@@ -229,8 +229,8 @@ impl Command for FundCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs
index f60cc4a0..af25eb29 100644
--- a/crates/shirabe/src/command/global_command.rs
+++ b/crates/shirabe/src/command/global_command.rs
@@ -10,11 +10,9 @@ use crate::util::Filesystem;
 use crate::util::Platform;
 use shirabe_pcre::Preg;
 use shirabe_php_shim::{LogicException, RuntimeException, chdir, impl_php_class, php_regex};
-use shirabe_symfony_console::command::command::Command;
-use shirabe_symfony_console::completion::completion_input::CompletionInput;
-use shirabe_symfony_console::completion::completion_suggestions::{
-    CompletionSuggestions, StringOrSuggestion,
-};
+use shirabe_symfony_console::command::Command;
+use shirabe_symfony_console::completion::CompletionInput;
+use shirabe_symfony_console::completion::{CompletionSuggestions, StringOrSuggestion};
 use shirabe_symfony_console::input::ArgvInput;
 use shirabe_symfony_console::input::ArrayInput;
 use shirabe_symfony_console::input::InputInterface;
diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs
index 226872d5..a0cc881d 100644
--- a/crates/shirabe/src/command/home_command.rs
+++ b/crates/shirabe/src/command/home_command.rs
@@ -14,7 +14,7 @@ use crate::util::Platform;
 use crate::util::ProcessExecutor;
 use shirabe_php_shim::filter_var_url;
 use shirabe_php_shim::{PhpMixed, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -265,8 +265,8 @@ impl Command for HomeCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs
index 3a095416..e76f5a94 100644
--- a/crates/shirabe/src/command/init_command.rs
+++ b/crates/shirabe/src/command/init_command.rs
@@ -29,7 +29,7 @@ use shirabe_php_shim::{
     ucwords,
 };
 use shirabe_spdx_licenses::SpdxLicenses;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::helper::FormatBlockMessages;
 use shirabe_symfony_console::input::ArrayInput;
 use shirabe_symfony_console::input::InputInterface;
@@ -1250,8 +1250,8 @@ impl Command for InitCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs
index 264cbbeb..6a5ce8de 100644
--- a/crates/shirabe/src/command/install_command.rs
+++ b/crates/shirabe/src/command/install_command.rs
@@ -14,7 +14,7 @@ use crate::plugin::CommandEvent;
 use crate::plugin::PluginEvents;
 use crate::util::HttpDownloader;
 use shirabe_php_shim::{PhpMixed, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -274,8 +274,8 @@ impl Command for InstallCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs
index ed64061a..653987bf 100644
--- a/crates/shirabe/src/command/licenses_command.rs
+++ b/crates/shirabe/src/command/licenses_command.rs
@@ -14,7 +14,7 @@ use crate::util::PackageInfo;
 use crate::util::PackageSorter;
 use indexmap::IndexMap;
 use shirabe_php_shim::{PhpMixed, RuntimeException, UnexpectedValueException, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::formatter::OutputFormatter;
 use shirabe_symfony_console::helper::Table;
 use shirabe_symfony_console::input::InputInterface;
@@ -332,8 +332,8 @@ impl Command for LicensesCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/outdated_command.rs b/crates/shirabe/src/command/outdated_command.rs
index 6d062d97..3994ab64 100644
--- a/crates/shirabe/src/command/outdated_command.rs
+++ b/crates/shirabe/src/command/outdated_command.rs
@@ -9,7 +9,7 @@ use crate::console::input::InputOption;
 use crate::console::input::SuggestedValues;
 use indexmap::IndexMap;
 use shirabe_php_shim::{PhpMixed, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::ArrayInput;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
@@ -235,8 +235,8 @@ impl Command for OutdatedCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs
index 893c4f4a..ae38f9d2 100644
--- a/crates/shirabe/src/command/prohibits_command.rs
+++ b/crates/shirabe/src/command/prohibits_command.rs
@@ -7,7 +7,7 @@ use crate::command::{BaseCommand, BaseCommandData};
 use crate::console::input::InputArgument;
 use crate::console::input::InputOption;
 use shirabe_php_shim::impl_php_class;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -126,8 +126,8 @@ impl Command for ProhibitsCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs
index c9a1d2ea..9ef45fbf 100644
--- a/crates/shirabe/src/command/reinstall_command.rs
+++ b/crates/shirabe/src/command/reinstall_command.rs
@@ -17,7 +17,7 @@ use crate::script::ScriptEvents;
 use crate::util::Platform;
 use shirabe_pcre::Preg;
 use shirabe_php_shim::{InvalidArgumentException, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -344,8 +344,8 @@ impl Command for ReinstallCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs
index 50e68045..a8b525e6 100644
--- a/crates/shirabe/src/command/remove_command.rs
+++ b/crates/shirabe/src/command/remove_command.rs
@@ -19,7 +19,7 @@ use crate::repository::RepositoryInterface;
 use indexmap::IndexMap;
 use shirabe_pcre::Preg;
 use shirabe_php_shim::{PhpMixed, UnexpectedValueException, impl_php_class, strtolower};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::exception::InvalidArgumentException;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
@@ -715,8 +715,8 @@ impl Command for RemoveCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs
index b03c0133..ef75ffd0 100644
--- a/crates/shirabe/src/command/repository_command.rs
+++ b/crates/shirabe/src/command/repository_command.rs
@@ -15,7 +15,7 @@ use shirabe_php_shim::{
     InvalidArgumentException, PHP_URL_HOST, PhpMixed, RuntimeException, impl_php_class, parse_url,
     php_regex, strtolower,
 };
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -578,8 +578,8 @@ impl Command for RepositoryCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs
index 30e727d4..d4295a50 100644
--- a/crates/shirabe/src/command/require_command.rs
+++ b/crates/shirabe/src/command/require_command.rs
@@ -38,7 +38,7 @@ use shirabe_php_shim::{
     impl_php_class, implode, is_writable, strtolower, unlink,
 };
 use shirabe_seld_signal::SignalHandler;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -1289,8 +1289,8 @@ impl Command for RequireCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs
index 56833daa..a3a7d5be 100644
--- a/crates/shirabe/src/command/run_script_command.rs
+++ b/crates/shirabe/src/command/run_script_command.rs
@@ -14,9 +14,9 @@ use indexmap::IndexMap;
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{InvalidArgumentException, RuntimeException};
 use shirabe_php_shim::{PhpMixed, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::exception::CommandNotFoundException;
-use shirabe_symfony_console::exception::namespace_not_found_exception::NamespaceNotFoundException;
+use shirabe_symfony_console::exception::NamespaceNotFoundException;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -347,8 +347,8 @@ impl Command for RunScriptCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs
index 214cb51f..e4418b53 100644
--- a/crates/shirabe/src/command/script_alias_command.rs
+++ b/crates/shirabe/src/command/script_alias_command.rs
@@ -10,7 +10,7 @@ use shirabe_pcre::Preg;
 use shirabe_php_shim::{
     InvalidArgumentException, LogicException, PhpMixed, impl_php_class, is_string, php_regex,
 };
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -171,8 +171,8 @@ impl Command for ScriptAliasCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs
index 3f797551..72a883f1 100644
--- a/crates/shirabe/src/command/search_command.rs
+++ b/crates/shirabe/src/command/search_command.rs
@@ -17,7 +17,7 @@ use indexmap::IndexMap;
 use shirabe_php_shim::{
     InvalidArgumentException, PhpMixed, impl_php_class, implode, in_array_loose, preg_quote, substr,
 };
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::formatter::OutputFormatter;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
@@ -307,8 +307,8 @@ impl Command for SearchCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs
index 6872730e..dabe8bc8 100644
--- a/crates/shirabe/src/command/self_update_command.rs
+++ b/crates/shirabe/src/command/self_update_command.rs
@@ -8,7 +8,7 @@ use crate::console::input::InputOption;
 use crate::io::IOInterfaceImmutable;
 use crate::io::io_interface;
 use shirabe_php_shim::{PhpMixed, impl_php_class};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -95,8 +95,8 @@ impl Command for SelfUpdateCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs
index c456f71a..e5d5a1f2 100644
--- a/crates/shirabe/src/command/show_command.rs
+++ b/crates/shirabe/src/command/show_command.rs
@@ -45,7 +45,7 @@ use shirabe_php_shim::{
 use shirabe_semver::Semver;
 use shirabe_semver::constraint::AnyConstraint;
 use shirabe_spdx_licenses::SpdxLicenses;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::formatter::OutputFormatter;
 use shirabe_symfony_console::formatter::OutputFormatterStyle;
 use shirabe_symfony_console::input::InputInterface;
@@ -2885,8 +2885,8 @@ impl Command for ShowCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs
index 097d7a40..bcb83a3a 100644
--- a/crates/shirabe/src/command/status_command.rs
+++ b/crates/shirabe/src/command/status_command.rs
@@ -14,7 +14,7 @@ use crate::script::ScriptEvents;
 use crate::util::ProcessExecutor;
 use indexmap::IndexMap;
 use shirabe_php_shim::impl_php_class;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -390,8 +390,8 @@ impl Command for StatusCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs
index fba93b79..44f903da 100644
--- a/crates/shirabe/src/command/suggests_command.rs
+++ b/crates/shirabe/src/command/suggests_command.rs
@@ -13,7 +13,7 @@ use crate::repository::RepositoryInterfaceHandle;
 use crate::repository::RootPackageRepository;
 use indexmap::IndexMap;
 use shirabe_php_shim::{PhpMixed, empty, impl_php_class, in_array_loose};
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -228,8 +228,8 @@ impl Command for SuggestsCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs
index abf9696a..b961b3a0 100644
--- a/crates/shirabe/src/command/update_command.rs
+++ b/crates/shirabe/src/command/update_command.rs
@@ -34,7 +34,7 @@ use shirabe_php_shim::{
 };
 use shirabe_semver::Intervals;
 use shirabe_semver::constraint::MultiConstraint;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::helper::Table;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
@@ -764,8 +764,8 @@ impl Command for UpdateCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs
index 116c0b27..d2e8f2a7 100644
--- a/crates/shirabe/src/command/validate_command.rs
+++ b/crates/shirabe/src/command/validate_command.rs
@@ -14,7 +14,7 @@ use crate::plugin::PluginEvents;
 use crate::util::ConfigValidator;
 use crate::util::Filesystem;
 use shirabe_php_shim::impl_php_class;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -406,8 +406,8 @@ impl Command for ValidateCommand {
 
     fn complete(
         &self,
-        input: &shirabe_symfony_console::completion::completion_input::CompletionInput,
-        suggestions: &mut shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions,
+        input: &shirabe_symfony_console::completion::CompletionInput,
+        suggestions: &mut shirabe_symfony_console::completion::CompletionSuggestions,
     ) -> anyhow::Result<()> {
         crate::command::base_command::base_command_complete(self, input, suggestions)
     }
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs
index 8fed08e9..897408c0 100644
--- a/crates/shirabe/src/console/application.rs
+++ b/crates/shirabe/src/console/application.rs
@@ -67,35 +67,35 @@ use shirabe_php_shim::{
 use shirabe_seld_json_lint::ParsingException;
 use shirabe_symfony_console::application::Application as BaseApplication;
 use shirabe_symfony_console::command::Command as SymfonyCommand;
-use shirabe_symfony_console::command::help_command::HelpCommand;
-use shirabe_symfony_console::command::signalable_command_interface::SignalableCommandInterface;
-use shirabe_symfony_console::command_loader::command_loader_interface::CommandLoaderInterface;
-use shirabe_symfony_console::completion::completion_input::CompletionInput;
-use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions;
+use shirabe_symfony_console::command::HelpCommand;
+use shirabe_symfony_console::command::SignalableCommandInterface;
+use shirabe_symfony_console::command_loader::CommandLoaderInterface;
+use shirabe_symfony_console::completion::CompletionInput;
+use shirabe_symfony_console::completion::CompletionSuggestions;
 use shirabe_symfony_console::exception::CommandNotFoundException;
-use shirabe_symfony_console::exception::invalid_argument_exception::InvalidArgumentException as ConsoleInvalidArgumentException;
-use shirabe_symfony_console::exception::invalid_option_exception::InvalidOptionException;
-use shirabe_symfony_console::exception::logic_exception::LogicException as ConsoleLogicException;
-use shirabe_symfony_console::exception::missing_input_exception::MissingInputException;
-use shirabe_symfony_console::exception::namespace_not_found_exception::NamespaceNotFoundException;
-use shirabe_symfony_console::exception::runtime_exception::RuntimeException as ConsoleRuntimeException;
-use shirabe_symfony_console::formatter::output_formatter::OutputFormatter;
+use shirabe_symfony_console::exception::InvalidArgumentException as ConsoleInvalidArgumentException;
+use shirabe_symfony_console::exception::InvalidOptionException;
+use shirabe_symfony_console::exception::LogicException as ConsoleLogicException;
+use shirabe_symfony_console::exception::MissingInputException;
+use shirabe_symfony_console::exception::NamespaceNotFoundException;
+use shirabe_symfony_console::exception::RuntimeException as ConsoleRuntimeException;
+use shirabe_symfony_console::formatter::OutputFormatter;
+use shirabe_symfony_console::helper::Helper;
 use shirabe_symfony_console::helper::HelperSet;
 use shirabe_symfony_console::helper::QuestionHelper;
-use shirabe_symfony_console::helper::formatter_helper::{FormatBlockMessages, FormatterHelper};
-use shirabe_symfony_console::helper::helper::Helper;
+use shirabe_symfony_console::helper::{FormatBlockMessages, FormatterHelper};
+use shirabe_symfony_console::input::ArgvInput;
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputArgument;
 use shirabe_symfony_console::input::InputDefinition;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::input::InputOption;
-use shirabe_symfony_console::input::argv_input::ArgvInput;
-use shirabe_symfony_console::input::array_input::ArrayInput;
-use shirabe_symfony_console::input::input_argument::InputArgument;
+use shirabe_symfony_console::output::ConsoleOutput;
 use shirabe_symfony_console::output::ConsoleOutputInterface;
-use shirabe_symfony_console::output::console_output::ConsoleOutput;
-use shirabe_symfony_console::output::output_interface::{self, OutputInterface};
-use shirabe_symfony_console::signal_registry::signal_registry::SignalRegistry;
-use shirabe_symfony_console::style::style_interface::StyleInterface;
-use shirabe_symfony_console::style::symfony_style::SymfonyStyle;
+use shirabe_symfony_console::output::{OutputInterface, output_interface};
+use shirabe_symfony_console::signal_registry::SignalRegistry;
+use shirabe_symfony_console::style::StyleInterface;
+use shirabe_symfony_console::style::SymfonyStyle;
 use shirabe_symfony_console::terminal::Terminal;
 use shirabe_symfony_process::exception::ProcessTimedOutException;
 
@@ -777,12 +777,12 @@ impl Application {
                 }
             }
             // array_filter($commandNames)
-            let filtered: Vec<shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion> =
+            let filtered: Vec<shirabe_symfony_console::completion::StringOrSuggestion> =
                 command_names
                     .into_iter()
                     .filter(shirabe_php_shim::php_truthy)
                     .map(|n| {
-                        shirabe_symfony_console::completion::completion_suggestions::StringOrSuggestion::String(
+                        shirabe_symfony_console::completion::StringOrSuggestion::String(
                             shirabe_php_shim::php_to_string(&n),
                         )
                     })
@@ -1563,7 +1563,7 @@ impl Application {
 
     /// Gets the default input definition (Symfony base; `parent::getDefaultInputDefinition`).
     pub fn base_get_default_input_definition(&self) -> InputDefinition {
-        use shirabe_symfony_console::input::input_definition::DefinitionItem;
+        use shirabe_symfony_console::input::DefinitionItem;
         InputDefinition::new(vec![
             DefinitionItem::InputArgument(
                 InputArgument::new(
@@ -1646,10 +1646,10 @@ impl Application {
     pub fn base_get_default_commands(
         &self,
     ) -> Vec<std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>> {
-        use shirabe_symfony_console::command::complete_command::CompleteCommand;
-        use shirabe_symfony_console::command::dump_completion_command::DumpCompletionCommand;
-        use shirabe_symfony_console::command::help_command::HelpCommand;
-        use shirabe_symfony_console::command::list_command::ListCommand;
+        use shirabe_symfony_console::command::CompleteCommand;
+        use shirabe_symfony_console::command::DumpCompletionCommand;
+        use shirabe_symfony_console::command::HelpCommand;
+        use shirabe_symfony_console::command::ListCommand;
 
         vec![
             std::rc::Rc::new(std::cell::RefCell::new(HelpCommand::new()))
@@ -3067,10 +3067,9 @@ pub(crate) fn run_worker_reverse_command(name: &str, input_line: &str) -> anyhow
     } else {
         format!("{name} {trimmed}")
     };
-    let input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>> =
-        std::rc::Rc::new(std::cell::RefCell::new(
-            shirabe_symfony_console::input::string_input::StringInput::new(&line)?,
-        ));
+    let input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>> = std::rc::Rc::new(
+        std::cell::RefCell::new(shirabe_symfony_console::input::StringInput::new(&line)?),
+    );
     let output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>> = std::rc::Rc::new(
         std::cell::RefCell::new(ConsoleOutput::new(None, None, None)?),
     );
diff --git a/crates/shirabe/src/console/input.rs b/crates/shirabe/src/console/input.rs
index b8076247..6e515e7d 100644
--- a/crates/shirabe/src/console/input.rs
+++ b/crates/shirabe/src/console/input.rs
@@ -4,10 +4,8 @@ pub mod input_option;
 pub use input_argument::*;
 pub use input_option::*;
 
-use shirabe_symfony_console::completion::completion_input::CompletionInput;
-use shirabe_symfony_console::completion::completion_suggestions::{
-    CompletionSuggestions, StringOrSuggestion,
-};
+use shirabe_symfony_console::completion::CompletionInput;
+use shirabe_symfony_console::completion::{CompletionSuggestions, StringOrSuggestion};
 
 /// PHP: `\Closure(CompletionInput,CompletionSuggestions):list<string|Suggestion>`.
 ///
@@ -88,10 +86,8 @@ pub enum InputDefinitionItem {
 
 impl InputDefinitionItem {
     /// Converts to the Symfony-typed definition item accepted by `CommandData::set_definition`.
-    pub(crate) fn to_definition_item(
-        &self,
-    ) -> shirabe_symfony_console::input::input_definition::DefinitionItem {
-        use shirabe_symfony_console::input::input_definition::DefinitionItem;
+    pub(crate) fn to_definition_item(&self) -> shirabe_symfony_console::input::DefinitionItem {
+        use shirabe_symfony_console::input::DefinitionItem;
         match self {
             InputDefinitionItem::Argument(argument) => {
                 DefinitionItem::InputArgument(argument.to_base())
diff --git a/crates/shirabe/src/console/input/input_argument.rs b/crates/shirabe/src/console/input/input_argument.rs
index ab6f174c..1e550926 100644
--- a/crates/shirabe/src/console/input/input_argument.rs
+++ b/crates/shirabe/src/console/input/input_argument.rs
@@ -2,8 +2,8 @@
 
 use crate::console::input::SuggestedValues;
 use shirabe_php_shim::PhpMixed;
-use shirabe_symfony_console::completion::completion_input::CompletionInput;
-use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions;
+use shirabe_symfony_console::completion::CompletionInput;
+use shirabe_symfony_console::completion::CompletionSuggestions;
 use shirabe_symfony_console::input::InputArgument as BaseInputArgument;
 
 #[derive(Debug)]
diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs
index 8a9c19f7..976f006f 100644
--- a/crates/shirabe/src/console/input/input_option.rs
+++ b/crates/shirabe/src/console/input/input_option.rs
@@ -2,8 +2,8 @@
 
 use crate::console::input::SuggestedValues;
 use shirabe_php_shim::PhpMixed;
-use shirabe_symfony_console::completion::completion_input::CompletionInput;
-use shirabe_symfony_console::completion::completion_suggestions::CompletionSuggestions;
+use shirabe_symfony_console::completion::CompletionInput;
+use shirabe_symfony_console::completion::CompletionSuggestions;
 use shirabe_symfony_console::input::InputOption as BaseInputOption;
 
 #[derive(Debug)]
diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs
index 6d20c3cb..926ca380 100644
--- a/crates/shirabe/src/factory.rs
+++ b/crates/shirabe/src/factory.rs
@@ -402,7 +402,7 @@ impl Factory {
         let formatter = OutputFormatter::new(false, styles);
 
         ConsoleOutput::new(
-            Some(shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL),
+            Some(shirabe_symfony_console::output::VERBOSITY_NORMAL),
             None,
             Some(std::rc::Rc::new(std::cell::RefCell::new(formatter))),
         )
diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs
index 043ef939..060fa0c6 100644
--- a/crates/shirabe/src/io/console_io.rs
+++ b/crates/shirabe/src/io/console_io.rs
@@ -21,7 +21,7 @@ use shirabe_symfony_console::helper::Table;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::ConsoleOutput;
 use shirabe_symfony_console::output::ConsoleOutputInterface;
-use shirabe_symfony_console::output::output_interface::{self, OutputInterface};
+use shirabe_symfony_console::output::{OutputInterface, output_interface};
 use shirabe_symfony_console::question::ChoiceQuestion;
 use shirabe_symfony_console::question::Question;
 use shirabe_symfony_console::question::QuestionInterface;
diff --git a/crates/shirabe/src/lib.rs b/crates/shirabe/src/lib.rs
index 7730bc66..701a8dfd 100644
--- a/crates/shirabe/src/lib.rs
+++ b/crates/shirabe/src/lib.rs
@@ -32,7 +32,7 @@ pub mod util;
 pub fn run(argv: Vec<String>) -> anyhow::Result<i32> {
     use crate::console::ApplicationHandle;
     use crate::util::Platform;
-    use shirabe_symfony_console::input::argv_input::ArgvInput;
+    use shirabe_symfony_console::input::ArgvInput;
 
     // TODO(php-runtime): the full initialization process in composer/bin/composer should be ported
     // somewhere else that communicates with the real PHP runtime.
diff --git a/crates/shirabe/src/plugin/php_plugin_proxy.rs b/crates/shirabe/src/plugin/php_plugin_proxy.rs
index 8e24dbfe..e4384f1c 100644
--- a/crates/shirabe/src/plugin/php_plugin_proxy.rs
+++ b/crates/shirabe/src/plugin/php_plugin_proxy.rs
@@ -33,7 +33,7 @@ use shirabe_php_rpc::{
     call_function_with_dispatcher, call_php_method, release_php_handle,
 };
 use shirabe_php_shim::PhpMixed;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::input::InputInterface;
 use shirabe_symfony_console::output::OutputInterface;
 
@@ -2977,9 +2977,9 @@ impl PhpCommandProxy {
         handle: &PhpObjHandle,
         data: &crate::command::BaseCommandData,
     ) -> anyhow::Result<()> {
-        use shirabe_symfony_console::input::input_argument::InputArgument;
-        use shirabe_symfony_console::input::input_definition::{DefinitionItem, InputDefinition};
-        use shirabe_symfony_console::input::input_option::InputOption;
+        use shirabe_symfony_console::input::InputArgument;
+        use shirabe_symfony_console::input::InputOption;
+        use shirabe_symfony_console::input::{DefinitionItem, InputDefinition};
 
         let value = unwrap_php_result(call_function_with_dispatcher(
             "__shirabe_read_command_definition",
@@ -3084,9 +3084,9 @@ impl PhpCommandProxy {
             )?));
         }
         data.command_data().set_definition(
-            shirabe_symfony_console::command::command::SetDefinitionArg::Definition(
-                InputDefinition::new(items)?,
-            ),
+            shirabe_symfony_console::command::SetDefinitionArg::Definition(InputDefinition::new(
+                items,
+            )?),
         );
 
         match field(&mut map, "help") {
diff --git a/crates/shirabe/tests/application_test.rs b/crates/shirabe/tests/application_test.rs
index f0bde547..257bc861 100644
--- a/crates/shirabe/tests/application_test.rs
+++ b/crates/shirabe/tests/application_test.rs
@@ -14,10 +14,10 @@ use shirabe::console::application::ApplicationHandle;
 use shirabe::util::platform::Platform;
 use shirabe_php_shim::{PHP_EOL, PHP_SERVER, PhpMixed, time};
 use shirabe_symfony_console::command::Command;
-use shirabe_symfony_console::input::array_input::ArrayInput;
-use shirabe_symfony_console::input::input_interface::InputInterface;
-use shirabe_symfony_console::output::buffered_output::BufferedOutput;
-use shirabe_symfony_console::output::output_interface::OutputInterface;
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::BufferedOutput;
+use shirabe_symfony_console::output::OutputInterface;
 
 fn set_up() {
     Platform::put_env("COMPOSER_DISABLE_XDEBUG_WARN", "1");
diff --git a/crates/shirabe/tests/command/archive_command_test.rs b/crates/shirabe/tests/command/archive_command_test.rs
index ac1ad462..90e13e5d 100644
--- a/crates/shirabe/tests/command/archive_command_test.rs
+++ b/crates/shirabe/tests/command/archive_command_test.rs
@@ -17,11 +17,11 @@ use shirabe::repository::{
 use shirabe::util::Platform;
 use shirabe_php_shim::PhpMixed;
 use shirabe_semver::VersionParser;
-use shirabe_symfony_console::command::command::Command;
+use shirabe_symfony_console::command::Command;
+use shirabe_symfony_console::input::ArrayInput;
 use shirabe_symfony_console::input::InputInterface;
-use shirabe_symfony_console::input::array_input::ArrayInput;
+use shirabe_symfony_console::output::BufferedOutput;
 use shirabe_symfony_console::output::OutputInterface;
-use shirabe_symfony_console::output::buffered_output::BufferedOutput;
 
 // PHP mocks `Composer\Package\Archiver\ArchiveManager` with
 // getMockBuilder(...)->disableOriginalConstructor().
diff --git a/crates/shirabe/tests/common/test_case.rs b/crates/shirabe/tests/common/test_case.rs
index e15d2883..9de7d905 100644
--- a/crates/shirabe/tests/common/test_case.rs
+++ b/crates/shirabe/tests/common/test_case.rs
@@ -24,13 +24,13 @@ use shirabe::util::process_executor::ProcessExecutor;
 use shirabe_php_shim::{PhpMixed, PhpResource};
 use shirabe_semver::VersionParser;
 use shirabe_semver::constraint::{AnyConstraint, SimpleConstraint};
-use shirabe_symfony_console::input::array_input::ArrayInput;
-use shirabe_symfony_console::input::input_interface::InputInterface;
-use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface;
-use shirabe_symfony_console::output::console_output::ConsoleOutput;
-use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface;
-use shirabe_symfony_console::output::output_interface::OutputInterface;
-use shirabe_symfony_console::output::stream_output::StreamOutput;
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::StreamableInputInterface;
+use shirabe_symfony_console::output::ConsoleOutput;
+use shirabe_symfony_console::output::ConsoleOutputInterface;
+use shirabe_symfony_console::output::OutputInterface;
+use shirabe_symfony_console::output::StreamOutput;
 use std::path::PathBuf;
 use tempfile::TempDir;
 
diff --git a/crates/shirabe/tests/completion_functional_test.rs b/crates/shirabe/tests/completion_functional_test.rs
index 66f2f87b..6bbe955a 100644
--- a/crates/shirabe/tests/completion_functional_test.rs
+++ b/crates/shirabe/tests/completion_functional_test.rs
@@ -14,7 +14,7 @@ mod bootstrap;
 
 use serial_test::serial;
 use shirabe::console::application::{Application, ApplicationHandle};
-use shirabe_symfony_console::tester::command_completion_tester::CommandCompletionTester;
+use shirabe_symfony_console::tester::CommandCompletionTester;
 
 struct RestoreCwd(std::path::PathBuf);
 
diff --git a/crates/shirabe/tests/documentation_test.rs b/crates/shirabe/tests/documentation_test.rs
index ad945aa3..33e5ec3f 100644
--- a/crates/shirabe/tests/documentation_test.rs
+++ b/crates/shirabe/tests/documentation_test.rs
@@ -2,7 +2,7 @@
 
 use shirabe::console::application::ApplicationHandle;
 use shirabe_symfony_console::command::Command;
-use shirabe_symfony_console::descriptor::application_description::ApplicationDescription;
+use shirabe_symfony_console::descriptor::ApplicationDescription;
 
 fn get_command_name(command: &std::rc::Rc<std::cell::RefCell<dyn Command>>) -> String {
     let mut name = command.borrow().get_name().unwrap_or_default();
diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs
index 295d9250..b6d19b10 100644
--- a/crates/shirabe/tests/installer_test.rs
+++ b/crates/shirabe/tests/installer_test.rs
@@ -46,14 +46,14 @@ use shirabe_pcre::preg::Preg;
 use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, PhpMixed, php_regex};
 use shirabe_semver::VersionParser;
 use shirabe_semver::constraint::AnyConstraint;
-use shirabe_symfony_console::command::command::Command as SymfonyCommand;
-use shirabe_symfony_console::command::command::CommandData;
-use shirabe_symfony_console::input::input_argument::InputArgument;
-use shirabe_symfony_console::input::input_interface::InputInterface;
-use shirabe_symfony_console::input::input_option::InputOption;
-use shirabe_symfony_console::input::string_input::StringInput;
-use shirabe_symfony_console::output::output_interface::{OutputInterface, VERBOSITY_NORMAL};
-use shirabe_symfony_console::output::stream_output::StreamOutput;
+use shirabe_symfony_console::command::Command as SymfonyCommand;
+use shirabe_symfony_console::command::CommandData;
+use shirabe_symfony_console::input::InputArgument;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::InputOption;
+use shirabe_symfony_console::input::StringInput;
+use shirabe_symfony_console::output::StreamOutput;
+use shirabe_symfony_console::output::{OutputInterface, VERBOSITY_NORMAL};
 
 // removeDirectory of tempComposerHome (a path produced by the unported install pipeline) is not
 // ported; the cwd management (setUp's chdir(__DIR__) / tearDown's chdir($this->prevCwd)) and the
diff --git a/crates/shirabe/tests/io/buffer_io_test.rs b/crates/shirabe/tests/io/buffer_io_test.rs
index 5036a172..89c323c0 100644
--- a/crates/shirabe/tests/io/buffer_io_test.rs
+++ b/crates/shirabe/tests/io/buffer_io_test.rs
@@ -3,7 +3,7 @@
 use shirabe::io::IOInterfaceImmutable;
 use shirabe::io::buffer_io::BufferIO;
 use shirabe_php_shim::PhpMixed;
-use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL;
+use shirabe_symfony_console::output::VERBOSITY_NORMAL;
 
 #[test]
 fn test_set_user_inputs() {
diff --git a/crates/shirabe/tests/io/console_io_test.rs b/crates/shirabe/tests/io/console_io_test.rs
index c3240ea5..3c142cfe 100644
--- a/crates/shirabe/tests/io/console_io_test.rs
+++ b/crates/shirabe/tests/io/console_io_test.rs
@@ -18,13 +18,13 @@ use shirabe::io::IOInterfaceMutable;
 use shirabe::io::io_interface::NORMAL;
 use shirabe_php_shim::PhpMixed;
 use shirabe_symfony_console::helper::QuestionHelper;
-use shirabe_symfony_console::input::array_input::ArrayInput;
-use shirabe_symfony_console::input::input_interface::InputInterface;
-use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface;
-use shirabe_symfony_console::output::buffered_output::BufferedOutput;
-use shirabe_symfony_console::output::console_output::ConsoleOutput;
-use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface;
-use shirabe_symfony_console::output::output_interface::OutputInterface;
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::StreamableInputInterface;
+use shirabe_symfony_console::output::BufferedOutput;
+use shirabe_symfony_console::output::ConsoleOutput;
+use shirabe_symfony_console::output::ConsoleOutputInterface;
+use shirabe_symfony_console::output::OutputInterface;
 
 /// Builds a ConsoleIO backed by real, side-effect-free Input/Output/QuestionHelper. PHP uses
 /// PHPUnit mocks here, but for tests that exercise only the authentication map they carry no
diff --git a/crates/shirabe/tests/plugin/plugin_installer_test.rs b/crates/shirabe/tests/plugin/plugin_installer_test.rs
index b713104e..0e1f01ee 100644
--- a/crates/shirabe/tests/plugin/plugin_installer_test.rs
+++ b/crates/shirabe/tests/plugin/plugin_installer_test.rs
@@ -35,7 +35,7 @@ use shirabe_php_rpc::PluginValue;
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::PhpMixed;
 use shirabe_semver::VersionParser;
-use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL;
+use shirabe_symfony_console::output::VERBOSITY_NORMAL;
 use shirabe_symfony_process::PhpExecutableFinder;
 use tempfile::TempDir;
 
diff --git a/crates/shirabe/tests/question/strict_confirmation_question_test.rs b/crates/shirabe/tests/question/strict_confirmation_question_test.rs
index 3e1ae72e..0c163c84 100644
--- a/crates/shirabe/tests/question/strict_confirmation_question_test.rs
+++ b/crates/shirabe/tests/question/strict_confirmation_question_test.rs
@@ -2,11 +2,11 @@
 
 use shirabe::question::StrictConfirmationQuestion;
 use shirabe_php_shim::PhpMixed;
-use shirabe_symfony_console::helper::question_helper::{QuestionHelper, QuestionHelperInterface};
-use shirabe_symfony_console::input::array_input::ArrayInput;
-use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface;
-use shirabe_symfony_console::output::output_interface::OutputInterface;
-use shirabe_symfony_console::output::stream_output::StreamOutput;
+use shirabe_symfony_console::helper::{QuestionHelper, QuestionHelperInterface};
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::StreamableInputInterface;
+use shirabe_symfony_console::output::OutputInterface;
+use shirabe_symfony_console::output::StreamOutput;
 
 const TRUE_ANSWER_REGEX: &str = "/^y(?:es)?$/i";
 const FALSE_ANSWER_REGEX: &str = "/^no?$/i";
diff --git a/crates/shirabe/tests/util/http_downloader_test.rs b/crates/shirabe/tests/util/http_downloader_test.rs
index fcbfd925..2c6ca10b 100644
--- a/crates/shirabe/tests/util/http_downloader_test.rs
+++ b/crates/shirabe/tests/util/http_downloader_test.rs
@@ -12,7 +12,7 @@ use shirabe::util::Platform;
 use shirabe::util::http_downloader::HttpDownloader;
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{PHP_EOL, PhpMixed};
-use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL;
+use shirabe_symfony_console::output::VERBOSITY_NORMAL;
 
 // PHP performs a live HTTP get to assert the URL's user:pass is captured via
 // setAuthentication. The credential capture happens in `add_job`, before any
diff --git a/crates/shirabe/tests/util/process_executor_test.rs b/crates/shirabe/tests/util/process_executor_test.rs
index b772c1bc..e1d8456b 100644
--- a/crates/shirabe/tests/util/process_executor_test.rs
+++ b/crates/shirabe/tests/util/process_executor_test.rs
@@ -10,12 +10,10 @@ use shirabe::io::buffer_io::BufferIO;
 use shirabe::util::process_executor::ProcessExecutor;
 use shirabe_php_shim::{PHP_EOL, ob_get_clean, ob_start, trim};
 use shirabe_symfony_console::helper::QuestionHelper;
-use shirabe_symfony_console::input::array_input::ArrayInput;
-use shirabe_symfony_console::input::input_interface::InputInterface;
-use shirabe_symfony_console::output::buffered_output::BufferedOutput;
-use shirabe_symfony_console::output::output_interface::{
-    OutputInterface, VERBOSITY_DEBUG, VERBOSITY_NORMAL,
-};
+use shirabe_symfony_console::input::ArrayInput;
+use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::output::BufferedOutput;
+use shirabe_symfony_console::output::{OutputInterface, VERBOSITY_DEBUG, VERBOSITY_NORMAL};
 
 #[test]
 fn test_execute_captures_output() {