Move stuff around, added base for plugin side of things