Refactored naming of packages