refacored packaging