Second phase of server/pack/plugin refactor