diff --git a/README.md b/README.md
index 676f155..cdb9abd 100644
--- a/README.md
+++ b/README.md
@@ -3,25 +3,25 @@
 Documentation for artitrary setups
 
 * [Create bootable USB Drive For OS Installation](doc/create-bootable-usb-drive.md)
-* [Install Debian](doc/install-debian.md)
-* [Configure Debian](doc/configure-debian.md)
-* [Enable SSH Server](doc/enable-ssh-server.md)
-* [Enable Firewall](doc/enable-firewall.md)
-* [Setup MS Teams](doc/setup-ms-teams.md)
-* [Setup NextCloud](doc/setup-nextcloud.md)
-* [Setup Email Client](doc/setup-email-client.md)
-* [Setup Git](doc/setup-git.md)
-* [Connect To GitHub Using SSH](doc/connect-github-ssh.md)
-* [Connect To VPN](doc/connect-vpn.md)
-* [Setup RDP Client](doc/setup-rdc.md)
-* [Setup PM2](doc/setup-pm2.md)
-* [Setup NPM](doc/setup-npm.md)
-* [Setup Password Manager](doc/setup-pwd-mgmt.md)
-* [Create Group and User](doc/create-grp-usr.md)
-* [Setup Emacs](doc/setup-emacs.md)
-* [Setup Java](doc/setup-java.md)
+* [Debian Installation](doc/install-debian.md)
+* [Debian Configuration](doc/configure-debian.md)
+* [Emacs](doc/setup-emacs.md)
+* [Email Client](doc/setup-email-client.md)
+* [Firewall](doc/enable-firewall.md)
+* [Git](doc/setup-git.md)
+* [GitHub Using SSH](doc/connect-github-ssh.md)
+* [Group and User](doc/create-grp-usr.md)
+* [Java](doc/setup-java.md)
+* [NextCloud](doc/setup-nextcloud.md)
+* [NPM](doc/setup-npm.md)
+* [Maven](doc/maven.md)
+* [MS Teams](doc/setup-ms-teams.md)
+* [Password Manager](doc/setup-pwd-mgmt.md)
+* [PM2](doc/setup-pm2.md)
+* [RDP Client](doc/setup-rdc.md)
+* [SSH Server](doc/enable-ssh-server.md)
+* [VPN](doc/connect-vpn.md)
 * To-do List
   * gitk
-  * Maven
   * Reuse
   * IDE
