Move server and buildfile into server pkg Upstream-commit: 2c10fcc432f8a541aac2c7feb1a453cfc16e4d0b Component: engine