diff --git a/src/lib.js b/src/lib.js
index b5ebbed..a109fcf 100644
--- a/src/lib.js
+++ b/src/lib.js
@@ -5,14 +5,14 @@ var exec = require('child_process').exec;
 var probe = require('node-ffprobe');
 var crypto = require('crypto');
 var Mime = require('mime');
+var cfg = require('../cfg/main.json');
 
-var bot, sql, cfg, debug;
+var bot, sql, debug;
 
 module.exports = Lib;
-function Lib(tbot, tsql, tcfg) {
+function Lib(tbot, tsql) {
   this.bot = bot = tbot;
   this.sql = sql = tsql;
-  this.cfg = cfg = tcfg;
   this.debug = debug = false;
   this.admins = [];
 }
diff --git a/src/main.js b/src/main.js
index 85ad053..695ab4d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,4 @@
-var cfg = require('../../cfg.json');
+var cfg = require('../cfg/irc.json');
 var fs = require('fs-extra');
 var mysql = require('mysql');
 var bot = require('coffea')();
@@ -6,9 +6,8 @@ var Lib = require('./lib.js');
 var Websrv = require('./websrv.js');
 
 var sql;
-
 var haDC = () => {
-  sql = mysql.createConnection(cfg.mysql);
+  sql = mysql.createConnection(require('../cfg/mysql.json'));
   sql.connect((err) => {
     if(err) setTimeout(haDC, 2000);
   });
@@ -18,10 +17,10 @@ var haDC = () => {
 };
 haDC();
 
-var lib = new Lib(bot, sql, cfg);
-var websrv = new Websrv(bot, sql, cfg, lib);
+var lib = new Lib(bot, sql);
+var websrv = new Websrv(bot, sql, lib);
 
-cfg.server.forEach((e,i,a) => {
+cfg.forEach((e,i,a) => {
   bot.add({
     "name": e.name,
     "host": e.host,
diff --git a/src/websrv.js b/src/websrv.js
index 10dba95..c746b80 100644
--- a/src/websrv.js
+++ b/src/websrv.js
@@ -2,15 +2,15 @@ var fs = require('fs-extra');
 var http = require('http');
 var path = require('path');
 var swig = require('swig');
+var cfg = require('../cfg/websrv.json');
 
 var templates = {};
-var bot, sql, cfg, lib;
+var bot, sql, lib;
 
 module.exports = Websrv;
-function Websrv(tbot, tsql, tcfg, tlib) {
+function Websrv(tbot, tsql, tlib) {
   this.bot = bot = tbot;
   this.sql = sql = tsql;
-  this.cfg = cfg = tcfg;
   this.lib = lib = tlib;
   
   http.createServer((req, res) => {
@@ -253,7 +253,7 @@ function Websrv(tbot, tsql, tcfg, tlib) {
       res.writeHead(403);
       res.end('403 - forbidden');
     }
-  }).listen(cfg.webserver.port);
+  }).listen(cfg.port);
 }
 
 Websrv.prototype.getTpls = () => {