changed hierarchy in server module;