A bunch of reorganization/tweaks.  Following BitSquid's lead here.