Bit of cleanup/relocating and fixing disabling of plugin