package rework + server integration