package names refactor and refresh