Reorganise things to play better with server