diff --git a/init.d/ReadMe-CentOS.md b/init/sysvinit/centos/README.md
similarity index 100%
rename from init.d/ReadMe-CentOS.md
rename to init/sysvinit/centos/README.md
diff --git a/init.d/gitlab-centos b/init/sysvinit/centos/gitlab-centos
similarity index 100%
rename from init.d/gitlab-centos
rename to init/sysvinit/centos/gitlab-centos
diff --git a/install/archlinux/README.md b/install/archlinux/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/install/CentOS_6.md b/install/centos/README.md
similarity index 100%
rename from install/CentOS_6.md
rename to install/centos/README.md
diff --git a/install/debian/README.md b/install/debian/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/install/fedora/README.md b/install/fedora/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/install/gentoo/README.md b/install/gentoo/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/install/v4/README.md b/install/ubuntu/README.md
similarity index 100%
rename from install/v4/README.md
rename to install/ubuntu/README.md
diff --git a/install/v4/ubuntu_server_1204.sh b/install/ubuntu/ubuntu_server_1204.sh
similarity index 100%
rename from install/v4/ubuntu_server_1204.sh
rename to install/ubuntu/ubuntu_server_1204.sh
diff --git a/nginx/ReadMe-CentOS.md b/nginx/ReadMe-CentOS.md
deleted file mode 100644
index 4f837bc..0000000
--- a/nginx/ReadMe-CentOS.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# CentOS related Nginx notes
-
-If nginx installed through package manager, adjust sites in conf.d instead of sites-enabled.
-
-Set user gitlab in group root for user in nginx.conf:
-
-    #user              nginx;
-    user              gitlab root;
-
diff --git a/apache/gitlab b/web-server/apache/gitlab
similarity index 100%
rename from apache/gitlab
rename to web-server/apache/gitlab
diff --git a/lighttpd/10-gitlab.conf b/web-server/lighttpd/10-gitlab.conf
similarity index 100%
rename from lighttpd/10-gitlab.conf
rename to web-server/lighttpd/10-gitlab.conf
diff --git a/lighttpd/README.md b/web-server/lighttpd/README.md
similarity index 100%
rename from lighttpd/README.md
rename to web-server/lighttpd/README.md
diff --git a/web-server/nginx/README.md b/web-server/nginx/README.md
new file mode 100644
index 0000000..3952106
--- /dev/null
+++ b/web-server/nginx/README.md
@@ -0,0 +1,10 @@
+# CentOS related Nginx notes
+
+* If nginx is installed through the package manager, adjust sites in conf.d instead of sites-enabled.
+
+* Replace the default `nginx` user with `gitlab` in group `root`.
+
+  In `/etc/nginx/nginx.conf`:
+
+      #user              nginx;
+      user              gitlab root;
diff --git a/nginx/gitlab-https b/web-server/nginx/gitlab-ssl
similarity index 100%
rename from nginx/gitlab-https
rename to web-server/nginx/gitlab-ssl