Refactor Packages