diff --git a/roles/mumble/defaults/main.yaml b/roles/mumble/defaults/main.yml
similarity index 100%
rename from roles/mumble/defaults/main.yaml
rename to roles/mumble/defaults/main.yml
diff --git a/roles/mumble/molecule/default/molecule.yml b/roles/mumble/molecule/default/molecule.yml
deleted file mode 100644
index d6f75a6b..00000000
--- a/roles/mumble/molecule/default/molecule.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-provisioner:
-  inventory:
-    group_vars:
-      all:
-        mumble_enabled: true
diff --git a/roles/mumble/molecule/default/side_effect.yml b/roles/mumble/molecule/default/side_effect.yml
deleted file mode 100644
index 397569d2..00000000
--- a/roles/mumble/molecule/default/side_effect.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Stop
-  hosts: all
-  become: true
-  tasks:
-    - name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
-      include_role:
-        name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
-      vars:
-        mumble_enabled: false
diff --git a/roles/mumble/molecule/default/verify.yml b/roles/mumble/molecule/default/verify.yml
deleted file mode 100644
index ec53d8de..00000000
--- a/roles/mumble/molecule/default/verify.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Verify
-  hosts: all
-  gather_facts: false
-  tasks:
-    - name: Include vars
-      include_vars:
-        file: ../../defaults/main.yml
-
-    - name: Get container state
-      docker_container_info:
-        name: "{{ mumble_container_name }}"
-      register: result
-
-    - name: Check Mumble is running
-      assert:
-        that:
-          - result.container['State']['Status'] == "running"
-          - result.container['State']['Restarting'] == false
diff --git a/roles/mumble/molecule/default/verify_stopped.yml b/roles/mumble/molecule/default/verify_stopped.yml
deleted file mode 100644
index da429ba8..00000000
--- a/roles/mumble/molecule/default/verify_stopped.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Verify
-  hosts: all
-  gather_facts: false
-  tasks:
-    - name: Include vars
-      include_vars:
-        file: ../../defaults/main.yml
-
-    - name: Try and stop and remove Mumble
-      docker_container:
-        name: "{{ mumble_container_name }}"
-        state: absent
-      register: result
-
-    - name: Check Mumble is stopped
-      assert:
-        that:
-          - not result.changed
diff --git a/roles/mumble/tasks/main.yaml b/roles/mumble/tasks/main.yml
similarity index 92%
rename from roles/mumble/tasks/main.yaml
rename to roles/mumble/tasks/main.yml
index b841ffc2..1b9b197f 100644
--- a/roles/mumble/tasks/main.yaml
+++ b/roles/mumble/tasks/main.yml
@@ -23,7 +23,6 @@
           - "{{ mumble_tcp_port }}:64738/tcp"
           - "{{ mumble_udp_port }}:64738/udp"
         env:
-          # Setting the password prevents unwanted users from connecting to the instance, especially if publicly available.
           MUMBLE_CONFIG_SERVER_PASSWORD: "{{ mumble_server_password }}"
         restart_policy: unless-stopped
         labels:
diff --git a/roles/mumble/docs/mumble.md b/website/docs/applications/other/mumble.md
similarity index 100%
rename from roles/mumble/docs/mumble.md
rename to website/docs/applications/other/mumble.md