Refactored names of packages