more reorganization and renaming