Starting to refactor Packages