diff --git a/cloudbot.default.json b/config.default
similarity index 100%
rename from cloudbot.default.json
rename to config.default
diff --git a/core/bot.py b/core/bot.py
index 524d79a..68ea15c 100644
--- a/core/bot.py
+++ b/core/bot.py
@@ -53,11 +53,9 @@ class Bot(object):
         self.logger.debug("Logging engine started.")
 
         # data folder
-        self.data_dir = os.path.abspath('data/{}'.format(self.name))
+        self.data_dir = os.path.abspath('data')
         if not os.path.exists(self.data_dir):
             self.logger.debug("Data folder not found, creating.")
-            if not os.path.exists(os.path.abspath('data')):
-                os.mkdir(os.path.abspath('data'))
             os.mkdir(self.data_dir)
             self.logger.debug("Created data folder.")
 
diff --git a/core/config.py b/core/config.py
index 4e6b9e4..fad152c 100755
--- a/core/config.py
+++ b/core/config.py
@@ -8,8 +8,8 @@ from watchdog.tricks import Trick
 
 
 class Config(dict):
-    def __init__(self, name, logger, *args, **kwargs):
-        self.filename = "{}.config.json".format(name)
+    def __init__(self, logger, *args, **kwargs):
+        self.filename = "config.json"
         self.path = os.path.abspath(self.filename)
         self.logger = logger
         self.update(*args, **kwargs)