FIX: moved file locations, server instantiation.

Author: Jon-Biz

server.js

@@ -3,10 +3,10 @@ const EventEmitter = require('events')
 const series = require('run-series')
 const string2compact = require('string2compact')
 
-const attachHttpServer = require("./server/attachHttpServer");
-const attachUdpServer = require('./server/attachUdpServer')
-const attachWSServer = require('./server/attachWSServer')
-const setupStatsRoute = require('./server/setupStatsRoute')
+const attachHttpServer = require('./services/attachHttp')
+const attachUdpServer = require('./services/attachUdp')
+const attachWSServer = require('./services/attachWS')
+const setupStatsRoute = require('./services/statsRoute')
 const common = require('./lib/common')
 const Swarm = require('./lib/server/swarm')
 
@@ -333,4 +333,4 @@ function toNumber (x) {
 
 function noop () {}
 
-module.exports = new Server()
+module.exports = Server

services/attachHttp/parseHttpRequest.js

@@ -1,6 +1,6 @@
 module.exports = parseHttpRequest
 
-var common = require('../common')
+const common = require('../../lib/common')
 
 function parseHttpRequest (req, opts) {
   if (!opts) opts = {}

services/attachUdp/parseUdpRequest.js

@@ -1,12 +1,12 @@
 module.exports = parseUdpRequest
 
-var ipLib = require('ip')
-var common = require('../common')
+const ipLib = require('ip')
+const common = require('../../lib/common')
 
 function parseUdpRequest (msg, rinfo) {
   if (msg.length < 16) throw new Error('received packet is too short')
 
-  var params = {
+  const params = {
     connectionId: msg.slice(0, 8), // 64-bit
     action: msg.readUInt32BE(8),
     transactionId: msg.readUInt32BE(12),
@@ -29,7 +29,7 @@ function parseUdpRequest (msg, rinfo) {
     params.event = common.EVENT_IDS[msg.readUInt32BE(80)]
     if (!params.event) throw new Error('invalid event') // early return
 
-    var ip = msg.readUInt32BE(84) // optional
+    const ip = msg.readUInt32BE(84) // optional
     params.ip = ip
       ? ipLib.toString(ip)
       : rinfo.address

services/attachWS/index.js

@@ -1,6 +1,6 @@
 const WebSocketServer = require("ws").Server
 const parseWebSocketRequest = require("./parseWebsocketRequest")
-const attachHttpServer = require("../attachHttpServer")
+const attachHttpServer = require("../attachHttp")
 
 function setupHttpService(server) {
   if (server.http) return server.http

services/attachWS/parseWebsocketRequest.js

@@ -1,6 +1,6 @@
 module.exports = parseWebSocketRequest
 
-var common = require('../common')
+const common = require('../../lib/common')
 
 function parseWebSocketRequest (socket, opts, params) {
   if (!opts) opts = {}