refactored base packages a bit