small restructure of devserver