more changes for org move