Reorganise server package a bit