diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..cdfd2f3
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,11 @@
+# Include common settings (default branch, diff tools, aliases...)
+[include]
+    path = ~/.config/git/config.inc/common.gitconfig
+
+# Include default user settings
+[include]
+    path = ~/.config/git/config.inc/user_binaryDiv.gitconfig
+
+# # Do not sign commits with GPG
+# [include]
+#     path = ~/.config/git/config.inc/no_gpgsign.gitconfig
diff --git a/.gitconfig.inc/common.gitconfig b/.config/git/config.inc/common.gitconfig
similarity index 100%
rename from .gitconfig.inc/common.gitconfig
rename to .config/git/config.inc/common.gitconfig
diff --git a/.gitconfig.inc/no_gpgsign.gitconfig b/.config/git/config.inc/no_gpgsign.gitconfig
similarity index 100%
rename from .gitconfig.inc/no_gpgsign.gitconfig
rename to .config/git/config.inc/no_gpgsign.gitconfig
diff --git a/.gitconfig.inc/user_binaryDiv.gitconfig b/.config/git/config.inc/user_binaryDiv.gitconfig
similarity index 100%
rename from .gitconfig.inc/user_binaryDiv.gitconfig
rename to .config/git/config.inc/user_binaryDiv.gitconfig
diff --git a/.config/git/config_root b/.config/git/config_root
new file mode 100644
index 0000000..6df8856
--- /dev/null
+++ b/.config/git/config_root
@@ -0,0 +1,11 @@
+# Include common settings (default branch, diff tools, aliases...)
+[include]
+    path = ~/.config/git/config.inc/common.gitconfig
+
+# Include default user settings
+[include]
+    path = ~/.config/git/config.inc/user_binaryDiv.gitconfig
+
+# No PGP key for root user
+[include]
+    path = ~/.config/git/config.inc/no_gpgsign.gitconfig
diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index 7df42d2..0000000
--- a/.gitconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Include common settings (default branch, diff tools, aliases...)
-[include]
-    path = ~/.gitconfig.inc/common.gitconfig
-
-# Include default user settings
-[include]
-    path = ~/.gitconfig.inc/user_binaryDiv.gitconfig
-
-# # Do not sign commits with GPG
-# [include]
-#     path = ~/.gitconfig.inc/no_gpgsign.gitconfig
diff --git a/.gitconfig_root b/.gitconfig_root
deleted file mode 100644
index ec96d0f..0000000
--- a/.gitconfig_root
+++ /dev/null
@@ -1,11 +0,0 @@
-# Include common settings (default branch, diff tools, aliases...)
-[include]
-    path = ~/.gitconfig.inc/common.gitconfig
-
-# Include default user settings
-[include]
-    path = ~/.gitconfig.inc/user_binaryDiv.gitconfig
-
-# No PGP key for root user
-[include]
-    path = ~/.gitconfig.inc/no_gpgsign.gitconfig