diff --git a/src/storage/file_id.rs b/src/storage/file/id.rs
similarity index 100%
rename from src/storage/file_id.rs
rename to src/storage/file/id.rs
diff --git a/src/storage/file/mod.rs b/src/storage/file/mod.rs
index 7a14bb5d..277f7869 100644
--- a/src/storage/file/mod.rs
+++ b/src/storage/file/mod.rs
@@ -4,8 +4,10 @@ use std::fmt;
 
 use regex::Regex;
 
+pub mod id;
+
 use module::Module;
-use storage::file_id::*;
+use storage::file::id::*;
 use super::parser::{FileHeaderParser, Parser, ParserError};
 
 #[derive(Debug)]
diff --git a/src/storage/mod.rs b/src/storage/mod.rs
index 29bdda3a..1b4d3896 100644
--- a/src/storage/mod.rs
+++ b/src/storage/mod.rs
@@ -8,7 +8,6 @@ use std::path::Path;
 use std::vec::{Vec, IntoIter};
 
 pub mod file;
-pub mod file_id;
 pub mod parser;
 pub mod backend;
 pub mod json;
@@ -19,7 +18,7 @@ use glob::Paths;
 use module::Module;
 use runtime::Runtime;
 use storage::file::File;
-use storage::file_id::*;
+use storage::file::id::*;
 use storage::parser::{FileHeaderParser, Parser};
 
 pub type BackendOperationResult<T = ()> = Result<T, StorageError>;