Code refactor Packages