diff --git a/src/commands/add.rs b/src/commands/add.rs
index 0c53d44..0a63e35 100644
--- a/src/commands/add.rs
+++ b/src/commands/add.rs
@@ -1,9 +1,9 @@
+use std::io::Write;
+use std::path::{Path, PathBuf};
 use clap::Values;
+use crate::store;
 use crate::utils::{self};
 use crate::utils::nextsyncignore::{self, ignore_file};
-use crate::store;
-use std::path::{Path, PathBuf};
-use std::io::Write;
 
 pub struct AddArgs<'a> {
     pub files: Values<'a>,
diff --git a/src/commands/clone.rs b/src/commands/clone.rs
index b4971b7..28fcccf 100644
--- a/src/commands/clone.rs
+++ b/src/commands/clone.rs
@@ -2,13 +2,13 @@ use std::fs::DirBuilder;
 use std::path::{Path, PathBuf};
 use clap::Values;
 use regex::Regex;
+use crate::utils::api::ApiProps;
+use crate::global::global::{DIR_PATH, set_dir_path};
 use crate::services::api::ApiError;
 use crate::services::req_props::{ReqProps, ObjProps};
 use crate::services::download_files::DownloadFiles;
 use crate::store::object::{self, add_blob, add_tree};
-use crate::commands;
-use crate::utils::api::ApiProps;
-use crate::global::global::{DIR_PATH, set_dir_path};
+use crate::commands::init;
 
 pub fn clone(remote: Values<'_>) {
     let d = DIR_PATH.lock().unwrap().clone();
@@ -81,7 +81,7 @@ pub fn clone(remote: Values<'_>) {
                 // destination path 'path' already exists and is not an empty directory.
                 //std::process::exit(1);
             } else {
-                commands::init::init();
+                init::init();
             }
         } else {
             // create folder
diff --git a/src/commands/config.rs b/src/commands/config.rs
index 952b877..f45103e 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -1,6 +1,6 @@
-use crate::utils::{path, read};
 use std::fs::OpenOptions;
 use std::io::{self, Write};
+use crate::utils::{path, read};
 
 pub fn set(var: &str, val: &str) -> io::Result<()> {
     let mut root = match path::nextsync() {
diff --git a/src/commands/init.rs b/src/commands/init.rs
index 62e84c7..e063d7f 100644
--- a/src/commands/init.rs
+++ b/src/commands/init.rs
@@ -1,6 +1,6 @@
+use std::env;
 use std::fs::{DirBuilder, File};
 use std::path::PathBuf;
-use std::env;
 use crate::global::global::DIR_PATH;
 
 pub fn init() {
diff --git a/src/commands/status.rs b/src/commands/status.rs
index 6dc843b..09f51ba 100644
--- a/src/commands/status.rs
+++ b/src/commands/status.rs
@@ -1,10 +1,10 @@
 use std::fs::File;
-use crypto::digest::Digest;
-use crypto::sha1::Sha1;
-use std::collections::{HashSet, HashMap};
-use colored::Colorize;
 use std::path::PathBuf;
 use std::io::{self, Lines, BufReader};
+use std::collections::{HashSet, HashMap};
+use crypto::digest::Digest;
+use crypto::sha1::Sha1;
+use colored::Colorize;
 use crate::utils;
 use crate::store::{self, object};
 
diff --git a/src/main.rs b/src/main.rs
index 89bf0fe..6dbe234 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,6 @@
 use clap::{App, Arg, SubCommand};
 use crate::commands::add::AddArgs;
+
 mod commands;
 mod utils;
 mod services;
diff --git a/src/services/api.rs b/src/services/api.rs
index fa9e849..81542e0 100644
--- a/src/services/api.rs
+++ b/src/services/api.rs
@@ -1,9 +1,9 @@
+use std::env;
+use dotenv::dotenv;
 use reqwest::Client;
 use reqwest::RequestBuilder;
 use reqwest::{Response, Error, IntoUrl, Method};
 use crate::utils::api::ApiProps;
-use std::env;
-use dotenv::dotenv;
 
 #[derive(Debug)]
 pub enum ApiError {
diff --git a/src/services/create_folder.rs b/src/services/create_folder.rs
index a7d926a..1dc6157 100644
--- a/src/services/create_folder.rs
+++ b/src/services/create_folder.rs
@@ -1,5 +1,5 @@
-use crate::services::api::{ApiBuilder, ApiError};
 use reqwest::{Method, IntoUrl, Response, Error};
+use crate::services::api::{ApiBuilder, ApiError};
 
 pub struct CreateFolder {
     api_builder: ApiBuilder,
diff --git a/src/services/delete_path.rs b/src/services/delete_path.rs
index 4f68e4d..54091a4 100644
--- a/src/services/delete_path.rs
+++ b/src/services/delete_path.rs
@@ -1,5 +1,5 @@
-use crate::services::api::{ApiBuilder, ApiError};
 use reqwest::{Method, Response, Error};
+use crate::services::api::{ApiBuilder, ApiError};
 
 pub struct DeletePath {
     api_builder: ApiBuilder,
diff --git a/src/services/download_files.rs b/src/services/download_files.rs
index cc98728..4923e2b 100644
--- a/src/services/download_files.rs
+++ b/src/services/download_files.rs
@@ -1,9 +1,9 @@
-use crate::services::api::{ApiBuilder, ApiError};
 use std::path::PathBuf;
-use reqwest::{Method, Response, Error};
-use crate::utils::api::ApiProps;
 use std::fs::OpenOptions;
 use std::io::{self, Write};
+use reqwest::{Method, Response, Error};
+use crate::utils::api::ApiProps;
+use crate::services::api::{ApiBuilder, ApiError};
 
 pub struct DownloadFiles {
     api_builder: ApiBuilder,
diff --git a/src/services/req_props.rs b/src/services/req_props.rs
index 4b9382e..6d6facb 100644
--- a/src/services/req_props.rs
+++ b/src/services/req_props.rs
@@ -1,10 +1,10 @@
 use std::io::Cursor;
-use xml::reader::{EventReader, XmlEvent};
-use reqwest::{Method, Response, Error};
 use chrono::{Utc, DateTime};
-use crate::services::api::{ApiBuilder, ApiError};
+use reqwest::{Method, Response, Error};
+use xml::reader::{EventReader, XmlEvent};
 use crate::utils::time::parse_timestamp;
 use crate::utils::api::{get_relative_s, ApiProps};
+use crate::services::api::{ApiBuilder, ApiError};
 
 #[derive(Debug)]
 pub struct ObjProps {
diff --git a/src/services/upload_file.rs b/src/services/upload_file.rs
index 53b1390..ef3f6e9 100644
--- a/src/services/upload_file.rs
+++ b/src/services/upload_file.rs
@@ -1,8 +1,8 @@
 use std::fs::File;
-use crate::services::api::{ApiBuilder, ApiError};
-use std::path::PathBuf;
 use std::io::{Read};
+use std::path::PathBuf;
 use reqwest::{Method, Response, Error};
+use crate::services::api::{ApiBuilder, ApiError};
 
 pub struct UploadFile {
     api_builder: ApiBuilder,
diff --git a/src/store/head.rs b/src/store/head.rs
index 62b9399..b26a276 100644
--- a/src/store/head.rs
+++ b/src/store/head.rs
@@ -1,7 +1,7 @@
-use std::fs::{File, OpenOptions};
 use std::path::PathBuf;
-use crate::utils::{read, path};
+use std::fs::{File, OpenOptions};
 use std::io::{self, Write};
+use crate::utils::{read, path};
 
 pub fn _read_only(mut path: PathBuf) -> File {
     path.push("HEAD");
diff --git a/src/store/index.rs b/src/store/index.rs
index 4f740c8..6209935 100644
--- a/src/store/index.rs
+++ b/src/store/index.rs
@@ -1,8 +1,8 @@
-use std::fs::OpenOptions;
+use std::io;
 use std::fs::File;
+use std::fs::OpenOptions;
 use std::path::PathBuf;
 use crate::utils::{read, path};
-use std::io;
 
 pub fn _read_only(mut path: PathBuf) -> File {
     path.push("index");
diff --git a/src/store/object.rs b/src/store/object.rs
index 2d0f89a..bc4f0e8 100644
--- a/src/store/object.rs
+++ b/src/store/object.rs
@@ -1,11 +1,11 @@
+use std::fs::File;
+use std::io::{self, Write};
 use std::path::{Path, PathBuf};
-use crate::utils::{read, path};
-use crate::store::head;
+use std::fs::{OpenOptions, self};
 use crypto::sha1::Sha1;
 use crypto::digest::Digest;
-use std::fs::{OpenOptions, self};
-use std::io::{self, Write};
-use std::fs::File;
+use crate::utils::{read, path};
+use crate::store::head;
 
 /// Returns (line, hash, name)
 ///
diff --git a/src/utils/nextsyncignore.rs b/src/utils/nextsyncignore.rs
index aec8088..256d075 100644
--- a/src/utils/nextsyncignore.rs
+++ b/src/utils/nextsyncignore.rs
@@ -1,7 +1,7 @@
-use crate::utils::path;
-use regex::Regex;
 use std::fs::File;
 use std::io::{BufReader, BufRead};
+use regex::Regex;
+use crate::utils::path;
 
 pub fn read_lines() -> Result<Vec<String>, ()> {
     if let Some(path) = path::nextsyncignore() {
diff --git a/src/utils/path.rs b/src/utils/path.rs
index 2acc793..83b3abd 100644
--- a/src/utils/path.rs
+++ b/src/utils/path.rs
@@ -1,7 +1,7 @@
 use std::env;
+use std::fs::canonicalize;
 use std::path::{PathBuf, Path};
 use crate::global::global::DIR_PATH;
-use std::fs::canonicalize;
 
 pub fn current() -> Option<PathBuf> {
     let d = DIR_PATH.lock().unwrap();
diff --git a/src/utils/read.rs b/src/utils/read.rs
index ab4e949..e5378e7 100644
--- a/src/utils/read.rs
+++ b/src/utils/read.rs
@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
-use std::io::{self, BufRead, BufReader, Write};
 use std::fs::{self, File, OpenOptions};
+use std::io::{self, BufRead, BufReader, Write};
 
 pub fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
 where P: AsRef<Path>, {