Migrated/fixed a bunch of classes into this more general package