diff --git a/doc/configure-debian.md.license b/doc/.emacs.license
similarity index 100%
rename from doc/configure-debian.md.license
rename to doc/.emacs.license
diff --git a/doc/create-bootable-usb-drive.md b/doc/bootable-usb-drive.md
similarity index 100%
rename from doc/create-bootable-usb-drive.md
rename to doc/bootable-usb-drive.md
diff --git a/doc/connect-github-ssh.md.license b/doc/bootable-usb-drive.md.license
similarity index 100%
rename from doc/connect-github-ssh.md.license
rename to doc/bootable-usb-drive.md.license
diff --git a/doc/configure-debian.md b/doc/debian-config.md
similarity index 100%
rename from doc/configure-debian.md
rename to doc/debian-config.md
diff --git a/doc/connect-vpn.md.license b/doc/debian-config.md.license
similarity index 100%
rename from doc/connect-vpn.md.license
rename to doc/debian-config.md.license
diff --git a/doc/install-debian.md b/doc/debian-install.md
similarity index 100%
rename from doc/install-debian.md
rename to doc/debian-install.md
diff --git a/doc/create-bootable-usb-drive.md.license b/doc/debian-install.md.license
similarity index 100%
rename from doc/create-bootable-usb-drive.md.license
rename to doc/debian-install.md.license
diff --git a/doc/setup-emacs.md b/doc/emacs.md
similarity index 100%
rename from doc/setup-emacs.md
rename to doc/emacs.md
diff --git a/doc/create-grp-usr.md.license b/doc/emacs.md.license
similarity index 100%
rename from doc/create-grp-usr.md.license
rename to doc/emacs.md.license
diff --git a/doc/setup-email-client.md b/doc/email-client.md
similarity index 100%
rename from doc/setup-email-client.md
rename to doc/email-client.md
diff --git a/doc/enable-firewall.md.license b/doc/email-client.md.license
similarity index 100%
rename from doc/enable-firewall.md.license
rename to doc/email-client.md.license
diff --git a/doc/enable-firewall.md b/doc/firewall.md
similarity index 100%
rename from doc/enable-firewall.md
rename to doc/firewall.md
diff --git a/doc/enable-ssh-server.md.license b/doc/firewall.md.license
similarity index 100%
rename from doc/enable-ssh-server.md.license
rename to doc/firewall.md.license
diff --git a/doc/setup-git.md b/doc/git.md
similarity index 100%
rename from doc/setup-git.md
rename to doc/git.md
diff --git a/doc/install-debian.md.license b/doc/git.md.license
similarity index 100%
rename from doc/install-debian.md.license
rename to doc/git.md.license
diff --git a/doc/connect-github-ssh.md b/doc/github-ssh.md
similarity index 100%
rename from doc/connect-github-ssh.md
rename to doc/github-ssh.md
diff --git a/doc/setup-emacs.md.license b/doc/github-ssh.md.license
similarity index 100%
rename from doc/setup-emacs.md.license
rename to doc/github-ssh.md.license
diff --git a/doc/create-grp-usr.md b/doc/grp-usr.md
similarity index 100%
rename from doc/create-grp-usr.md
rename to doc/grp-usr.md
diff --git a/doc/setup-email-client.md.license b/doc/grp-usr.md.license
similarity index 100%
rename from doc/setup-email-client.md.license
rename to doc/grp-usr.md.license
diff --git a/doc/setup-java.md b/doc/java.md
similarity index 100%
rename from doc/setup-java.md
rename to doc/java.md
diff --git a/doc/setup-git.md.license b/doc/java.md.license
similarity index 100%
rename from doc/setup-git.md.license
rename to doc/java.md.license
diff --git a/doc/maven.md b/doc/maven.md
new file mode 100644
index 0000000..ef029db
--- /dev/null
+++ b/doc/maven.md
@@ -0,0 +1,11 @@
+# Setup Maven
+
+* get the latest version of installed packages and refresh the repo cache
+```
+sudo apt update
+```
+
+* install directly from the official repository
+```
+sudo apt install maven --no-install-recommends
+```
diff --git a/doc/setup-ms-teams.md.license b/doc/maven.md.license
similarity index 100%
rename from doc/setup-ms-teams.md.license
rename to doc/maven.md.license
diff --git a/doc/setup-ms-teams.md b/doc/ms-teams.md
similarity index 100%
rename from doc/setup-ms-teams.md
rename to doc/ms-teams.md
diff --git a/doc/setup-nextcloud.md.license b/doc/ms-teams.md.license
similarity index 100%
rename from doc/setup-nextcloud.md.license
rename to doc/ms-teams.md.license
diff --git a/doc/setup-nextcloud.md b/doc/nextcloud.md
similarity index 100%
rename from doc/setup-nextcloud.md
rename to doc/nextcloud.md
diff --git a/doc/setup-npm.md.license b/doc/nextcloud.md.license
similarity index 100%
rename from doc/setup-npm.md.license
rename to doc/nextcloud.md.license
diff --git a/doc/setup-npm.md b/doc/npm.md
similarity index 100%
rename from doc/setup-npm.md
rename to doc/npm.md
diff --git a/doc/setup-pm2.md.license b/doc/npm.md.license
similarity index 100%
rename from doc/setup-pm2.md.license
rename to doc/npm.md.license
diff --git a/doc/setup-pm2.md b/doc/pm2.md
similarity index 100%
rename from doc/setup-pm2.md
rename to doc/pm2.md
diff --git a/doc/setup-pwd-mgmt.md.license b/doc/pm2.md.license
similarity index 100%
rename from doc/setup-pwd-mgmt.md.license
rename to doc/pm2.md.license
diff --git a/doc/setup-pwd-mgmt.md b/doc/pwd-mgmt.md
similarity index 100%
rename from doc/setup-pwd-mgmt.md
rename to doc/pwd-mgmt.md
diff --git a/doc/setup-rdp.md.license b/doc/pwd-mgmt.md.license
similarity index 100%
rename from doc/setup-rdp.md.license
rename to doc/pwd-mgmt.md.license
diff --git a/doc/setup-rdp.md b/doc/rdp.md
similarity index 100%
rename from doc/setup-rdp.md
rename to doc/rdp.md
diff --git a/doc/rdp.md.license b/doc/rdp.md.license
new file mode 100644
index 0000000..3c4280e
--- /dev/null
+++ b/doc/rdp.md.license
@@ -0,0 +1,5 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Software Ingenieur Begerad <swingbe.de>
+ *
+ * SPDX-License-Identifier: CC0-1.0
+ */
diff --git a/doc/enable-ssh-server.md b/doc/ssh-server.md
similarity index 100%
rename from doc/enable-ssh-server.md
rename to doc/ssh-server.md
diff --git a/doc/ssh-server.md.license b/doc/ssh-server.md.license
new file mode 100644
index 0000000..3c4280e
--- /dev/null
+++ b/doc/ssh-server.md.license
@@ -0,0 +1,5 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Software Ingenieur Begerad <swingbe.de>
+ *
+ * SPDX-License-Identifier: CC0-1.0
+ */
diff --git a/doc/connect-vpn.md b/doc/vpn.md
similarity index 100%
rename from doc/connect-vpn.md
rename to doc/vpn.md
diff --git a/doc/vpn.md.license b/doc/vpn.md.license
new file mode 100644
index 0000000..3c4280e
--- /dev/null
+++ b/doc/vpn.md.license
@@ -0,0 +1,5 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Software Ingenieur Begerad <swingbe.de>
+ *
+ * SPDX-License-Identifier: CC0-1.0
+ */