Moved Server(DataType) to package data, where it belongs.