diff --git a/.gitignore b/.gitignore
index d96e447..d91594c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ cty.json
 cty.zip
 
 botenv/
+data/
 
 
 #########################################################
diff --git a/Makefile b/Makefile
index 82306f8..ea665f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,24 @@
-# A quick installation script for discord bots.
-#
+# A quick installation script for painless discord bots.
+# v1.1.0
 # Copyright (c) 2019 0x5c
 # Released under the terms of the MIT license.
-#
-# https://github.com/0x5c/discord.py-quickinstall
+# Part of:
+# https://github.com/0x5c/quick-bot-no-pain
 
 
-#### Setup ####
 .DEFAULT_GOAL := help
 
-## Variables ##
+### Variables ###
 # Those are the defaults; they can be over-ridden if specified
 # at en environment level or as 'make' arguments.
 BOTENV ?= botenv
-PY3DOT ?= 7
-PIP_OUTPUT ?= q
+PYTHON_BIN ?= python3.7
+PIP_OUTPUT ?= -q
 
 
-# Define some rules as phony
-.PHONY: help install clean onlyenv
-
-
-
-#### Targets ####
-
-## Support targets ##
+### Support targets ###
 
+.PHONY: help
 help:
 	@echo ""
 	@echo "\033[97m>>>>>>  Default dummy target  <<<<<<"
@@ -35,16 +28,17 @@ help:
 	@echo "\033[0m"
 
 
-## Actual install/setup targets ##
+### Actual install/setup targets ###
 
 # Main install target
+.PHONY: install
 install: $(BOTENV)/req_done options.py keys.py
 
 # Virual environment setup
 $(BOTENV)/success:
 ifneq ("$(wildcard ./$(BOTENV).)",)
 	@echo "\033[94m--> Creating the virtual environment...\033[0m"
-	@python3.$(PY3DOT) -m venv $(BOTENV)
+	@$(PYTHON_BIN) -m venv $(BOTENV)
 	@touch $(BOTENV)/success
 endif
 
@@ -52,17 +46,19 @@ endif
 $(BOTENV)/req_done: requirements.txt $(BOTENV)/success
 	@echo "\033[34;1m--> Installing the dependencies...\033[0m"
 	@. $(BOTENV)/bin/activate; \
-	pip install -${PIP_OUTPUT} -U pip setuptools wheel; \
-	pip install -${PIP_OUTPUT} -U -r requirements.txt
+		pip install ${PIP_OUTPUT} -U pip setuptools wheel; \
+		pip install ${PIP_OUTPUT} -U -r requirements.txt
 	@touch $(BOTENV)/req_done
+	@mkdir ./data
 
 # Copying templates
 options.py keys.py:
 	@echo "\033[34;1m--> Copying template files...\033[0m"
-	@cp -nv ./templates/template_$@ ./$@
-	@touch ./$@
+	@cp -nv ./templates/template_$@ ./data/$@
+	@touch ./data/$@
 
 # Deletes the python cache and the virtual environment
+.PHONY: clean
 clean:
 	@echo "\033[34;1m--> Removing python cache files...\033[0m"
 	rm -rf __pycache__
@@ -70,8 +66,9 @@ clean:
 	rm -rf $(BOTENV)
 
 
-## Dev targets ##
+### Dev targets ###
 
 
-## Weird dev targets ##
+### Special targets ###
+.PHONY: onlyenv
 onlyenv: $(BOTENV)/success
diff --git a/main.py b/main.py
index 911307e..636839c 100644
--- a/main.py
+++ b/main.py
@@ -15,8 +15,8 @@ from discord.ext import commands, tasks
 
 import info
 
-import options as opt
-import keys
+from data import options as opt
+from data import keys as keys
 
 
 # --- Settings ---