re-arranged packages a little