Did a bit of reorganizing.