I'm hoping that I did this right
Move some stuff from load/unload module to register/unregister plugins