2.0 wip. heirarchy is fine by class/filenames are ridiculous.