Refactor packages for consistency