Some renaming, reorganising