diff --git a/defaults/main.yml b/defaults/main.yml
index 4bb831c..642ab5b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -19,6 +19,7 @@ mumble_web_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/{{ acme_
 mumble_web_trusted_certificate: "{{ acme_certs_dir }}/{{ mumble_web_domain }}.d/chain.pem"
 mumble_web_private_key: "{{ acme_keys_dir }}/{{ mumble_web_domain }}.key"
 mumble_web_www_dir: /var/www/mumble-web
+mumble_web_dist_dir: "{{ mumble_web_www_dir }}/dist"
 mumble_web_version: master
 mumble_web_websockify_port: "64737"
 
diff --git a/tasks/mumble_web.yml b/tasks/mumble_web.yml
index 764af2d..e8f27ab 100644
--- a/tasks/mumble_web.yml
+++ b/tasks/mumble_web.yml
@@ -63,7 +63,7 @@
 
 - name: Copy mumble-web config file
   template:
-    src: mumble-web.js.j2
+    src: mumble-web/config.js.j2
     dest: "{{ mumble_web_www_dir }}/dist/config.local.js"
     owner: "{{ mumble_web_owner }}"
     group: "{{ mumble_web_group }}"
@@ -72,7 +72,7 @@
 
 - name: Copy mumble-web systemd service
   template:
-    src: mumble-web.service.j2
+    src: mumble-web/mumble-web.service.j2
     dest: /etc/systemd/system/mumble-web.service
     owner: root
     group: root
diff --git a/tasks/murmur.yml b/tasks/murmur.yml
index d80dcc1..959cd42 100644
--- a/tasks/murmur.yml
+++ b/tasks/murmur.yml
@@ -27,7 +27,7 @@
 
 - name: Copy Murmur config file
   template:
-    src: mumble-server.ini.j2
+    src: murmur/mumble-server.ini.j2
     dest: /etc/mumble-server.ini
     owner: root
     group: "{{ murmur_group }}"
diff --git a/tasks/nginx.yml b/tasks/nginx.yml
index 5f9f7aa..183a4f0 100644
--- a/tasks/nginx.yml
+++ b/tasks/nginx.yml
@@ -1,6 +1,6 @@
 - name: Copy Nginx config file
   template:
-    src: nginx.conf.j2
+    src: mumble-web/nginx.conf.j2
     dest: "{{ mumble_web_nginx_config_dir }}/sites-available/mumble.conf"
     owner: root
     group: www-data
diff --git a/tasks/umurmur.yml b/tasks/umurmur.yml
index d42af55..e026e0c 100644
--- a/tasks/umurmur.yml
+++ b/tasks/umurmur.yml
@@ -55,7 +55,7 @@
 
 - name: Copy umurmur config file
   template:
-    src: umurmur.conf.j2
+    src: umurmur/umurmur.conf.j2
     dest: /usr/local/etc/umurmur.conf
     owner: root
     group: "{{ umurmur_ssl_group }}"
@@ -66,7 +66,7 @@
 
 - name: Copy umurmur systemd service
   template:
-    src: umurmur.service.j2
+    src: umurmur/umurmur.service.j2
     dest: /etc/systemd/system/umurmur.service
     owner: root
     group: root
diff --git a/templates/mumble-web.js.j2 b/templates/mumble-web/config.js.j2
similarity index 100%
rename from templates/mumble-web.js.j2
rename to templates/mumble-web/config.js.j2
diff --git a/templates/mumble-web.service.j2 b/templates/mumble-web/mumble-web.service.j2
similarity index 100%
rename from templates/mumble-web.service.j2
rename to templates/mumble-web/mumble-web.service.j2
diff --git a/templates/nginx.conf.j2 b/templates/mumble-web/nginx.conf.j2
similarity index 95%
rename from templates/nginx.conf.j2
rename to templates/mumble-web/nginx.conf.j2
index 107f284..7322f57 100644
--- a/templates/nginx.conf.j2
+++ b/templates/mumble-web/nginx.conf.j2
@@ -53,11 +53,11 @@ server {
 {% endif %}
 
   location / {
-    root /var/www/mumble-web/dist/;
+    root {{ mumble_web_dist_dir }};
   }
 
   location /mumble {
-    proxy_pass http://127.0.0.1:{{ mumble_web_websockify_port }};
+    proxy_pass http://localhost:{{ mumble_web_websockify_port }};
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
diff --git a/templates/mumble-server.ini.j2 b/templates/murmur/mumble-server.ini.j2
similarity index 100%
rename from templates/mumble-server.ini.j2
rename to templates/murmur/mumble-server.ini.j2
diff --git a/templates/umurmur.conf.j2 b/templates/umurmur/umurmur.conf.j2
similarity index 100%
rename from templates/umurmur.conf.j2
rename to templates/umurmur/umurmur.conf.j2
diff --git a/templates/umurmur.service.j2 b/templates/umurmur/umurmur.service.j2
similarity index 100%
rename from templates/umurmur.service.j2
rename to templates/umurmur/umurmur.service.j2