Remove singleton classes where every method takes a Generation param to instead be regular classes with a Generation member

[scheibo]

Everything in the package should be made to be generation-aware and a more conventional pattern will make this more straightforward.