diff --git a/README.md b/README.md
index 8522ec9..66fde8c 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ seedbox and personal media server.
 | Plex                 | plex.yourdomain.com        | [linuxserver/plex](https://hub.docker.com/r/linuxserver/plex)          | *latest*                | Media Streaming     |
 | Deluge               | deluge.yourdomain.com      | [linuxserver/deluge](https://hub.docker.com/r/linuxserver/deluge)      | *latest*                | Torrents downloader |
 | Sonarr               | sonarr.yourdomain.com      | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr)      | *preview*               | TV Shows monitor    |
-| Radarr               | radarr.yourdomain.com      | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr)      | *nightly*                | Movies monitor      |
+| Radarr               | radarr.yourdomain.com      | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr)      | *develop*                | Movies monitor      |
 | Bazarr               | bazarr.yourdomain.com      | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr)      | *latest*                | Subtitles monitor   |
 | Lidarr               | lidarr.yourdomain.com      | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr)      | *preview*               | Music monitor       |
 | Jackett              | jackett.yourdomain.com     | [linuxserver/jackett](https://hub.docker.com/r/linuxserver/jackett)    | *latest*                | Tracker indexer     |
@@ -74,13 +74,12 @@ sudo rm -rf /opt/traefik /tmp/migration
 Before running, please create the volumes which will be statically mapped to the ones on the host:
 
 ```sh
-sudo su -c "mkdir /data && mkdir /data/config && mkdir /data/torrents""
+sudo su -c "mkdir /data && mkdir /data/config && mkdir /data/torrents"
 ./init.sh
 ```
 
 Edit the `.env` file and change the variables as desired.
 The variables are all self-explanatory.
-Sames goes for `open-tunnel.sh` script to open a tunnel with port forwarding in order to access Plex Tools directly in your browser. (documentation needs to be updated - for now just install manually Plex Tools)
 
 ## Running & updating
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 44a3900..28d24bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,7 +101,7 @@ services:
             - "traefik.http.routers.sonarr.middlewares=common-auth@file"
 
     radarr:
-        image: linuxserver/radarr:nightly
+        image: linuxserver/radarr:develop
         container_name: radarr
         restart: always
         volumes:
@@ -215,7 +215,7 @@ services:
         labels:
             - "traefik.enable=false"
 
-    # See init-setup-nextcloud.sh for first install
+    # See scripts/init-setup-nextcloud.sh for first install
     nextcloud:
         depends_on:
             - nextcloud-db
diff --git a/aliases.sh b/tools/aliases.sh
similarity index 100%
rename from aliases.sh
rename to tools/aliases.sh
diff --git a/init-setup-nextcloud.sh b/tools/init-setup-nextcloud.sh
similarity index 100%
rename from init-setup-nextcloud.sh
rename to tools/init-setup-nextcloud.sh
diff --git a/tools/legacy/README.md b/tools/legacy/README.md
new file mode 100644
index 0000000..6faa89d
--- /dev/null
+++ b/tools/legacy/README.md
@@ -0,0 +1,3 @@
+# Legacy tools
+
+These scripts were once used but not anymore. I keep them here for retro-compatibility sake.
diff --git a/archive/docker-plex/Dockerfile b/tools/legacy/docker-plex/Dockerfile
similarity index 100%
rename from archive/docker-plex/Dockerfile
rename to tools/legacy/docker-plex/Dockerfile
diff --git a/archive/docker-plex/Preferences.xml b/tools/legacy/docker-plex/Preferences.xml
similarity index 100%
rename from archive/docker-plex/Preferences.xml
rename to tools/legacy/docker-plex/Preferences.xml
diff --git a/archive/docker-plex/init b/tools/legacy/docker-plex/init
similarity index 100%
rename from archive/docker-plex/init
rename to tools/legacy/docker-plex/init
diff --git a/archive/docker-plex/plexmediaserver b/tools/legacy/docker-plex/plexmediaserver
similarity index 100%
rename from archive/docker-plex/plexmediaserver
rename to tools/legacy/docker-plex/plexmediaserver
diff --git a/open-tunnel.sh b/tools/legacy/open-tunnel.sh
similarity index 100%
rename from open-tunnel.sh
rename to tools/legacy/open-tunnel.sh
diff --git a/tunnel-options.sh.sample b/tools/legacy/tunnel-options.sh.sample
similarity index 100%
rename from tunnel-options.sh.sample
rename to tools/legacy/tunnel-options.sh.sample
diff --git a/tools/wip/README.md b/tools/wip/README.md
new file mode 100644
index 0000000..71eeafb
--- /dev/null
+++ b/tools/wip/README.md
@@ -0,0 +1,3 @@
+# WIP tools
+
+Collection of scripts which are not considered stable yet.
diff --git a/clean-fs.sh b/tools/wip/clean-fs.sh
similarity index 100%
rename from clean-fs.sh
rename to tools/wip/clean-fs.sh