Restructure framework, generally reorganize

This should have been, like, ten commits.