refactor: re-export module items to shorten import paths

33 files changed, 262 insertions, 240 deletions

diff --git a/crates/shirabe/src/dependency_resolver/decisions.rs b/crates/shirabe/src/dependency_resolver/decisions.rs
index f3f8f5a..1fdc1d3 100644
--- a/crates/shirabe/src/dependency_resolver/decisions.rs
+++ b/crates/shirabe/src/dependency_resolver/decisions.rs
@@ -1,8 +1,8 @@
 //! ref: composer/src/Composer/DependencyResolver/Decisions.php
 
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::rule::Rule;
-use crate::dependency_resolver::solver_bug_exception::SolverBugException;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Rule;
+use crate::dependency_resolver::SolverBugException;
 use indexmap::IndexMap;
 use shirabe_php_shim::LogicException;
 use std::fmt;
diff --git a/crates/shirabe/src/dependency_resolver/default_policy.rs b/crates/shirabe/src/dependency_resolver/default_policy.rs
index 5d37855..c24e382 100644
--- a/crates/shirabe/src/dependency_resolver/default_policy.rs
+++ b/crates/shirabe/src/dependency_resolver/default_policy.rs
@@ -5,14 +5,14 @@ use std::cell::RefCell;
 
 use indexmap::IndexMap;
 use shirabe_semver::compiling_matcher::CompilingMatcher;
-use shirabe_semver::constraint::constraint::Constraint;
+use shirabe_semver::constraint::Constraint;
 
