diff --git a/src/main.ts b/src/main.ts
index 81875ac..850e632 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,11 +1,6 @@
-import * as express from 'express';
-import { ConfigurationHelper, conf } from "./helpers/ConfigHelper";
+import { ConfigurationHelper } from "./helpers/ConfigHelper";
 import { DatabaseHelper } from "./helpers/DatabaseHelper";
-import { Routes, RouteType } from './controllers/Routes';
-import { RequestHandler } from './entities/RequestHandler';
-import * as fileUpload  from 'express-fileupload';
-import * as expressWs from 'express-ws';
-import * as ws from 'ws';
+import { startServer } from "./server";
 
 /**
  * Main project script
@@ -27,86 +22,4 @@ async function init() {
 
 	await startServer();
 }
-init();
-
-/**
- * Run the server
- */
-async function startServer() {
-	// Start HTTP Server
-	const app = expressWs(express()).app;
-
-	app.use(express.urlencoded({extended: true}));
-
-	app.use(fileUpload());
-
-	// Check if the server is running behing a proxy
-	if(conf().proxy) {
-		console.info("Running behind proxy: " + conf().proxy);
-		app.set("trust proxy", conf().proxy);
-	}
-
-	// Process the list of routes
-	Routes.forEach(route => {
-		
-		// Callback is common to all requests type
-		const cb = async (req : express.Request, res : express.Response)=> {
-			const handler = new RequestHandler(req, res);
-
-			try {
-
-				// Check API tokens
-				await handler.checkAPITokens();
-
-				// Check user tokens
-				await handler.checkUserTokens(route.needLogin);
-
-				const cb = route.cb(handler);
-				if(cb)
-					await cb;
-
-			} catch(e) {
-				console.error(e);
-
-				// Send a response to the server, if it has not
-				// been done yet
-				if(!handler.sentResponse)
-					res.status(500).send({
-						error: {
-							code: 500,
-							message: "Internal error"
-						}
-					})
-			}
-		};
-
-		// WebSocket callback
-		const wsCB = async (ws: ws, req: express.Request) => {
-			try {
-				await route.wsCallback(req, ws);
-			} catch(e) {
-				console.error(e);
-			}
-		}
-
-		// Call the appropriate function
-		switch(route.type) {
-			case RouteType.GET:
-				app.get(route.path, cb);
-				break;
-			
-			case RouteType.WS:
-				app.ws(route.path, wsCB);
-				break;
-			
-			default:
-				app.post(route.path, cb);
-				break;
-		}	
-
-	})
-
-	app.listen(conf().port, () => {
-		console.info("Started server on http://127.0.0.1:" + conf().port);
-	});
-}
\ No newline at end of file
+init();
\ No newline at end of file
diff --git a/src/server.ts b/src/server.ts
new file mode 100644
index 0000000..6400ed6
--- /dev/null
+++ b/src/server.ts
@@ -0,0 +1,95 @@
+import * as express from 'express';
+import { conf } from "./helpers/ConfigHelper";
+import { Routes, RouteType } from './controllers/Routes';
+import { RequestHandler } from './entities/RequestHandler';
+import * as fileUpload  from 'express-fileupload';
+import * as expressWs from 'express-ws';
+import * as ws from 'ws';
+
+/**
+ * Main Comunic server
+ * 
+ * @author Pierre Hubert
+ */
+
+/**
+ * Run the server
+ */
+export async function startServer() {
+	// Start HTTP Server
+	const app = expressWs(express()).app;
+
+	app.use(express.urlencoded({extended: true}));
+
+	app.use(fileUpload());
+
+	// Check if the server is running behing a proxy
+	if(conf().proxy) {
+		console.info("Running behind proxy: " + conf().proxy);
+		app.set("trust proxy", conf().proxy);
+	}
+
+	// Process the list of routes
+	Routes.forEach(route => {
+		
+		// Callback is common to all requests type
+		const cb = async (req : express.Request, res : express.Response)=> {
+			const handler = new RequestHandler(req, res);
+
+			try {
+
+				// Check API tokens
+				await handler.checkAPITokens();
+
+				// Check user tokens
+				await handler.checkUserTokens(route.needLogin);
+
+				const cb = route.cb(handler);
+				if(cb)
+					await cb;
+
+			} catch(e) {
+				console.error(e);
+
+				// Send a response to the server, if it has not
+				// been done yet
+				if(!handler.sentResponse)
+					res.status(500).send({
+						error: {
+							code: 500,
+							message: "Internal error"
+						}
+					})
+			}
+		};
+
+		// WebSocket callback
+		const wsCB = async (ws: ws, req: express.Request) => {
+			try {
+				await route.wsCallback(req, ws);
+			} catch(e) {
+				console.error(e);
+			}
+		}
+
+		// Call the appropriate function
+		switch(route.type) {
+			case RouteType.GET:
+				app.get(route.path, cb);
+				break;
+			
+			case RouteType.WS:
+				app.ws(route.path, wsCB);
+				break;
+			
+			default:
+				app.post(route.path, cb);
+				break;
+		}	
+
+	})
+
+	app.listen(conf().port, () => {
+		console.info("Started server on http://127.0.0.1:" + conf().port);
+	});
+}
\ No newline at end of file