diff --git a/.putout.json b/.putout.json
index 2c2ee834..d8698a86 100644
--- a/.putout.json
+++ b/.putout.json
@@ -25,9 +25,9 @@
             "nodejs/remove-process-exit": "on"
         },
         "server/{server,exit}.js": {
-            "nodejs/emove-process-exit": "off"
+            "nodejs/remove-process-exit": "off"
         },
-        "server/{server,exit,terminal,distribute/log}.js": {
+        "server/{server,exit,terminal,distribute/log}.{js,mjs}": {
             "remove-console": "off"
         },
         "client/{client,cloudcmd,load-module}.js": {
diff --git a/bin/cloudcmd.mjs b/bin/cloudcmd.mjs
index 450350b9..301e01dc 100755
--- a/bin/cloudcmd.mjs
+++ b/bin/cloudcmd.mjs
@@ -269,7 +269,7 @@ function version() {
 }
 
 async function start(options, config) {
-    const SERVER = DIR_SERVER + 'server.js';
+    const SERVER = DIR_SERVER + 'server.mjs';
     
     if (!args.server)
         return;
diff --git a/server/server.js b/server/server.mjs
similarity index 74%
rename from server/server.js
rename to server/server.mjs
index e12f29f0..98de22cf 100644
--- a/server/server.js
+++ b/server/server.mjs
@@ -1,23 +1,20 @@
-'use strict';
+import cloudcmd from './cloudcmd.js';
 
-const DIR_SERVER = './';
-const cloudcmd = require(DIR_SERVER + 'cloudcmd');
+import http from 'http';
+import {promisify} from 'util';
+import currify from 'currify';
+import squad from 'squad';
+import tryToCatch from 'try-to-catch';
+import wraptile from 'wraptile';
+import compression from 'compression';
+import threadIt from 'thread-it';
 
-const http = require('http');
-const {promisify} = require('util');
-const currify = require('currify');
-const squad = require('squad');
-const tryToCatch = require('try-to-catch');
-const wraptile = require('wraptile');
-const compression = require('compression');
-const threadIt = require('thread-it');
+import exit from './exit.js';
+import opn from 'open';
 
-const exit = require(DIR_SERVER + 'exit');
-const opn = require('open');
-
-const express = require('express');
-const io = require('socket.io');
-const tryRequire = require('tryrequire');
+import express from 'express';
+import {Server} from 'socket.io';
+import tryRequire from 'tryrequire';
 
 const bind = (f, self) => f.bind(self);
 
@@ -33,7 +30,7 @@ const promisifySelf = squad(promisify, bind);
 const exitPort = two(exit, 'cloudcmd --port: %s');
 const logger = tryRequire('morgan');
 
-module.exports = async (options, config) => {
+export default async (options, config) => {
     const prefix = config('prefix');
     const port = process.env.PORT /* c9           */
                  || config('port');
@@ -51,7 +48,7 @@ module.exports = async (options, config) => {
     if (prefix)
         app.get('/', (req, res) => res.redirect(prefix + '/'));
     
-    const socketServer = io(server, {
+    const socketServer = new Server(server, {
         path: `${prefix}/socket.io`,
     });