did a bit of reorganizing