diff --git a/images/README.md b/images/README.md
new file mode 100644
index 00000000..fedf12ba
--- /dev/null
+++ b/images/README.md
@@ -0,0 +1,2 @@
+Please **don't** put screenshots of your plugins here. 
+Put them right next to your plugins.
diff --git a/plugins/ejabberd/ejabberd_scanlog b/plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog
similarity index 100%
rename from plugins/ejabberd/ejabberd_scanlog
rename to plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog
diff --git a/images/network/ejabberd_scanlog.png b/plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog.png
similarity index 100%
rename from images/network/ejabberd_scanlog.png
rename to plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog.png
diff --git a/plugins/network/netstat_bsd_ b/plugins/network/netstat_bsd_/netstat_bsd_
similarity index 100%
rename from plugins/network/netstat_bsd_
rename to plugins/network/netstat_bsd_/netstat_bsd_
diff --git a/images/network/netstat_bsd_.png b/plugins/network/netstat_bsd_/netstat_bsd_.png
similarity index 100%
rename from images/network/netstat_bsd_.png
rename to plugins/network/netstat_bsd_/netstat_bsd_.png
diff --git a/plugins/system/snmp__fn b/plugins/system/snmp__fn/snmp__fn
similarity index 100%
rename from plugins/system/snmp__fn
rename to plugins/system/snmp__fn/snmp__fn
diff --git a/images/snmp__fn-cpu.png b/plugins/system/snmp__fn/snmp__fn-cpu.png
similarity index 100%
rename from images/snmp__fn-cpu.png
rename to plugins/system/snmp__fn/snmp__fn-cpu.png
diff --git a/images/snmp__fn-memory.png b/plugins/system/snmp__fn/snmp__fn-memory.png
similarity index 100%
rename from images/snmp__fn-memory.png
rename to plugins/system/snmp__fn/snmp__fn-memory.png
diff --git a/images/snmp__fn-sessions.png b/plugins/system/snmp__fn/snmp__fn-sessions.png
similarity index 100%
rename from images/snmp__fn-sessions.png
rename to plugins/system/snmp__fn/snmp__fn-sessions.png
diff --git a/images/snmp__fn-vpnsessions.png b/plugins/system/snmp__fn/snmp__fn-vpnsessions.png
similarity index 100%
rename from images/snmp__fn-vpnsessions.png
rename to plugins/system/snmp__fn/snmp__fn-vpnsessions.png