diff --git a/extra/bitwarden.yml b/plugins/bitwarden/compose/docker-compose.yml
similarity index 100%
rename from extra/bitwarden.yml
rename to plugins/bitwarden/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/bitwarden.sh b/plugins/bitwarden/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/bitwarden.sh
rename to plugins/bitwarden/environment/environment.sh
diff --git a/plugins/bitwarden/img/bitwarden.png b/plugins/bitwarden/img/bitwarden.png
new file mode 100644
index 0000000..146296b
Binary files /dev/null and b/plugins/bitwarden/img/bitwarden.png differ
diff --git a/plugins/bitwarden/mistborn.plugin b/plugins/bitwarden/mistborn.plugin
new file mode 100644
index 0000000..14d51a6
--- /dev/null
+++ b/plugins/bitwarden/mistborn.plugin
@@ -0,0 +1,9 @@
+[DEFAULT]
+name = bitwarden
+subdomain = bitwarden
+desc = Bitwarden is a free and open-source password management service that stores sensitive information such as website credentials in an encrypted vault. The Bitwarden platform offers a variety of client applications including a web interface, desktop applications, browser extensions, mobile apps, and a CLI.
+img = img/bitwarden.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+
diff --git a/scripts/services/Mistborn-bitwarden.service b/plugins/bitwarden/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-bitwarden.service
rename to plugins/bitwarden/service/plugin.service
diff --git a/extra/elasticsearch.yml b/plugins/elasticsearch/compose/docker-compose.yml
similarity index 100%
rename from extra/elasticsearch.yml
rename to plugins/elasticsearch/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/elasticsearch.sh b/plugins/elasticsearch/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/elasticsearch.sh
rename to plugins/elasticsearch/environment/environment.sh
diff --git a/plugins/elasticsearch/mistborn.plugin b/plugins/elasticsearch/mistborn.plugin
new file mode 100644
index 0000000..58448e9
--- /dev/null
+++ b/plugins/elasticsearch/mistborn.plugin
@@ -0,0 +1,8 @@
+[DEFAULT]
+name = elasticsearch
+subdomain = elasticsearch
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+resources = resources
+
diff --git a/scripts/services/elasticsearch/files/internal_users.yml b/plugins/elasticsearch/resources/files/internal_users.yml
similarity index 100%
rename from scripts/services/elasticsearch/files/internal_users.yml
rename to plugins/elasticsearch/resources/files/internal_users.yml
diff --git a/scripts/services/elasticsearch/init.sh b/plugins/elasticsearch/resources/init.sh
similarity index 100%
rename from scripts/services/elasticsearch/init.sh
rename to plugins/elasticsearch/resources/init.sh
diff --git a/scripts/services/Mistborn-elasticsearch.service b/plugins/elasticsearch/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-elasticsearch.service
rename to plugins/elasticsearch/service/plugin.service
diff --git a/extra/guacamole.yml b/plugins/guacamole/compose/docker-compose.yml
similarity index 100%
rename from extra/guacamole.yml
rename to plugins/guacamole/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/guacamole.sh b/plugins/guacamole/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/guacamole.sh
rename to plugins/guacamole/environment/environment.sh
diff --git a/plugins/guacamole/img/guacamole.png b/plugins/guacamole/img/guacamole.png
new file mode 100644
index 0000000..2fb3f9d
Binary files /dev/null and b/plugins/guacamole/img/guacamole.png differ
diff --git a/plugins/guacamole/mistborn.plugin b/plugins/guacamole/mistborn.plugin
new file mode 100644
index 0000000..fd5c75d
--- /dev/null
+++ b/plugins/guacamole/mistborn.plugin
@@ -0,0 +1,10 @@
+[DEFAULT]
+name = guacamole
+subdomain = guacamole
+desc = Apache Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH.
+img = img/guacamole.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+resources = resources
+
diff --git a/scripts/services/guacamole/init.sh b/plugins/guacamole/resources/init.sh
similarity index 100%
rename from scripts/services/guacamole/init.sh
rename to plugins/guacamole/resources/init.sh
diff --git a/scripts/services/Mistborn-guacamole.service b/plugins/guacamole/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-guacamole.service
rename to plugins/guacamole/service/plugin.service
diff --git a/extra/homeassistant.yml b/plugins/homeassistant/compose/docker-compose.yml
similarity index 100%
rename from extra/homeassistant.yml
rename to plugins/homeassistant/compose/docker-compose.yml
diff --git a/plugins/homeassistant/img/homeassistant.png b/plugins/homeassistant/img/homeassistant.png
new file mode 100644
index 0000000..9fad6a8
Binary files /dev/null and b/plugins/homeassistant/img/homeassistant.png differ
diff --git a/plugins/homeassistant/mistborn.plugin b/plugins/homeassistant/mistborn.plugin
new file mode 100644
index 0000000..6e89681
--- /dev/null
+++ b/plugins/homeassistant/mistborn.plugin
@@ -0,0 +1,9 @@
+[DEFAULT]
+name = homeassistant
+subdomain = homeassistant
+desc = Home Assistant is an Open source home automation software that puts local control and privacy first.
+img = img/homeassistant.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+resources = resources
+
diff --git a/scripts/services/homeassistant/init.sh b/plugins/homeassistant/resources/init.sh
similarity index 100%
rename from scripts/services/homeassistant/init.sh
rename to plugins/homeassistant/resources/init.sh
diff --git a/scripts/services/Mistborn-homeassistant.service b/plugins/homeassistant/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-homeassistant.service
rename to plugins/homeassistant/service/plugin.service
diff --git a/extra/jellyfin.yml b/plugins/jellyfin/compose/docker-compose.yml
similarity index 100%
rename from extra/jellyfin.yml
rename to plugins/jellyfin/compose/docker-compose.yml
diff --git a/plugins/jellyfin/img/jellyfin.png b/plugins/jellyfin/img/jellyfin.png
new file mode 100644
index 0000000..9179f7a
Binary files /dev/null and b/plugins/jellyfin/img/jellyfin.png differ
diff --git a/plugins/jellyfin/mistborn.plugin b/plugins/jellyfin/mistborn.plugin
new file mode 100644
index 0000000..40aa23f
--- /dev/null
+++ b/plugins/jellyfin/mistborn.plugin
@@ -0,0 +1,8 @@
+[DEFAULT]
+name = jellyfin
+subdomain = jellyfin
+desc = The Free Software Media System. Jellyfin is the volunteer-built media solution that puts you in control of your media. Stream to any device from your own server, with no strings attached.
+img = img/jellyfin.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+
diff --git a/scripts/services/Mistborn-jellyfin.service b/plugins/jellyfin/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-jellyfin.service
rename to plugins/jellyfin/service/plugin.service
diff --git a/extra/jitsi-meet.yml b/plugins/jitsi/compose/docker-compose.yml
similarity index 100%
rename from extra/jitsi-meet.yml
rename to plugins/jitsi/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/jitsi.sh b/plugins/jitsi/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/jitsi.sh
rename to plugins/jitsi/environment/environment.sh
diff --git a/plugins/jitsi/img/jitsi.png b/plugins/jitsi/img/jitsi.png
new file mode 100644
index 0000000..1b37775
Binary files /dev/null and b/plugins/jitsi/img/jitsi.png differ
diff --git a/plugins/jitsi/mistborn.plugin b/plugins/jitsi/mistborn.plugin
new file mode 100644
index 0000000..13170ba
--- /dev/null
+++ b/plugins/jitsi/mistborn.plugin
@@ -0,0 +1,10 @@
+[DEFAULT]
+name = jitsi
+subdomain = jitsi
+desc = Jitsi is a collection of free and open-source multiplatform voice, videoconferencing and instant messaging applications for the web platform, Windows, Linux, Mac OS X and Android.
+img = img/jitsi.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+resources = resources
+
diff --git a/scripts/services/jitsi/iptables_down.sh b/plugins/jitsi/resources/iptables_down.sh
similarity index 100%
rename from scripts/services/jitsi/iptables_down.sh
rename to plugins/jitsi/resources/iptables_down.sh
diff --git a/scripts/services/jitsi/iptables_up.sh b/plugins/jitsi/resources/iptables_up.sh
similarity index 100%
rename from scripts/services/jitsi/iptables_up.sh
rename to plugins/jitsi/resources/iptables_up.sh
diff --git a/scripts/services/Mistborn-jitsi.service b/plugins/jitsi/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-jitsi.service
rename to plugins/jitsi/service/plugin.service
diff --git a/extra/nextcloud.yml b/plugins/nextcloud/compose/docker-compose.yml
similarity index 100%
rename from extra/nextcloud.yml
rename to plugins/nextcloud/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/nextcloud.sh b/plugins/nextcloud/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/nextcloud.sh
rename to plugins/nextcloud/environment/environment.sh
diff --git a/plugins/nextcloud/img/nextcloud.png b/plugins/nextcloud/img/nextcloud.png
new file mode 100644
index 0000000..066e4e8
Binary files /dev/null and b/plugins/nextcloud/img/nextcloud.png differ
diff --git a/plugins/nextcloud/mistborn.plugin b/plugins/nextcloud/mistborn.plugin
new file mode 100644
index 0000000..91bb806
--- /dev/null
+++ b/plugins/nextcloud/mistborn.plugin
@@ -0,0 +1,9 @@
+[DEFAULT]
+name = nextcloud
+subdomain = nextcloud
+desc = Nextcloud is a suite of client-server software for creating and using file hosting services. Nextcloud application functionally is similar to Dropbox.
+img = img/nextcloud.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+
diff --git a/scripts/services/Mistborn-nextcloud.service b/plugins/nextcloud/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-nextcloud.service
rename to plugins/nextcloud/service/plugin.service
diff --git a/extra/onlyoffice.yml b/plugins/onlyoffice/compose/docker-compose.yml
similarity index 100%
rename from extra/onlyoffice.yml
rename to plugins/onlyoffice/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/onlyoffice.sh b/plugins/onlyoffice/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/onlyoffice.sh
rename to plugins/onlyoffice/environment/environment.sh
diff --git a/plugins/onlyoffice/img/onlyoffice.jpg b/plugins/onlyoffice/img/onlyoffice.jpg
new file mode 100644
index 0000000..cd0b762
Binary files /dev/null and b/plugins/onlyoffice/img/onlyoffice.jpg differ
diff --git a/plugins/onlyoffice/mistborn.plugin b/plugins/onlyoffice/mistborn.plugin
new file mode 100644
index 0000000..e94b83b
--- /dev/null
+++ b/plugins/onlyoffice/mistborn.plugin
@@ -0,0 +1,9 @@
+[DEFAULT]
+name = onlyoffice
+subdomain = onlyoffice
+desc = An open source office suite featuring online document editors, platform for document management, corporate communication, mail and project management tools.
+img = img/onlyoffice.jpg
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+
diff --git a/scripts/services/Mistborn-onlyoffice.service b/plugins/onlyoffice/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-onlyoffice.service
rename to plugins/onlyoffice/service/plugin.service
diff --git a/extra/raspap.yml b/plugins/raspap/compose/docker-compose.yml
similarity index 100%
rename from extra/raspap.yml
rename to plugins/raspap/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/raspap.sh b/plugins/raspap/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/raspap.sh
rename to plugins/raspap/environment/environment.sh
diff --git a/plugins/raspap/img/raspap.png b/plugins/raspap/img/raspap.png
new file mode 100644
index 0000000..f1725fa
Binary files /dev/null and b/plugins/raspap/img/raspap.png differ
diff --git a/plugins/raspap/mistborn.plugin b/plugins/raspap/mistborn.plugin
new file mode 100644
index 0000000..7e677b8
--- /dev/null
+++ b/plugins/raspap/mistborn.plugin
@@ -0,0 +1,9 @@
+[DEFAULT]
+name = raspap
+subdomain = raspap
+desc = The easiest, full-featured wireless router setup for Debian-based devices. Period. (Mistborn integration in alpha testing)
+img = img/raspap.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+
diff --git a/scripts/services/Mistborn-raspap.service b/plugins/raspap/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-raspap.service
rename to plugins/raspap/service/plugin.service
diff --git a/extra/rocketchat.yml b/plugins/rocketchat/compose/docker-compose.yml
similarity index 100%
rename from extra/rocketchat.yml
rename to plugins/rocketchat/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/rocketchat.sh b/plugins/rocketchat/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/rocketchat.sh
rename to plugins/rocketchat/environment/environment.sh
diff --git a/plugins/rocketchat/img/rocketchat.png b/plugins/rocketchat/img/rocketchat.png
new file mode 100644
index 0000000..240cbbc
Binary files /dev/null and b/plugins/rocketchat/img/rocketchat.png differ
diff --git a/plugins/rocketchat/mistborn.plugin b/plugins/rocketchat/mistborn.plugin
new file mode 100644
index 0000000..e326cc1
--- /dev/null
+++ b/plugins/rocketchat/mistborn.plugin
@@ -0,0 +1,9 @@
+[DEFAULT]
+name = rocketchat
+subdomain = rocketchat
+desc = Rocket.Chat is the leading open source team chat software solution.
+img = img/rocketchat.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+
diff --git a/scripts/services/Mistborn-rocketchat.service b/plugins/rocketchat/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-rocketchat.service
rename to plugins/rocketchat/service/plugin.service
diff --git a/extra/syncthing.yml b/plugins/syncthing/compose/docker-compose.yml
similarity index 100%
rename from extra/syncthing.yml
rename to plugins/syncthing/compose/docker-compose.yml
diff --git a/plugins/syncthing/img/syncthing.png b/plugins/syncthing/img/syncthing.png
new file mode 100644
index 0000000..5b7b94a
Binary files /dev/null and b/plugins/syncthing/img/syncthing.png differ
diff --git a/plugins/syncthing/mistborn.plugin b/plugins/syncthing/mistborn.plugin
new file mode 100644
index 0000000..25e7364
--- /dev/null
+++ b/plugins/syncthing/mistborn.plugin
@@ -0,0 +1,8 @@
+[DEFAULT]
+name = syncthing
+subdomain = syncthing
+desc = Syncthing is a free, open-source peer-to-peer file synchronization application available for Windows, Mac, Linux, Android, Solaris, Darwin, and BSD. It can sync files between devices on a local network, or between remote devices over the Internet. Data security and data safety are built into the design of the software.
+img = img/syncthing.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+
diff --git a/scripts/services/Mistborn-syncthing.service b/plugins/syncthing/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-syncthing.service
rename to plugins/syncthing/service/plugin.service
diff --git a/extra/tor.yml b/plugins/tor/compose/docker-compose.yml
similarity index 100%
rename from extra/tor.yml
rename to plugins/tor/compose/docker-compose.yml
diff --git a/plugins/tor/img/tor.png b/plugins/tor/img/tor.png
new file mode 100644
index 0000000..49755be
Binary files /dev/null and b/plugins/tor/img/tor.png differ
diff --git a/plugins/tor/mistborn.plugin b/plugins/tor/mistborn.plugin
new file mode 100644
index 0000000..01004fc
--- /dev/null
+++ b/plugins/tor/mistborn.plugin
@@ -0,0 +1,8 @@
+[DEFAULT]
+name = tor
+subdomain = tor
+desc = Tor is free and open-source software for enabling anonymous communication.
+img = img/tor.png
+compose = compose/docker-compose.yml
+service = service/plugin.service
+
diff --git a/scripts/services/Mistborn-tor.service b/plugins/tor/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-tor.service
rename to plugins/tor/service/plugin.service
diff --git a/extra/wazuh.yml b/plugins/wazuh/compose/docker-compose.yml
similarity index 100%
rename from extra/wazuh.yml
rename to plugins/wazuh/compose/docker-compose.yml
diff --git a/scripts/subinstallers/extra/wazuh.sh b/plugins/wazuh/environment/environment.sh
similarity index 100%
rename from scripts/subinstallers/extra/wazuh.sh
rename to plugins/wazuh/environment/environment.sh
diff --git a/plugins/wazuh/mistborn.plugin b/plugins/wazuh/mistborn.plugin
new file mode 100644
index 0000000..cd6a8d3
--- /dev/null
+++ b/plugins/wazuh/mistborn.plugin
@@ -0,0 +1,8 @@
+[DEFAULT]
+name = wazuh
+subdomain = wazuh
+compose = compose/docker-compose.yml
+service = service/plugin.service
+environment = environment/environment.sh
+resources = resources
+
diff --git a/scripts/services/wazuh/agent.sh b/plugins/wazuh/resources/agent.sh
similarity index 100%
rename from scripts/services/wazuh/agent.sh
rename to plugins/wazuh/resources/agent.sh
diff --git a/scripts/services/wazuh/agent_start.sh b/plugins/wazuh/resources/agent_start.sh
similarity index 100%
rename from scripts/services/wazuh/agent_start.sh
rename to plugins/wazuh/resources/agent_start.sh
diff --git a/scripts/services/wazuh/agent_stop.sh b/plugins/wazuh/resources/agent_stop.sh
similarity index 100%
rename from scripts/services/wazuh/agent_stop.sh
rename to plugins/wazuh/resources/agent_stop.sh
diff --git a/scripts/services/wazuh/suricata/suricata_init.sh b/plugins/wazuh/resources/suricata/suricata_init.sh
similarity index 100%
rename from scripts/services/wazuh/suricata/suricata_init.sh
rename to plugins/wazuh/resources/suricata/suricata_init.sh
diff --git a/scripts/services/wazuh/suricata/suricata_start.sh b/plugins/wazuh/resources/suricata/suricata_start.sh
similarity index 100%
rename from scripts/services/wazuh/suricata/suricata_start.sh
rename to plugins/wazuh/resources/suricata/suricata_start.sh
diff --git a/scripts/services/wazuh/suricata/suricata_stop.sh b/plugins/wazuh/resources/suricata/suricata_stop.sh
similarity index 100%
rename from scripts/services/wazuh/suricata/suricata_stop.sh
rename to plugins/wazuh/resources/suricata/suricata_stop.sh
diff --git a/scripts/services/Mistborn-wazuh.service b/plugins/wazuh/service/plugin.service
similarity index 100%
rename from scripts/services/Mistborn-wazuh.service
rename to plugins/wazuh/service/plugin.service