A bit of reorganizing