Move all miscellaneous Spout code to a single location.