refactored package conventions