Merge in plugins and restructure from redpill branch