Revert "move server packages"

This reverts commit 389d6cee10467cc4ac3bfa767af943808ee27f11.