moving server into package