More reorganization and renaming.