diff --git a/src/bundledb/bundle.rs b/src/bundledb/bundle.rs
index 95203ef..663cfa1 100644
--- a/src/bundledb/bundle.rs
+++ b/src/bundledb/bundle.rs
@@ -1,3 +1,6 @@
+use ::prelude::*;
+use super::*;
+
 use std::path::{Path, PathBuf};
 use std::fs::{self, File};
 use std::io::{Read, Seek, SeekFrom, BufReader};
@@ -5,16 +8,7 @@ use std::cmp::max;
 use std::fmt::{self, Debug};
 use std::sync::{Arc, Mutex};
 
-use serde::{self, Serialize, Deserialize};
-use quick_error::ResultExt;
-
-use util::*;
-use super::*;
-
-
-static HEADER_STRING: [u8; 7] = *b"zvault\x01";
-static HEADER_VERSION: u8 = 1;
-
+use serde;
 
 
 #[derive(Hash, PartialEq, Eq, Clone, Default)]
diff --git a/src/bundledb/db.rs b/src/bundledb/db.rs
index a04a464..ae6b8f2 100644
--- a/src/bundledb/db.rs
+++ b/src/bundledb/db.rs
@@ -1,13 +1,11 @@
+use ::prelude::*;
+use super::*;
+
 use std::path::{Path, PathBuf};
 use std::collections::HashMap;
 use std::fs;
 use std::sync::{Arc, Mutex};
 
