diff --git a/hipcheck/src/analysis.rs b/hipcheck/src/analysis/mod.rs
similarity index 100%
rename from hipcheck/src/analysis.rs
rename to hipcheck/src/analysis/mod.rs
diff --git a/hipcheck/src/cache.rs b/hipcheck/src/cache/mod.rs
similarity index 100%
rename from hipcheck/src/cache.rs
rename to hipcheck/src/cache/mod.rs
diff --git a/hipcheck/src/data.rs b/hipcheck/src/data/mod.rs
similarity index 100%
rename from hipcheck/src/data.rs
rename to hipcheck/src/data/mod.rs
diff --git a/hipcheck/src/metric.rs b/hipcheck/src/metric/mod.rs
similarity index 100%
rename from hipcheck/src/metric.rs
rename to hipcheck/src/metric/mod.rs
diff --git a/hipcheck/src/session.rs b/hipcheck/src/session/mod.rs
similarity index 100%
rename from hipcheck/src/session.rs
rename to hipcheck/src/session/mod.rs
diff --git a/hipcheck/src/shell.rs b/hipcheck/src/shell/mod.rs
similarity index 100%
rename from hipcheck/src/shell.rs
rename to hipcheck/src/shell/mod.rs
diff --git a/hipcheck/src/source.rs b/hipcheck/src/source/mod.rs
similarity index 100%
rename from hipcheck/src/source.rs
rename to hipcheck/src/source/mod.rs
diff --git a/hipcheck/src/target.rs b/hipcheck/src/target/mod.rs
similarity index 100%
rename from hipcheck/src/target.rs
rename to hipcheck/src/target/mod.rs