A bit more stable

All actions and filters have been added back in, into their respected
places. More classes have been created as these are all essentially
module tasks and not core tasks.