diff --git a/src/class.db.mysql.php b/src/includes/class.db.mysql.php
similarity index 100%
rename from src/class.db.mysql.php
rename to src/includes/class.db.mysql.php
diff --git a/src/class.db.sqlite3.php b/src/includes/class.db.sqlite3.php
similarity index 100%
rename from src/class.db.sqlite3.php
rename to src/includes/class.db.sqlite3.php
diff --git a/src/init.php b/src/init.php
index d2eefd0..0ba815f 100644
--- a/src/init.php
+++ b/src/init.php
@@ -29,7 +29,7 @@ date_default_timezone_set(Config::get('timezone'));
 # MySQL Database Connection
 if(Config::get('db') == 'mysql')
 {
-	require_once(MTTPATH. 'class.db.mysql.php');
+	require_once(MTTINC. 'class.db.mysql.php');
 	$db = DBConnection::init(new Database_Mysql);
 	try {
 		$db->connect(Config::get('mysql.host'), Config::get('mysql.user'), Config::get('mysql.password'), Config::get('mysql.db'));
@@ -43,7 +43,7 @@ if(Config::get('db') == 'mysql')
 # SQLite3 (pdo_sqlite)
 elseif(Config::get('db') == 'sqlite')
 {
-	require_once(MTTPATH. 'class.db.sqlite3.php');
+	require_once(MTTINC. 'class.db.sqlite3.php');
 	$db = DBConnection::init(new Database_Sqlite3);
 	$db->connect(MTTPATH. 'db/todolist.db');
 }
diff --git a/src/setup.php b/src/setup.php
index 3ab0cfc..af5d2d9 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -36,6 +36,7 @@ if($config['db'] != '')
 else
 {
 	if(!defined('MTTPATH')) define('MTTPATH', dirname(__FILE__) .'/');
+	if(!defined('MTTINC'))  define('MTTINC', MTTPATH. 'includes/');
 	require_once(MTTPATH. 'common.php');
 	Config::loadConfig($config);
 	unset($config); 
@@ -335,7 +336,7 @@ function testConnect(&$error)
 	{
 		if(Config::get('db') == 'mysql')
 		{
-			require_once(MTTPATH. 'class.db.mysql.php');
+			require_once(MTTINC. 'class.db.mysql.php');
 			$db = new Database_Mysql;
 			$db->connect(Config::get('mysql.host'), Config::get('mysql.user'), Config::get('mysql.password'), Config::get('mysql.db'));
 		} else
@@ -345,7 +346,7 @@ function testConnect(&$error)
 
 			if(!is_writable(MTTPATH. 'db/')) throw new Exception("database directory ('db') is not writable");
 
-			require_once(MTTPATH. 'class.db.sqlite3.php');
+			require_once(MTTINC. 'class.db.sqlite3.php');
 			$db = new Database_Sqlite3;
 			$db->connect(MTTPATH. 'db/todolist.db');
 		}