Shuffle some objects around to make the framework structure slightly more sane