Refactor and clean package naming for consistency