Rework package setup