Refactored package naming