diff --git a/playbooks/git.yml b/playbooks/git.yml
index 8404994..84fd6cd 100644
--- a/playbooks/git.yml
+++ b/playbooks/git.yml
@@ -22,8 +22,8 @@
 
   roles:
     - base
-    - git/client
-    - git/server
+    - git
+    - git-server
     - sssd
     - nfs-client
     - autofs
diff --git a/playbooks/shell.yml b/playbooks/shell.yml
index d2ed2d4..981262b 100644
--- a/playbooks/shell.yml
+++ b/playbooks/shell.yml
@@ -67,7 +67,7 @@
       with_items:
         - cups-client
         - firefox
-        - git/client
+        - git
         - google-chrome
         - mutt
         - opencollab
diff --git a/roles/ansible-host/meta/main.yml b/roles/ansible-host/meta/main.yml
index 933a629..f0a9153 100644
--- a/roles/ansible-host/meta/main.yml
+++ b/roles/ansible-host/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
   - {role: epel-repo}
-  - {role: git/client}
+  - {role: git}
   - {role: nginx/server}
diff --git a/roles/git/server/files/git.conf b/roles/git-server/files/git.conf
similarity index 100%
rename from roles/git/server/files/git.conf
rename to roles/git-server/files/git.conf
diff --git a/roles/git/server/files/gitweb-local.css b/roles/git-server/files/gitweb-local.css
similarity index 100%
rename from roles/git/server/files/gitweb-local.css
rename to roles/git-server/files/gitweb-local.css
diff --git a/roles/git/server/files/gitweb.conf b/roles/git-server/files/gitweb.conf
similarity index 100%
rename from roles/git/server/files/gitweb.conf
rename to roles/git-server/files/gitweb.conf
diff --git a/roles/git/server/files/logo.png b/roles/git-server/files/logo.png
similarity index 100%
rename from roles/git/server/files/logo.png
rename to roles/git-server/files/logo.png
diff --git a/roles/git/server/meta/main.yml b/roles/git-server/meta/main.yml
similarity index 62%
rename from roles/git/server/meta/main.yml
rename to roles/git-server/meta/main.yml
index 5366061..94a283e 100644
--- a/roles/git/server/meta/main.yml
+++ b/roles/git-server/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 
 dependencies:
-  - {role: git/client}
+  - {role: git}
   - {role: apache}
diff --git a/roles/git/server/tasks/main.yml b/roles/git-server/tasks/main.yml
similarity index 100%
rename from roles/git/server/tasks/main.yml
rename to roles/git-server/tasks/main.yml
diff --git a/roles/git/client/tasks/main.yml b/roles/git/client/tasks/main.yml
deleted file mode 100644
index b14c78f..0000000
--- a/roles/git/client/tasks/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-- name: install git packages
-  package:
-    name: git
-    state: installed
-
-- name: create git config for sh based shells
-  template:
-    dest: /etc/profile.d/git.sh
-    src: git.sh.j2
-    mode: 0644
-    owner: root
-    group: root
-
-- name: create git config for csh based shells
-  template:
-    dest: /etc/profile.d/git.csh
-    src: git.csh.j2
-    mode: 0644
-    owner: root
-    group: root
diff --git a/roles/git/client/templates/git.csh.j2 b/roles/git/client/templates/git.csh.j2
deleted file mode 100644
index 107ce34..0000000
--- a/roles/git/client/templates/git.csh.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-if ($uid > 3000 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
-    if ( "`git config user.name`" == "" ) then
-        git config --global user.name "`getent passwd '${USER}' | cut -d : -f 5`"
-    endif
-    if ( "`git config user.email`" == "" ) then
-        git config --global user.email "${USER}@{{ mail_domain }}"
-    endif
-endif
diff --git a/roles/git/client/templates/git.sh.j2 b/roles/git/client/templates/git.sh.j2
deleted file mode 100644
index 6367672..0000000
--- a/roles/git/client/templates/git.sh.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ $UID -gt 3000 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
-    if [ -z "$(git config user.name)" ]; then
-        git config --global user.name "$(getent passwd "$USER" | cut -d : -f 5)"
-    fi
-    if [ -z "$(git config user.email)" ]; then
-        git config --global user.email "${USER}@{{ mail_domain }}"
-    fi
-fi
diff --git a/roles/mirror/reportmirror/meta/main.yml b/roles/mirror/reportmirror/meta/main.yml
index 26ccd44..213a68a 100644
--- a/roles/mirror/reportmirror/meta/main.yml
+++ b/roles/mirror/reportmirror/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - {role: git/client}
+  - {role: git}