diff --git a/src/benchmark/mod.rs b/src/benchmark/mod.rs
index 2d532ea..c5396a2 100644
--- a/src/benchmark/mod.rs
+++ b/src/benchmark/mod.rs
@@ -8,16 +8,16 @@ use statistical::{mean, median, standard_deviation};
 
 use crate::benchmark::result::BenchmarkResult;
 use crate::command::Command;
-use crate::format::{format_duration, format_duration_unit};
 use crate::min_max::{max, min};
 use crate::options::{CmdFailureAction, Options, OutputStyleOption, Shell};
 use crate::outlier_detection::{modified_zscores, OUTLIER_THRESHOLD};
-use crate::progress_bar::get_progress_bar;
+use crate::output::format::{format_duration, format_duration_unit};
+use crate::output::progress_bar::get_progress_bar;
+use crate::output::warnings::Warnings;
 use crate::shell::execute_and_time;
 use crate::timer::wallclocktimer::WallClockTimer;
 use crate::timer::{TimerStart, TimerStop};
 use crate::units::Second;
-use crate::warnings::Warnings;
 
 use anyhow::{bail, Result};
 
diff --git a/src/export/asciidoc.rs b/src/export/asciidoc.rs
index 898c1b1..c9a77f6 100644
--- a/src/export/asciidoc.rs
+++ b/src/export/asciidoc.rs
@@ -1,5 +1,5 @@
 use crate::benchmark::result::BenchmarkResult;
-use crate::format::format_duration_value;
+use crate::output::format::format_duration_value;
 use crate::relative_speed::{self, BenchmarkResultWithRelativeSpeed};
 use crate::units::Unit;
 
diff --git a/src/export/markdown.rs b/src/export/markdown.rs
index d8f33b5..5b3808b 100644
--- a/src/export/markdown.rs
+++ b/src/export/markdown.rs
@@ -1,6 +1,6 @@
 use super::Exporter;
 use crate::benchmark::result::BenchmarkResult;
-use crate::format::format_duration_value;
+use crate::output::format::format_duration_value;
 use crate::relative_speed::{self, BenchmarkResultWithRelativeSpeed};
 use crate::units::Unit;
 
diff --git a/src/main.rs b/src/main.rs
index 0c96243..1bfb94d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,19 +7,17 @@ pub mod benchmark;
 pub mod command;
 pub mod error;
 pub mod export;
-pub mod format;
 pub mod min_max;
 pub mod options;
 pub mod outlier_detection;
+pub mod output;
 pub mod parameter_range;
-pub mod progress_bar;
 pub mod relative_speed;
 pub mod shell;
 pub mod timer;
 pub mod tokenize;
 pub mod types;
 pub mod units;
-pub mod warnings;
 
 use app::get_arg_matches;
 use benchmark::result::BenchmarkResult;
diff --git a/src/format.rs b/src/output/format.rs
similarity index 100%
rename from src/format.rs
rename to src/output/format.rs
diff --git a/src/output/mod.rs b/src/output/mod.rs
new file mode 100644
index 0000000..d80ffee
--- /dev/null
+++ b/src/output/mod.rs
@@ -0,0 +1,3 @@
+pub mod format;
+pub mod progress_bar;
+pub mod warnings;
diff --git a/src/progress_bar.rs b/src/output/progress_bar.rs
similarity index 100%
rename from src/progress_bar.rs
rename to src/output/progress_bar.rs
diff --git a/src/warnings.rs b/src/output/warnings.rs
similarity index 97%
rename from src/warnings.rs
rename to src/output/warnings.rs
index 88322ad..4218a88 100644
--- a/src/warnings.rs
+++ b/src/output/warnings.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
 use crate::benchmark::MIN_EXECUTION_TIME;
-use crate::format::format_duration;
+use crate::output::format::format_duration;
 use crate::units::Second;
 
 /// A list of all possible warnings