package cleanup and renames