diff --git a/mithril-aggregator/src/dependency_injection/builder.rs b/mithril-aggregator/src/dependency_injection/builder.rs
index bb08ae76b9..ae1b29bac8 100644
--- a/mithril-aggregator/src/dependency_injection/builder.rs
+++ b/mithril-aggregator/src/dependency_injection/builder.rs
@@ -64,6 +64,7 @@ use crate::{
     },
     entities::AggregatorEpochSettings,
     event_store::{EventMessage, EventStore, TransmitterService},
+    file_uploaders::GcpFileUploader,
     http_server::routes::router::{self, RouterConfig, RouterState},
     services::{
         AggregatorSignableSeedBuilder, AggregatorUpkeepService, BufferedCertifierService,
@@ -74,7 +75,7 @@ use crate::{
         UpkeepService, UsageReporter,
     },
     store::CertificatePendingStorer,
-    tools::{CExplorerSignerRetriever, GcpFileUploader, GenesisToolsDependency, SignersImporter},
+    tools::{CExplorerSignerRetriever, GenesisToolsDependency, SignersImporter},
     AggregatorConfig, AggregatorRunner, AggregatorRuntime, CompressedArchiveSnapshotter,
     Configuration, DependencyContainer, DumbFileUploader, DumbSnapshotter, EpochSettingsStorer,
     FileUploader, LocalFileUploader, MetricsService, MithrilSignerRegisterer, MultiSigner,
diff --git a/mithril-aggregator/src/tools/gcp_file_uploader.rs b/mithril-aggregator/src/file_uploaders/gcp_file_uploader.rs
similarity index 100%
rename from mithril-aggregator/src/tools/gcp_file_uploader.rs
rename to mithril-aggregator/src/file_uploaders/gcp_file_uploader.rs
diff --git a/mithril-aggregator/src/file_uploaders/mod.rs b/mithril-aggregator/src/file_uploaders/mod.rs
index 764bcac2ff..4f8279843f 100644
--- a/mithril-aggregator/src/file_uploaders/mod.rs
+++ b/mithril-aggregator/src/file_uploaders/mod.rs
@@ -1,11 +1,13 @@
 mod dumb_file_uploader;
 mod file_uploader;
+mod gcp_file_uploader;
 mod local_file_uploader;
 mod remote_file_uploader;
 
 pub use dumb_file_uploader::*;
 pub use file_uploader::FileLocation;
 pub use file_uploader::FileUploader;
+pub use gcp_file_uploader::GcpFileUploader;
 pub use local_file_uploader::LocalFileUploader;
 pub use remote_file_uploader::RemoteSnapshotUploader;
 
diff --git a/mithril-aggregator/src/tools/mod.rs b/mithril-aggregator/src/tools/mod.rs
index e099821a6a..bb13972d66 100644
--- a/mithril-aggregator/src/tools/mod.rs
+++ b/mithril-aggregator/src/tools/mod.rs
@@ -1,7 +1,6 @@
 mod certificates_hash_migrator;
 mod digest_helpers;
 mod era;
-mod gcp_file_uploader;
 mod genesis;
 #[cfg(test)]
 pub mod mocks;
@@ -11,7 +10,6 @@ mod single_signature_authenticator;
 pub use certificates_hash_migrator::CertificatesHashMigrator;
 pub use digest_helpers::extract_digest_from_path;
 pub use era::EraTools;
-pub use gcp_file_uploader::GcpFileUploader;
 pub use genesis::{GenesisTools, GenesisToolsDependency};
 pub use signer_importer::{
     CExplorerSignerRetriever, SignersImporter, SignersImporterPersister, SignersImporterRetriever,