diff --git a/src/args/mod.rs b/src/args/mod.rs
index 6e10f4a..ea86848 100644
--- a/src/args/mod.rs
+++ b/src/args/mod.rs
@@ -1 +1 @@
-pub mod args;
+pub mod parse;
diff --git a/src/args/args.rs b/src/args/parse.rs
similarity index 100%
rename from src/args/args.rs
rename to src/args/parse.rs
diff --git a/src/config/config.rs b/src/config/cfg.rs
similarity index 95%
rename from src/config/config.rs
rename to src/config/cfg.rs
index 2145758..4d48866 100644
--- a/src/config/config.rs
+++ b/src/config/cfg.rs
@@ -5,7 +5,7 @@ use std::fmt;
 
 use toml::Table;
 
-use crate::dotfile::dotfile::{self, ManagedDotfile};
+use crate::dotfile::dot::{self, ManagedDotfile};
 
 
 
@@ -104,7 +104,7 @@ pub enum ConfigParseError {
     DotfilesParseError,
     DotfilesArrayParseError,
     DotfilesTableParseError,
-    DotfilesCreateError(dotfile::DotfileError),
+    DotfilesCreateError(dot::DotfileError),
 }
 
 impl Error for ConfigParseError {}
@@ -155,8 +155,8 @@ impl From<toml::de::Error> for ConfigParseError {
     }
 }
 
-impl From<dotfile::DotfileError> for ConfigParseError {
-    fn from(error: dotfile::DotfileError) -> ConfigParseError {
+impl From<dot::DotfileError> for ConfigParseError {
+    fn from(error: dot::DotfileError) -> ConfigParseError {
         ConfigParseError::DotfilesCreateError(error)
     }
 }
diff --git a/src/config/mod.rs b/src/config/mod.rs
index ef68c36..26cb104 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -1 +1 @@
-pub mod config;
+pub mod cfg;
diff --git a/src/dotfile/dotfile.rs b/src/dotfile/dot.rs
similarity index 98%
rename from src/dotfile/dotfile.rs
rename to src/dotfile/dot.rs
index 948f094..6bfb532 100644
--- a/src/dotfile/dotfile.rs
+++ b/src/dotfile/dot.rs
@@ -4,8 +4,8 @@ use std::env;
 use std::fs;
 use std::fmt;
 
-use crate::dotfile::dir;
-use crate::dotfile::file;
+use crate::fs::dir;
+use crate::fs::file;
 
 
 
diff --git a/src/dotfile/mod.rs b/src/dotfile/mod.rs
index 86e26c2..440c0bc 100644
--- a/src/dotfile/mod.rs
+++ b/src/dotfile/mod.rs
@@ -1,4 +1 @@
-mod dir;
-mod file;
-
-pub mod dotfile;
+pub mod dot;
diff --git a/src/dotfile/dir.rs b/src/fs/dir.rs
similarity index 99%
rename from src/dotfile/dir.rs
rename to src/fs/dir.rs
index ee14991..52ee61e 100644
--- a/src/dotfile/dir.rs
+++ b/src/fs/dir.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use std::fmt;
 use std::error::Error;
 
-use crate::dotfile::file::{self, File};
+use crate::fs::file::{self, File};
 
 
 
diff --git a/src/dotfile/file.rs b/src/fs/file.rs
similarity index 100%
rename from src/dotfile/file.rs
rename to src/fs/file.rs
diff --git a/src/fs/mod.rs b/src/fs/mod.rs
new file mode 100644
index 0000000..25e8dd1
--- /dev/null
+++ b/src/fs/mod.rs
@@ -0,0 +1,2 @@
+pub mod dir;
+pub mod file;
diff --git a/src/lib.rs b/src/lib.rs
index cba7390..0f4ffa0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,14 +3,16 @@ use std::fmt;
 
 use clap::ArgMatches;
 
-use crate::config::config::Config;
+use crate::config::cfg;
+use crate::dotfile::dot;
 
 pub mod config;
 pub mod dotfile;
 pub mod args;
+pub mod fs;
 
 
-pub fn run(args: ArgMatches, config: Config) -> Result<(), ManagerError> {
+pub fn run(args: ArgMatches, config: cfg::Config) -> Result<(), ManagerError> {
 
     let copy_to_sys = args.get_flag("from-git");
 
@@ -41,8 +43,8 @@ pub fn run(args: ArgMatches, config: Config) -> Result<(), ManagerError> {
 
 #[derive(Debug)]
 pub enum ManagerError {
-    DotfileCopyError(dotfile::dotfile::DotfileError),
-    ConfigParseError(config::config::ConfigParseError),
+    DotfileCopyError(dot::DotfileError),
+    ConfigParseError(cfg::ConfigParseError),
 }
 
 impl Error for ManagerError {}
@@ -60,14 +62,14 @@ impl fmt::Display for ManagerError {
     }
 }
 
-impl From<dotfile::dotfile::DotfileError> for ManagerError {
-    fn from(error: dotfile::dotfile::DotfileError) -> ManagerError {
+impl From<dot::DotfileError> for ManagerError {
+    fn from(error: dot::DotfileError) -> ManagerError {
         ManagerError::DotfileCopyError(error)
     }
 }
 
-impl From<config::config::ConfigParseError> for ManagerError {
-    fn from(error: config::config::ConfigParseError) -> ManagerError {
+impl From<cfg::ConfigParseError> for ManagerError {
+    fn from(error: cfg::ConfigParseError) -> ManagerError {
         ManagerError::ConfigParseError(error)
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 8308575..4df897f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,13 +1,13 @@
 use std::path::PathBuf;
 
-use dotfiles_manager::args::args;
-use dotfiles_manager::config::config::Config;
+use dotfiles_manager::args::parse;
+use dotfiles_manager::config::cfg;
 
 
 fn main() -> Result<(), dotfiles_manager::ManagerError> {
-    let args = args::parse_args();
+    let args = parse::parse_args();
 
-    let program_config = Config::parse(PathBuf::from("/home/eesim/.config/dotfiles/config"))?;
+    let program_config = cfg::Config::parse(PathBuf::from("/home/eesim/.config/dotfiles/config"))?;
 
     dotfiles_manager::run(args, program_config)