Split into subspecs by class

More modular = more win.

Tag 0.9.14.2