Refactor to change package name back