Reworked some of the classes to make the plugging of modules more sensical.