Rearranged plugins and fixed tank folder creation

Previous code didn't really work, in many ways.
Now it's cleaner and solved much more nicely, possibly as to persist