-use quick_error::ResultExt;
-
-use util::*;
-use super::*;
-
 
 pub struct BundleDb {
     path: PathBuf,
diff --git a/src/bundledb/error.rs b/src/bundledb/error.rs
index 8b0ab56..c2f7c51 100644
--- a/src/bundledb/error.rs
+++ b/src/bundledb/error.rs
@@ -1,9 +1,9 @@
+use ::prelude::*;
+use super::*;
+
 use std::path::{Path, PathBuf};
 use std::io;
 
-use util::*;
-use super::*;
-
 quick_error!{
     #[derive(Debug)]
     pub enum BundleError {
diff --git a/src/bundledb/mod.rs b/src/bundledb/mod.rs
index 9fa4c8e..7746c1d 100644
--- a/src/bundledb/mod.rs
+++ b/src/bundledb/mod.rs
@@ -8,6 +8,10 @@ pub use self::writer::BundleWriter;
 pub use self::bundle::*;
 pub use self::db::*;
 
+pub static HEADER_STRING: [u8; 7] = *b"zvault\x01";
+pub static HEADER_VERSION: u8 = 1;
+
+
 /*
 
 Bundle format
diff --git a/src/bundledb/writer.rs b/src/bundledb/writer.rs
index 139ff16..30a514b 100644
--- a/src/bundledb/writer.rs
+++ b/src/bundledb/writer.rs
@@ -1,17 +1,11 @@
+use ::prelude::*;
+use super::*;
+
 use std::path::Path;
 use std::fs::{self, File};
 use std::io::{Write, Seek, SeekFrom, BufWriter};
 use std::sync::{Arc, Mutex};
 
-use quick_error::ResultExt;
-
-use util::*;
-use super::*;
-
-
-static HEADER_STRING: [u8; 7] = *b"zvault\x01";
-static HEADER_VERSION: u8 = 1;
-
 
 pub struct BundleWriter {
     mode: BundleMode,
diff --git a/src/cli/algotest.rs b/src/cli/algotest.rs
index b342a36..1ea4139 100644
--- a/src/cli/algotest.rs
+++ b/src/cli/algotest.rs
@@ -1,12 +1,11 @@
+use ::prelude::*;
+
 use std::io::{self, Cursor, Read, Write};
 use std::fs::File;
 use std::collections::HashSet;
 
 use chrono::Duration;
 
-use ::chunker::*;
-use ::util::*;
-
 
 struct ChunkSink {
     chunks: Vec<(usize, usize)>,
diff --git a/src/cli/args.rs b/src/cli/args.rs
index bca43cc..e99232e 100644
--- a/src/cli/args.rs
+++ b/src/cli/args.rs
@@ -1,5 +1,4 @@
-use ::chunker::ChunkerType;
-use ::util::*;
+use ::prelude::*;
 
 use std::process::exit;
 
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 14a079a..44dc9ce 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -2,11 +2,11 @@ mod args;
 mod logger;
 mod algotest;
 
+use ::prelude::*;
+
 use chrono::prelude::*;
 use std::process::exit;
 
-use ::repository::{Repository, Config, Backup};
-use ::util::*;
 use self::args::Arguments;
 
 
diff --git a/src/main.rs b/src/main.rs
index 5e24c09..cd06da8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,13 +16,13 @@ extern crate sodiumoxide;
 extern crate ansi_term;
 extern crate libc;
 
-
 pub mod util;
 pub mod bundledb;
 pub mod index;
 mod chunker;
 mod repository;
 mod cli;
+mod prelude;
 
 // TODO: Seperate remote folder
 // TODO: - Copy/move backup files to remote folder
diff --git a/src/prelude.rs b/src/prelude.rs
new file mode 100644
index 0000000..259b1a7
--- /dev/null
+++ b/src/prelude.rs
@@ -0,0 +1,9 @@
+pub use ::util::*;
+pub use ::bundledb::{Bundle, BundleMode, BundleWriter, BundleInfo, BundleId, BundleError, BundleDb};
+pub use ::chunker::{ChunkerType, Chunker, ChunkerStatus, IChunker, ChunkerError};
+pub use ::repository::{Repository, Backup, Config, RepositoryError, RepositoryInfo, Inode, FileType, RepositoryIntegrityError};
+pub use ::index::{Index, Location, IndexError};
+
+pub use serde::{Serialize, Deserialize};
+
+pub use quick_error::ResultExt;
diff --git a/src/repository/backup.rs b/src/repository/backup.rs
index 35a8179..f59a875 100644
--- a/src/repository/backup.rs
+++ b/src/repository/backup.rs
@@ -1,14 +1,10 @@
-use super::{Repository, RepositoryError};
-use super::metadata::{FileType, Inode};
-
-use ::util::*;
+use ::prelude::*;
 
 use std::io::{self, BufReader, BufWriter, Read, Write};
 use std::fs::{self, File};
 use std::path::{self, Path, PathBuf};
 use std::collections::{HashMap, VecDeque};
 
-use quick_error::ResultExt;
 use chrono::prelude::*;
 
 
diff --git a/src/repository/basic_io.rs b/src/repository/basic_io.rs
index cf4a34c..6af220e 100644
--- a/src/repository/basic_io.rs
+++ b/src/repository/basic_io.rs
@@ -1,14 +1,8 @@
+use ::prelude::*;
+
 use std::mem;
 use std::io::{Read, Write, Cursor};
 
-use super::{Repository, RepositoryError};
-use ::index::Location;
-use ::bundledb::{BundleId, BundleMode};
-use super::integrity::RepositoryIntegrityError;
-
-use ::util::*;
-use ::chunker::{IChunker, ChunkerStatus};
-
 
 impl Repository {
     pub fn get_bundle_id(&self, id: u32) -> Result<BundleId, RepositoryError> {
diff --git a/src/repository/bundle_map.rs b/src/repository/bundle_map.rs
index 770207a..7fff73b 100644
--- a/src/repository/bundle_map.rs
+++ b/src/repository/bundle_map.rs
@@ -1,11 +1,10 @@
+use ::prelude::*;
+
 use std::collections::HashMap;
 use std::path::Path;
 use std::io::{self, BufReader, Read, Write, BufWriter};
 use std::fs::File;
 
-use ::bundledb::{Bundle, BundleId, BundleInfo};
-use ::util::*;
-
 
 static HEADER_STRING: [u8; 7] = *b"zbunmap";
 static HEADER_VERSION: u8 = 1;
diff --git a/src/repository/config.rs b/src/repository/config.rs
index 3874f8a..4ac8623 100644
--- a/src/repository/config.rs
+++ b/src/repository/config.rs
@@ -1,12 +1,11 @@
+use ::prelude::*;
+
 use serde_yaml;
 
 use std::fs::File;
 use std::path::Path;
 use std::io;
 
-use ::util::*;
-use ::chunker::ChunkerType;
-
 
 quick_error!{
     #[derive(Debug)]
diff --git a/src/repository/error.rs b/src/repository/error.rs
index 6c153ea..5656de2 100644
--- a/src/repository/error.rs
+++ b/src/repository/error.rs
@@ -1,14 +1,11 @@
+use ::prelude::*;
+
 use std::io;
 use std::path::PathBuf;
 
-use super::backup::{Backup, BackupError};
+use super::backup::BackupError;
 use super::bundle_map::BundleMapError;
 use super::config::ConfigError;
-use super::integrity::RepositoryIntegrityError;
-use ::index::IndexError;
-use ::bundledb::BundleError;
-use ::chunker::ChunkerError;
-use ::util::*;
 
 
 quick_error!{
diff --git a/src/repository/info.rs b/src/repository/info.rs
index c739cc7..d53ec3b 100644
--- a/src/repository/info.rs
+++ b/src/repository/info.rs
@@ -1,5 +1,5 @@
-use super::Repository;
-use ::bundledb::BundleInfo;
+use ::prelude::*;
+
 
 pub struct RepositoryInfo {
     pub bundle_count: usize,
diff --git a/src/repository/integrity.rs b/src/repository/integrity.rs
index a85811f..0d05a7b 100644
--- a/src/repository/integrity.rs
+++ b/src/repository/integrity.rs
@@ -1,8 +1,6 @@
-use super::{Repository, RepositoryError};
-use super::metadata::FileContents;
+use ::prelude::*;
 
-use ::bundledb::BundleId;
-use ::util::*;
+use super::metadata::FileContents;
 
 use std::collections::VecDeque;
 
diff --git a/src/repository/metadata.rs b/src/repository/metadata.rs
index 92342ff..971f850 100644
--- a/src/repository/metadata.rs
+++ b/src/repository/metadata.rs
@@ -1,3 +1,5 @@
+use ::prelude::*;
+
 use std::collections::HashMap;
 use std::path::Path;
 use std::fs::{self, Metadata, File, Permissions};
@@ -5,11 +7,6 @@ use std::os::linux::fs::MetadataExt;
 use std::os::unix::fs::{PermissionsExt, symlink};
 use std::io::{Read, Write};
 
-use ::util::*;
-use super::{Repository, RepositoryError};
-use super::integrity::RepositoryIntegrityError;
-use ::bundledb::BundleMode;
-
 
 #[derive(Debug, Eq, PartialEq)]
 pub enum FileType {
diff --git a/src/repository/mod.rs b/src/repository/mod.rs
index 2b46b33..17eeb0f 100644
--- a/src/repository/mod.rs
+++ b/src/repository/mod.rs
@@ -8,22 +8,20 @@ mod backup;
 mod error;
 mod vacuum;
 
+use ::prelude::*;
+
 use std::mem;
 use std::cmp::max;
 use std::path::{PathBuf, Path};
 use std::fs;
 use std::sync::{Arc, Mutex};
 
-use super::index::Index;
-use super::bundledb::{BundleDb, BundleWriter};
-use super::chunker::Chunker;
-use ::util::*;
-
 pub use self::error::RepositoryError;
 pub use self::config::Config;
 pub use self::metadata::{Inode, FileType};
 pub use self::backup::Backup;
 pub use self::integrity::RepositoryIntegrityError;
+pub use self::info::RepositoryInfo;
 use self::bundle_map::BundleMap;
 
 
diff --git a/src/repository/vacuum.rs b/src/repository/vacuum.rs
index 818486a..8aa39ac 100644
--- a/src/repository/vacuum.rs
+++ b/src/repository/vacuum.rs
@@ -1,11 +1,9 @@
-use super::{Repository, RepositoryError, RepositoryIntegrityError};
+use ::prelude::*;
+
 use super::metadata::FileContents;
 
 use std::collections::{HashMap, HashSet, VecDeque};
 
-use ::bundledb::BundleMode;
-use ::util::*;
-
 
 pub struct BundleUsage {
     pub used: Bitmap,