Major changes to plugin arch
Major changes to plugin arch