Tweaks
Move things around to make top level cleaner.