renaming and organization