Moved server utilities back to same file