Refactored naming and packaging