-use crate::dependency_resolver::policy_interface::PolicyInterface;
-use crate::dependency_resolver::pool::Pool;
-use crate::package::alias_package::AliasPackage;
-use crate::package::base_package::{BasePackage, STABILITIES};
-use crate::package::package_interface::PackageInterface;
-use crate::util::platform::Platform;
+use crate::dependency_resolver::PolicyInterface;
+use crate::dependency_resolver::Pool;
+use crate::package::AliasPackage;
+use crate::package::PackageInterface;
+use crate::package::{BasePackage, STABILITIES};
+use crate::util::Platform;
 
 #[derive(Debug)]
 pub struct DefaultPolicy {
diff --git a/crates/shirabe/src/dependency_resolver/generic_rule.rs b/crates/shirabe/src/dependency_resolver/generic_rule.rs
index c0381ef..11cff06 100644
--- a/crates/shirabe/src/dependency_resolver/generic_rule.rs
+++ b/crates/shirabe/src/dependency_resolver/generic_rule.rs
@@ -1,6 +1,6 @@
 //! ref: composer/src/Composer/DependencyResolver/GenericRule.php
 
-use crate::dependency_resolver::rule::{Rule, RuleBase};
+use crate::dependency_resolver::{Rule, RuleBase};
 use anyhow::Result;
 use shirabe_php_shim::{PHP_VERSION_ID, PhpMixed, RuntimeException, hash_raw, implode, unpack};
 
diff --git a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs
index 4dd27b1..b4aa4a4 100644
--- a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs
+++ b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs
@@ -1,8 +1,8 @@
 //! ref: composer/src/Composer/DependencyResolver/LocalRepoTransaction.php
 
-use super::transaction::Transaction;
-use crate::repository::installed_repository_interface::InstalledRepositoryInterface;
-use crate::repository::repository_interface::RepositoryInterface;
+use super::Transaction;
+use crate::repository::InstalledRepositoryInterface;
+use crate::repository::RepositoryInterface;
 
 #[derive(Debug)]
 pub struct LocalRepoTransaction {
@@ -25,8 +25,7 @@ impl LocalRepoTransaction {
 
     pub fn get_operations(
         &self,
-    ) -> Vec<Box<dyn crate::dependency_resolver::operation::operation_interface::OperationInterface>>
-    {
+    ) -> Vec<Box<dyn crate::dependency_resolver::operation::OperationInterface>> {
         // TODO(phase-b): delegate to inner transaction once operations are typed.
         Vec::new()
     }
diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
index ef49bd8..14900d1 100644
--- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs
+++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
@@ -3,14 +3,14 @@
 use std::any::Any;
 
 use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
+use shirabe_external_packages::composer::pcre::Preg;
 
-use crate::dependency_resolver::decisions::Decisions;
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::transaction::Transaction;
-use crate::package::alias_package::AliasPackage;
-use crate::package::package::Package;
-use crate::package::package_interface::PackageInterface;
+use crate::dependency_resolver::Decisions;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Transaction;
+use crate::package::AliasPackage;
+use crate::package::Package;
+use crate::package::PackageInterface;
 
 #[derive(Debug)]
 pub struct LockTransaction {
@@ -226,8 +226,7 @@ impl LockTransaction {
 
     pub fn get_operations(
         &self,
-    ) -> &Vec<Box<dyn crate::dependency_resolver::operation::operation_interface::OperationInterface>>
-    {
+    ) -> &Vec<Box<dyn crate::dependency_resolver::operation::OperationInterface>> {
         self.inner.get_operations()
     }
 }
diff --git a/crates/shirabe/src/dependency_resolver/mod.rs b/crates/shirabe/src/dependency_resolver/mod.rs
index 9154084..bcde18b 100644
--- a/crates/shirabe/src/dependency_resolver/mod.rs
+++ b/crates/shirabe/src/dependency_resolver/mod.rs
@@ -24,3 +24,30 @@ pub mod solver;
 pub mod solver_bug_exception;
 pub mod solver_problems_exception;
 pub mod transaction;
+
+pub use decisions::*;
+pub use default_policy::*;
+pub use generic_rule::*;
+pub use local_repo_transaction::*;
+pub use lock_transaction::*;
+pub use multi_conflict_rule::*;
+pub use operation::*;
+pub use policy_interface::*;
+pub use pool::*;
+pub use pool_builder::*;
+pub use pool_optimizer::*;
+pub use problem::*;
+pub use request::*;
+pub use rule::*;
+pub use rule_set::*;
+pub use rule_set_generator::*;
+pub use rule_set_iterator::*;
+pub use rule_watch_chain::*;
+pub use rule_watch_graph::*;
+pub use rule_watch_node::*;
+pub use rule2_literals::*;
+pub use security_advisory_pool_filter::*;
+pub use solver::*;
+pub use solver_bug_exception::*;
+pub use solver_problems_exception::*;
+pub use transaction::*;
diff --git a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs
index e2b781c..6447be0 100644
--- a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs
+++ b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs
@@ -2,9 +2,9 @@
 
 use shirabe_php_shim::PhpMixed;
 
-use crate::dependency_resolver::generic_rule::RuleLiterals;
-use crate::dependency_resolver::request::Request;
-use crate::dependency_resolver::rule::{ReasonData, Rule, RuleBase};
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::RuleLiterals;
+use crate::dependency_resolver::{ReasonData, Rule, RuleBase};
 use anyhow::Result;
 use shirabe_php_shim::{PHP_VERSION_ID, RuntimeException, hash_raw};
 
diff --git a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs
index 53b5f99..ee5e84d 100644
--- a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs
@@ -1,8 +1,8 @@
 //! ref: composer/src/Composer/DependencyResolver/Operation/InstallOperation.php
 
-use crate::dependency_resolver::operation::operation_interface::OperationInterface;
-use crate::dependency_resolver::operation::solver_operation::SolverOperation;
-use crate::package::package_interface::PackageInterface;
+use crate::dependency_resolver::operation::OperationInterface;
+use crate::dependency_resolver::operation::SolverOperation;
+use crate::package::PackageInterface;
 
 #[derive(Debug)]
 pub struct InstallOperation {
diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs
index fa6f13d..e176b7f 100644
--- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs
@@ -1,9 +1,9 @@
 //! ref: composer/src/Composer/DependencyResolver/Operation/MarkAliasInstalledOperation.php
 
-use crate::dependency_resolver::operation::operation_interface::OperationInterface;
-use crate::dependency_resolver::operation::solver_operation::SolverOperation;
-use crate::package::alias_package::AliasPackage;
-use crate::package::package_interface::PackageInterface;
+use crate::dependency_resolver::operation::OperationInterface;
+use crate::dependency_resolver::operation::SolverOperation;
+use crate::package::AliasPackage;
+use crate::package::PackageInterface;
 
 #[derive(Debug)]
 pub struct MarkAliasInstalledOperation {
diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs
index b9d5d26..141bf4a 100644
--- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs
@@ -1,9 +1,9 @@
 //! ref: composer/src/Composer/DependencyResolver/Operation/MarkAliasUninstalledOperation.php
 
-use crate::dependency_resolver::operation::operation_interface::OperationInterface;
-use crate::dependency_resolver::operation::solver_operation::SolverOperation;
-use crate::package::alias_package::AliasPackage;
-use crate::package::package_interface::PackageInterface;
+use crate::dependency_resolver::operation::OperationInterface;
+use crate::dependency_resolver::operation::SolverOperation;
+use crate::package::AliasPackage;
+use crate::package::PackageInterface;
 
 #[derive(Debug)]
 pub struct MarkAliasUninstalledOperation {
diff --git a/crates/shirabe/src/dependency_resolver/operation/mod.rs b/crates/shirabe/src/dependency_resolver/operation/mod.rs
index ffb0ac7..720c5a0 100644
--- a/crates/shirabe/src/dependency_resolver/operation/mod.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/mod.rs
@@ -5,3 +5,11 @@ pub mod operation_interface;
 pub mod solver_operation;
 pub mod uninstall_operation;
 pub mod update_operation;
+
+pub use install_operation::*;
+pub use mark_alias_installed_operation::*;
+pub use mark_alias_uninstalled_operation::*;
+pub use operation_interface::*;
+pub use solver_operation::*;
+pub use uninstall_operation::*;
+pub use update_operation::*;
diff --git a/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs b/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs
index 5eb955a..a5b5e5f 100644
--- a/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs
@@ -1,8 +1,8 @@
 //! ref: composer/src/Composer/DependencyResolver/Operation/OperationInterface.php
 
-use crate::dependency_resolver::operation::install_operation::InstallOperation;
-use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation;
-use crate::dependency_resolver::operation::update_operation::UpdateOperation;
+use crate::dependency_resolver::operation::InstallOperation;
+use crate::dependency_resolver::operation::UninstallOperation;
+use crate::dependency_resolver::operation::UpdateOperation;
 
 pub trait OperationInterface: std::fmt::Debug {
     fn as_any(&self) -> &dyn std::any::Any;
@@ -31,7 +31,7 @@ pub trait OperationInterface: std::fmt::Debug {
 
     /// PHP duck-typed accessor. Only InstallOperation/UninstallOperation/MarkAlias*Operation
     /// expose this; UpdateOperation has getInitialPackage()/getTargetPackage() instead.
-    fn get_package(&self) -> &dyn crate::package::package_interface::PackageInterface {
+    fn get_package(&self) -> &dyn crate::package::PackageInterface {
         todo!("get_package is not available on this operation type")
     }
 }
diff --git a/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs b/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs
index 96e4667..2710ec5 100644
--- a/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs
@@ -1,6 +1,6 @@
 //! ref: composer/src/Composer/DependencyResolver/Operation/SolverOperation.php
 
-use crate::dependency_resolver::operation::operation_interface::OperationInterface;
+use crate::dependency_resolver::operation::OperationInterface;
 
 pub trait SolverOperation: OperationInterface {
     const TYPE: &'static str;
diff --git a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs
index be7f6f1..5e1f6bc 100644
--- a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs
@@ -1,8 +1,8 @@
 //! ref: composer/src/Composer/DependencyResolver/Operation/UninstallOperation.php
 
-use crate::dependency_resolver::operation::operation_interface::OperationInterface;
-use crate::dependency_resolver::operation::solver_operation::SolverOperation;
-use crate::package::package_interface::PackageInterface;
+use crate::dependency_resolver::operation::OperationInterface;
+use crate::dependency_resolver::operation::SolverOperation;
+use crate::package::PackageInterface;
 
 #[derive(Debug)]
 pub struct UninstallOperation {
diff --git a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs
index 9adb248..2ce103b 100644
--- a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs
+++ b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs
@@ -1,9 +1,9 @@
 //! ref: composer/src/Composer/DependencyResolver/Operation/UpdateOperation.php
 
-use crate::dependency_resolver::operation::operation_interface::OperationInterface;
-use crate::dependency_resolver::operation::solver_operation::SolverOperation;
-use crate::package::package_interface::PackageInterface;
-use crate::package::version::version_parser::VersionParser;
+use crate::dependency_resolver::operation::OperationInterface;
+use crate::dependency_resolver::operation::SolverOperation;
+use crate::package::PackageInterface;
+use crate::package::version::VersionParser;
 
 #[derive(Debug)]
 pub struct UpdateOperation {
diff --git a/crates/shirabe/src/dependency_resolver/policy_interface.rs b/crates/shirabe/src/dependency_resolver/policy_interface.rs
index 606386f..148e21f 100644
--- a/crates/shirabe/src/dependency_resolver/policy_interface.rs
+++ b/crates/shirabe/src/dependency_resolver/policy_interface.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/DependencyResolver/PolicyInterface.php
 
-use crate::dependency_resolver::pool::Pool;
-use crate::package::package_interface::PackageInterface;
+use crate::dependency_resolver::Pool;
+use crate::package::PackageInterface;
 
 pub trait PolicyInterface: std::fmt::Debug {
     fn version_compare(
diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs
index 9b52ba7..e43eb53 100644
--- a/crates/shirabe/src/dependency_resolver/pool.rs
+++ b/crates/shirabe/src/dependency_resolver/pool.rs
@@ -5,12 +5,12 @@ use std::fmt;
 use indexmap::IndexMap;
 use shirabe_php_shim::{Countable, STR_PAD_LEFT, abs, spl_object_hash, str_pad};
 use shirabe_semver::compiling_matcher::CompilingMatcher;
-use shirabe_semver::constraint::constraint::Constraint;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
+use shirabe_semver::constraint::Constraint;
+use shirabe_semver::constraint::ConstraintInterface;
 
-use crate::advisory::partial_security_advisory::PartialSecurityAdvisory;
-use crate::package::base_package::BasePackage;
-use crate::package::version::version_parser::VersionParser;
+use crate::advisory::PartialSecurityAdvisory;
+use crate::package::BasePackage;
+use crate::package::version::VersionParser;
 
 /// A package pool contains all packages for dependency resolution
 #[derive(Debug)]
diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs
index a790dfc..fcc0339 100644
--- a/crates/shirabe/src/dependency_resolver/pool_builder.rs
+++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs
@@ -3,37 +3,37 @@
 use crate::io::io_interface;
 use indexmap::IndexMap;
 
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::composer::semver::compiling_matcher::CompilingMatcher;
-use shirabe_external_packages::composer::semver::intervals::Intervals;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::composer::semver::CompilingMatcher;
+use shirabe_external_packages::composer::semver::Intervals;
 use shirabe_php_shim::{
     LogicException, PhpMixed, array_chunk, array_flip, array_flip_strings, array_map, array_merge,
     array_search, array_search_mixed, count, in_array, microtime, number_format, round,
     spl_object_hash, sprintf, strpos,
 };
-use shirabe_semver::constraint::constraint::Constraint;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
-use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint;
-use shirabe_semver::constraint::multi_constraint::MultiConstraint;
+use shirabe_semver::constraint::Constraint;
+use shirabe_semver::constraint::ConstraintInterface;
+use shirabe_semver::constraint::MatchAllConstraint;
+use shirabe_semver::constraint::MultiConstraint;
 
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::pool_optimizer::PoolOptimizer;
-use crate::dependency_resolver::request::Request;
-use crate::dependency_resolver::security_advisory_pool_filter::SecurityAdvisoryPoolFilter;
-use crate::event_dispatcher::event_dispatcher::EventDispatcher;
-use crate::io::io_interface::IOInterface;
-use crate::package::alias_package::AliasPackage;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::PoolOptimizer;
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::SecurityAdvisoryPoolFilter;
+use crate::event_dispatcher::EventDispatcher;
+use crate::io::IOInterface;
+use crate::package::AliasPackage;
+use crate::package::CompleteAliasPackage;
+use crate::package::CompletePackage;
+use crate::package::PackageInterface;
 use crate::package::base_package::{self, BasePackage};
-use crate::package::complete_alias_package::CompleteAliasPackage;
-use crate::package::complete_package::CompletePackage;
-use crate::package::package_interface::PackageInterface;
-use crate::package::version::stability_filter::StabilityFilter;
-use crate::plugin::plugin_events::PluginEvents;
-use crate::plugin::pre_pool_create_event::PrePoolCreateEvent;
-use crate::repository::canonical_packages_trait::CanonicalPackagesTrait;
-use crate::repository::platform_repository::PlatformRepository;
-use crate::repository::repository_interface::RepositoryInterface;
-use crate::repository::root_package_repository::RootPackageRepository;
+use crate::package::version::StabilityFilter;
+use crate::plugin::PluginEvents;
+use crate::plugin::PrePoolCreateEvent;
+use crate::repository::CanonicalPackagesTrait;
+use crate::repository::PlatformRepository;
+use crate::repository::RepositoryInterface;
+use crate::repository::RootPackageRepository;
 
 #[derive(Debug)]
 pub struct PoolBuilder {
@@ -560,7 +560,7 @@ impl PoolBuilder {
                     }
                 }
                 let packages_in_result = result.packages;
-                for package in &packages_in_result {
+                for (_, package) in &packages_in_result {
                     // TODO(phase-b): proper upcast Box<dyn BasePackage> → Box<dyn PackageInterface>;
                     // clone_box on BasePackage produces a BasePackage, while loaded_per_repo stores PackageInterface.
                     let pkg_name = package.get_name().to_string();
diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs
index 3869078..326587a 100644
--- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs
+++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs
@@ -6,18 +6,18 @@ use anyhow::Result;
 use indexmap::IndexMap;
 use shirabe_php_shim::{LogicException, PhpMixed, implode, ksort, spl_object_hash};
 use shirabe_semver::compiling_matcher::CompilingMatcher;
-use shirabe_semver::constraint::constraint::Constraint;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
-use shirabe_semver::constraint::multi_constraint::MultiConstraint;
+use shirabe_semver::constraint::Constraint;
+use shirabe_semver::constraint::ConstraintInterface;
+use shirabe_semver::constraint::MultiConstraint;
 use shirabe_semver::intervals::Intervals;
 
-use crate::dependency_resolver::policy_interface::PolicyInterface;
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::request::Request;
-use crate::package::alias_package::AliasPackage;
-use crate::package::base_package::BasePackage;
-use crate::package::package_interface::PackageInterface;
-use crate::package::version::version_parser::VersionParser;
+use crate::dependency_resolver::PolicyInterface;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Request;
+use crate::package::AliasPackage;
+use crate::package::BasePackage;
+use crate::package::PackageInterface;
+use crate::package::version::VersionParser;
 
 /// Optimizes a given pool
 #[derive(Debug)]
@@ -379,7 +379,7 @@ impl PoolOptimizer {
     fn calculate_dependency_hash(&self, package: &dyn BasePackage) -> String {
         let mut hash = String::new();
 
-        let hash_relevant_links: Vec<(&str, Vec<crate::package::link::Link>)> = vec![
+        let hash_relevant_links: Vec<(&str, Vec<crate::package::Link>)> = vec![
             (
                 "requires",
                 package.get_requires().values().cloned().collect(),
diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs
index c73dd3e..4bc5fe8 100644
--- a/crates/shirabe/src/dependency_resolver/problem.rs
+++ b/crates/shirabe/src/dependency_resolver/problem.rs
@@ -2,31 +2,31 @@
 
 use indexmap::IndexMap;
 
-use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg};
-use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter;
+use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
+use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
 use shirabe_php_shim::{
     LogicException, PhpMixed, defined, extension_loaded, implode, in_array, php_to_string,
     phpversion, spl_object_hash, sprintf, str_replace, str_starts_with, stripos, strpos,
     strtolower, substr, substr_count, version_compare,
 };
-use shirabe_semver::constraint::constraint::Constraint;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
-use shirabe_semver::constraint::multi_constraint::MultiConstraint;
+use shirabe_semver::constraint::Constraint;
+use shirabe_semver::constraint::ConstraintInterface;
+use shirabe_semver::constraint::MultiConstraint;
 
-use crate::advisory::security_advisory::SecurityAdvisory;
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::request::Request;
+use crate::advisory::SecurityAdvisory;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Request;
 use crate::dependency_resolver::rule::{self, Rule};
-use crate::package::alias_package::AliasPackage;
-use crate::package::base_package::BasePackage;
-use crate::package::complete_package_interface::CompletePackageInterface;
-use crate::package::link::Link;
-use crate::package::package_interface::PackageInterface;
-use crate::package::root_package_interface::RootPackageInterface;
-use crate::package::version::version_parser::VersionParser;
-use crate::repository::lock_array_repository::LockArrayRepository;
-use crate::repository::platform_repository::PlatformRepository;
-use crate::repository::repository_set::RepositorySet;
+use crate::package::AliasPackage;
+use crate::package::BasePackage;
+use crate::package::CompletePackageInterface;
+use crate::package::Link;
+use crate::package::PackageInterface;
+use crate::package::RootPackageInterface;
+use crate::package::version::VersionParser;
+use crate::repository::LockArrayRepository;
+use crate::repository::PlatformRepository;
+use crate::repository::RepositorySet;
 
 /// Represents a problem detected while solving dependencies
 #[derive(Debug)]
@@ -1211,9 +1211,7 @@ impl Problem {
         constraint: Option<&dyn ConstraintInterface>,
     ) -> (String, String) {
         let mut next_repo_packages: Vec<Box<dyn BasePackage>> = Vec::new();
-        let mut next_repo: Option<
-            Box<dyn crate::repository::repository_interface::RepositoryInterface>,
-        > = None;
+        let mut next_repo: Option<Box<dyn crate::repository::RepositoryInterface>> = None;
 
         for package in all_repos_packages {
             // TODO(phase-b): RepositoryInterface has no equals(); reference identity needed.
@@ -1401,16 +1399,16 @@ impl Problem {
         let providers = repository_set.get_providers(package_name);
         if providers.len() > 0 {
             let provider_count = providers.len() as i64;
-            let slice: Vec<crate::repository::repository_interface::ProviderInfo> =
-                if provider_count > max_providers + 1 {
-                    providers
-                        .values()
-                        .take(max_providers as usize)
-                        .cloned()
-                        .collect::<Vec<_>>()
-                } else {
-                    providers.values().cloned().collect::<Vec<_>>()
-                };
+            let slice: Vec<crate::repository::ProviderInfo> = if provider_count > max_providers + 1
+            {
+                providers
+                    .values()
+                    .take(max_providers as usize)
+                    .cloned()
+                    .collect::<Vec<_>>()
+            } else {
+                providers.values().cloned().collect::<Vec<_>>()
+            };
             let mut providers_str = implode(
                 "",
                 &slice
diff --git a/crates/shirabe/src/dependency_resolver/request.rs b/crates/shirabe/src/dependency_resolver/request.rs
index 7930d70..d181bd2 100644
--- a/crates/shirabe/src/dependency_resolver/request.rs
+++ b/crates/shirabe/src/dependency_resolver/request.rs
@@ -2,14 +2,14 @@
 
 use indexmap::IndexMap;
 use shirabe_php_shim::{LogicException, spl_object_hash, strtolower};
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
-use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint;
+use shirabe_semver::constraint::ConstraintInterface;
+use shirabe_semver::constraint::MatchAllConstraint;
 
-use crate::package::base_package::BasePackage;
-use crate::package::package_interface::PackageInterface;
-use crate::repository::canonical_packages_trait::CanonicalPackagesTrait;
-use crate::repository::lock_array_repository::LockArrayRepository;
-use crate::repository::repository_interface::RepositoryInterface;
+use crate::package::BasePackage;
+use crate::package::PackageInterface;
+use crate::repository::CanonicalPackagesTrait;
+use crate::repository::LockArrayRepository;
+use crate::repository::RepositoryInterface;
 
 /// Identifies a partial update for listed packages only, all dependencies will remain at locked versions
 pub const UPDATE_ONLY_LISTED: i64 = 0;
diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs
index 37bf30a..bf117ad 100644
--- a/crates/shirabe/src/dependency_resolver/rule.rs
+++ b/crates/shirabe/src/dependency_resolver/rule.rs
@@ -8,20 +8,20 @@ use shirabe_php_shim::{
     LogicException, PhpMixed, abs, array_filter, array_keys, array_shift, array_values, implode,
     is_object,
 };
-use shirabe_semver::constraint::constraint::Constraint;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
+use shirabe_semver::constraint::Constraint;
+use shirabe_semver::constraint::ConstraintInterface;
 
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::problem::Problem;
-use crate::dependency_resolver::request::Request;
-use crate::dependency_resolver::rule_set::RuleSet;
-use crate::package::alias_package::AliasPackage;
-use crate::package::base_package::BasePackage;
-use crate::package::link::Link;
-use crate::package::package_interface::PackageInterface;
-use crate::package::version::version_parser::VersionParser;
-use crate::repository::platform_repository::PlatformRepository;
-use crate::repository::repository_set::RepositorySet;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Problem;
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::RuleSet;
+use crate::package::AliasPackage;
+use crate::package::BasePackage;
+use crate::package::Link;
+use crate::package::PackageInterface;
+use crate::package::version::VersionParser;
+use crate::repository::PlatformRepository;
+use crate::repository::RepositorySet;
 
 /// PHP: @phpstan-type ReasonData = Link|BasePackage|string|int|array{...}|array{...}
 /// We model this as an enum.
@@ -89,9 +89,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug {
 
     /// PHP: `$rule instanceof MultiConflictRule`. Returns a borrow of the
     /// underlying `MultiConflictRule` when this rule is one, otherwise `None`.
-    fn as_multi_conflict(
-        &self,
-    ) -> Option<&crate::dependency_resolver::multi_conflict_rule::MultiConflictRule> {
+    fn as_multi_conflict(&self) -> Option<&crate::dependency_resolver::MultiConflictRule> {
         None
     }
 
diff --git a/crates/shirabe/src/dependency_resolver/rule2_literals.rs b/crates/shirabe/src/dependency_resolver/rule2_literals.rs
index 1c98200..3642f8a 100644
--- a/crates/shirabe/src/dependency_resolver/rule2_literals.rs
+++ b/crates/shirabe/src/dependency_resolver/rule2_literals.rs
@@ -2,9 +2,9 @@
 
 use shirabe_php_shim::PhpMixed;
 
-use crate::dependency_resolver::generic_rule::RuleLiterals;
-use crate::dependency_resolver::request::Request;
-use crate::dependency_resolver::rule::{ReasonData, Rule, RuleBase};
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::RuleLiterals;
+use crate::dependency_resolver::{ReasonData, Rule, RuleBase};
 
 #[derive(Debug)]
 pub struct Rule2Literals {
diff --git a/crates/shirabe/src/dependency_resolver/rule_set.rs b/crates/shirabe/src/dependency_resolver/rule_set.rs
index 0e3d1de..fa49bec 100644
--- a/crates/shirabe/src/dependency_resolver/rule_set.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_set.rs
@@ -3,11 +3,11 @@
 use indexmap::IndexMap;
 use shirabe_php_shim::OutOfBoundsException;
 
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::request::Request;
-use crate::dependency_resolver::rule::Rule;
-use crate::dependency_resolver::rule_set_iterator::RuleSetIterator;
-use crate::repository::repository_set::RepositorySet;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::Rule;
+use crate::dependency_resolver::RuleSetIterator;
+use crate::repository::RepositorySet;
 
 #[derive(Debug)]
 pub struct RuleSet {
diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
index 91533b3..57d1d18 100644
--- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
@@ -6,20 +6,20 @@ use std::collections::VecDeque;
 use indexmap::IndexMap;
 use shirabe_php_shim::PhpMixed;
 
-use crate::dependency_resolver::generic_rule::GenericRule;
-use crate::dependency_resolver::multi_conflict_rule::MultiConflictRule;
-use crate::dependency_resolver::policy_interface::PolicyInterface;
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::request::Request;
+use crate::dependency_resolver::GenericRule;
+use crate::dependency_resolver::MultiConflictRule;
+use crate::dependency_resolver::PolicyInterface;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::Rule2Literals;
+use crate::dependency_resolver::RuleSet;
 use crate::dependency_resolver::rule::{self, Rule};
-use crate::dependency_resolver::rule_set::RuleSet;
-use crate::dependency_resolver::rule2_literals::Rule2Literals;
-use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter;
-use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory;
-use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface;
-use crate::package::alias_package::AliasPackage;
-use crate::package::base_package::BasePackage;
-use crate::package::package_interface::PackageInterface;
+use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter;
+use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory;
+use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface;
+use crate::package::AliasPackage;
+use crate::package::BasePackage;
+use crate::package::PackageInterface;
 
 #[derive(Debug)]
 pub struct RuleSetGenerator {
diff --git a/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs b/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs
index 259b510..73c406f 100644
--- a/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs
@@ -1,6 +1,6 @@
 //! ref: composer/src/Composer/DependencyResolver/RuleSetIterator.php
 
-use crate::dependency_resolver::rule::Rule;
+use crate::dependency_resolver::Rule;
 use indexmap::IndexMap;
 
 /// Implements PHP \Iterator over a grouped rule set.
diff --git a/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs b/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs
index 3355b29..aa2d7f7 100644
--- a/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs
@@ -1,6 +1,6 @@
 //! ref: composer/src/Composer/DependencyResolver/RuleWatchChain.php
 
-use crate::dependency_resolver::rule_watch_node::RuleWatchNode;
+use crate::dependency_resolver::RuleWatchNode;
 
 /// An extension of SplDoublyLinkedList with seek and removal of current element.
 #[derive(Debug)]
diff --git a/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs b/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs
index a8176ee..639061d 100644
--- a/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs
@@ -4,11 +4,11 @@ use std::any::Any;
 
 use indexmap::IndexMap;
 
-use crate::dependency_resolver::decisions::Decisions;
-use crate::dependency_resolver::multi_conflict_rule::MultiConflictRule;
-use crate::dependency_resolver::rule::Rule;
-use crate::dependency_resolver::rule_watch_chain::RuleWatchChain;
-use crate::dependency_resolver::rule_watch_node::RuleWatchNode;
+use crate::dependency_resolver::Decisions;
+use crate::dependency_resolver::MultiConflictRule;
+use crate::dependency_resolver::Rule;
+use crate::dependency_resolver::RuleWatchChain;
+use crate::dependency_resolver::RuleWatchNode;
 
 #[derive(Debug)]
 pub struct RuleWatchGraph {
diff --git a/crates/shirabe/src/dependency_resolver/rule_watch_node.rs b/crates/shirabe/src/dependency_resolver/rule_watch_node.rs
index 6c1bada..a643d3e 100644
--- a/crates/shirabe/src/dependency_resolver/rule_watch_node.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_watch_node.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/DependencyResolver/RuleWatchNode.php
 
-use crate::dependency_resolver::decisions::Decisions;
-use crate::dependency_resolver::generic_rule::RuleLiterals;
+use crate::dependency_resolver::Decisions;
+use crate::dependency_resolver::RuleLiterals;
 
 pub struct RuleWatchNode {
     pub watch1: i64,
@@ -59,7 +59,7 @@ impl RuleWatchNode {
 
     /// Owned clone for callers that need a `Box<dyn Rule>`. Default impl in
     /// `RuleLiterals` returns `todo!()`; concrete rule impls override it.
-    pub fn get_rule_boxed(&self) -> Box<dyn crate::dependency_resolver::rule::Rule> {
+    pub fn get_rule_boxed(&self) -> Box<dyn crate::dependency_resolver::Rule> {
         self.rule.clone_rule_box()
     }
 
diff --git a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs
index 82c9dec..742a709 100644
--- a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs
+++ b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs
@@ -1,14 +1,14 @@
 //! ref: composer/src/Composer/DependencyResolver/SecurityAdvisoryPoolFilter.php
 
-use crate::advisory::audit_config::AuditConfig;
-use crate::advisory::auditor::Auditor;
-use crate::advisory::partial_security_advisory::PartialSecurityAdvisory;
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::request::Request;
-use crate::package::package_interface::PackageInterface;
-use crate::repository::repository_interface::RepositoryInterface;
+use crate::advisory::AuditConfig;
+use crate::advisory::Auditor;
+use crate::advisory::PartialSecurityAdvisory;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Request;
+use crate::package::PackageInterface;
+use crate::repository::RepositoryInterface;
 use indexmap::IndexMap;
-use shirabe_semver::constraint::constraint::Constraint;
+use shirabe_semver::constraint::Constraint;
 
 #[derive(Debug)]
 pub struct SecurityAdvisoryPoolFilter {
diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs
index 4421013..f9721f8 100644
--- a/crates/shirabe/src/dependency_resolver/solver.rs
+++ b/crates/shirabe/src/dependency_resolver/solver.rs
@@ -5,28 +5,28 @@ use indexmap::IndexMap;
 use shirabe_php_shim::{
     PhpMixed, array_pop, array_shift, array_unshift, microtime, spl_object_hash, sprintf,
 };
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
+use shirabe_semver::constraint::ConstraintInterface;
 
-use crate::dependency_resolver::decisions::Decisions;
-use crate::dependency_resolver::generic_rule::GenericRule;
-use crate::dependency_resolver::lock_transaction::LockTransaction;
-use crate::dependency_resolver::multi_conflict_rule::MultiConflictRule;
-use crate::dependency_resolver::policy_interface::PolicyInterface;
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::problem::Problem;
-use crate::dependency_resolver::request::Request;
+use crate::dependency_resolver::Decisions;
+use crate::dependency_resolver::GenericRule;
+use crate::dependency_resolver::LockTransaction;
+use crate::dependency_resolver::MultiConflictRule;
+use crate::dependency_resolver::PolicyInterface;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Problem;
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::RuleSet;
+use crate::dependency_resolver::RuleSetGenerator;
+use crate::dependency_resolver::RuleWatchGraph;
+use crate::dependency_resolver::RuleWatchNode;
+use crate::dependency_resolver::SolverBugException;
+use crate::dependency_resolver::SolverProblemsException;
 use crate::dependency_resolver::rule::{self, Rule};
-use crate::dependency_resolver::rule_set::RuleSet;
-use crate::dependency_resolver::rule_set_generator::RuleSetGenerator;
-use crate::dependency_resolver::rule_watch_graph::RuleWatchGraph;
-use crate::dependency_resolver::rule_watch_node::RuleWatchNode;
-use crate::dependency_resolver::solver_bug_exception::SolverBugException;
-use crate::dependency_resolver::solver_problems_exception::SolverProblemsException;
-use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter;
-use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory;
-use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface;
-use crate::io::io_interface::IOInterface;
-use crate::package::base_package::BasePackage;
+use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter;
+use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory;
+use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface;
+use crate::io::IOInterface;
+use crate::package::BasePackage;
 
 #[derive(Debug)]
 pub struct Solver {
@@ -251,7 +251,7 @@ impl Solver {
         self.setup_fixed_map(request);
 
         self.io
-            .write_error3("Generating rules", true, crate::io::io_interface::DEBUG);
+            .write_error3("Generating rules", true, crate::io::DEBUG);
         // TODO(phase-b): Pool is a PHP class without Clone; RuleSetGenerator should hold
         // a shared reference (Rc<RefCell<Pool>>). Using a placeholder pool until then.
         let mut rule_set_generator = RuleSetGenerator::new(
@@ -276,22 +276,18 @@ impl Solver {
         // make decisions based on root require/fix assertions
         self.make_assertion_rule_decisions()?;
 
-        self.io.write_error3(
-            "Resolving dependencies through SAT",
-            true,
-            crate::io::io_interface::DEBUG,
-        );
+        self.io
+            .write_error3("Resolving dependencies through SAT", true, crate::io::DEBUG);
         let before = microtime(true);
         self.run_sat()?;
-        self.io
-            .write_error3("", true, crate::io::io_interface::DEBUG);
+        self.io.write_error3("", true, crate::io::DEBUG);
         self.io.write_error3(
             &sprintf(
                 "Dependency resolution completed in %.3f seconds",
                 &[PhpMixed::Float(microtime(true) - before)],
             ),
             true,
-            crate::io::io_interface::VERBOSE,
+            crate::io::VERBOSE,
         );
 
         if self.problems.len() > 0 {
@@ -796,11 +792,8 @@ impl Solver {
             let mut rules_count = self.rules.count();
             let mut pass = 1_i64;
 
-            self.io.write_error3(
-                "Looking at all rules.",
-                true,
-                crate::io::io_interface::DEBUG,
-            );
+            self.io
+                .write_error3("Looking at all rules.", true, crate::io::DEBUG);
             let mut i = 0_i64;
             let mut n = 0_i64;
             while n < rules_count {
@@ -812,7 +805,7 @@ impl Solver {
                                 pass
                             ),
                             false,
-                            crate::io::io_interface::DEBUG,
+                            crate::io::DEBUG,
                         );
                     } else {
                         self.io.overwrite_error4(
@@ -822,7 +815,7 @@ impl Solver {
                             ),
                             false,
                             None,
-                            crate::io::io_interface::DEBUG,
+                            crate::io::DEBUG,
                         );
                     }
 
diff --git a/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs b/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs
index f05dd87..8c9e488 100644
--- a/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs
+++ b/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs
@@ -2,12 +2,12 @@
 
 use shirabe_php_shim::RuntimeException;
 
-use crate::dependency_resolver::pool::Pool;
-use crate::dependency_resolver::problem::Problem;
-use crate::dependency_resolver::request::Request;
-use crate::dependency_resolver::rule::Rule;
-use crate::repository::repository_set::RepositorySet;
-use crate::util::ini_helper::IniHelper;
+use crate::dependency_resolver::Pool;
+use crate::dependency_resolver::Problem;
+use crate::dependency_resolver::Request;
+use crate::dependency_resolver::Rule;
+use crate::repository::RepositorySet;
+use crate::util::IniHelper;
 
 #[derive(Debug)]
 pub struct SolverProblemsException {
@@ -70,7 +70,7 @@ impl SolverProblemsException {
                     .unwrap_or_default()
             ));
             // TODO(phase-b): get_reasons returns an IndexMap; flatten its values into Vec<Vec<...>>.
-            let reasons_vec: Vec<Vec<Box<dyn crate::dependency_resolver::rule::Rule>>> = problem
+            let reasons_vec: Vec<Vec<Box<dyn crate::dependency_resolver::Rule>>> = problem
                 .get_reasons()
                 .values()
                 .map(|v| v.iter().map(|r| r.clone_box()).collect())
diff --git a/crates/shirabe/src/dependency_resolver/transaction.rs b/crates/shirabe/src/dependency_resolver/transaction.rs
index 8c4595f..a704c67 100644
--- a/crates/shirabe/src/dependency_resolver/transaction.rs
+++ b/crates/shirabe/src/dependency_resolver/transaction.rs
@@ -8,16 +8,16 @@ use shirabe_php_shim::{
     strcmp, uasort,
 };
 
-use crate::dependency_resolver::operation::install_operation::InstallOperation;
-use crate::dependency_resolver::operation::mark_alias_installed_operation::MarkAliasInstalledOperation;
-use crate::dependency_resolver::operation::mark_alias_uninstalled_operation::MarkAliasUninstalledOperation;
-use crate::dependency_resolver::operation::operation_interface::OperationInterface;
-use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation;
-use crate::dependency_resolver::operation::update_operation::UpdateOperation;
-use crate::package::alias_package::AliasPackage;
-use crate::package::link::Link;
-use crate::package::package_interface::PackageInterface;
-use crate::repository::platform_repository::PlatformRepository;
+use crate::dependency_resolver::operation::InstallOperation;
+use crate::dependency_resolver::operation::MarkAliasInstalledOperation;
+use crate::dependency_resolver::operation::MarkAliasUninstalledOperation;
+use crate::dependency_resolver::operation::OperationInterface;
+use crate::dependency_resolver::operation::UninstallOperation;
+use crate::dependency_resolver::operation::UpdateOperation;
+use crate::package::AliasPackage;
+use crate::package::Link;
+use crate::package::PackageInterface;
+use crate::repository::PlatformRepository;
 
 /// @internal
 #[derive(Debug)]