refactoring package names to be more consistent