a bit of reorganising and renaming