diff --git a/Core/Frameworks/Baikal/Framework.php b/Core/Frameworks/Baikal/Framework.php
index 95a3730..90c4492 100755
--- a/Core/Frameworks/Baikal/Framework.php
+++ b/Core/Frameworks/Baikal/Framework.php
@@ -80,8 +80,6 @@ class Framework extends \Flake\Core\Framework {
 
 					set_error_handler("\Baikal\Framework::exception_error_handler");
 					
-					# SabreDAV Autoloader 
-					require_once(BAIKAL_PATH_SABREDAV . 'autoload.php');
 				}
 			}
 		}
diff --git a/Core/Frameworks/Baikal/WWWRoot/cal.php b/Core/Frameworks/Baikal/WWWRoot/cal.php
index 2a294eb..f1cd4a4 100755
--- a/Core/Frameworks/Baikal/WWWRoot/cal.php
+++ b/Core/Frameworks/Baikal/WWWRoot/cal.php
@@ -35,10 +35,10 @@ if(file_exists(getcwd() . "/Core")) {
 	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
 }
 
-# Bootstraping Flake
-require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
-\Flake\Framework::bootstrap();
+require PROJECT_PATH_ROOT . '/vendor/autoload.php';
 
+# Bootstraping Flake
+\Flake\Framework::bootstrap();
 # Bootstrapping Baïkal
 \Baikal\Framework::bootstrap();
 
@@ -67,4 +67,4 @@ $server->addPlugin(new \Sabre\DAVACL\Plugin());
 $server->addPlugin(new \Sabre\CalDAV\Plugin());
 
 # And off we go!
-$server->exec();
\ No newline at end of file
+$server->exec();
diff --git a/Core/Frameworks/Baikal/WWWRoot/card.php b/Core/Frameworks/Baikal/WWWRoot/card.php
index 436a5c0..b3906a9 100755
--- a/Core/Frameworks/Baikal/WWWRoot/card.php
+++ b/Core/Frameworks/Baikal/WWWRoot/card.php
@@ -35,8 +35,9 @@ if(file_exists(getcwd() . "/Core")) {
 	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
 }
 
+require PROJECT_PATH_ROOT . '/vendor/autoload.php';
+
 # Bootstraping Flake
-require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
@@ -67,4 +68,4 @@ $server->addPlugin(new \Sabre\CardDAV\Plugin());
 $server->addPlugin(new \Sabre\DAVACL\Plugin());
 
 # And off we go!
-$server->exec();
\ No newline at end of file
+$server->exec();
diff --git a/Core/Frameworks/Baikal/WWWRoot/index.php b/Core/Frameworks/Baikal/WWWRoot/index.php
index c99de30..fb83024 100755
--- a/Core/Frameworks/Baikal/WWWRoot/index.php
+++ b/Core/Frameworks/Baikal/WWWRoot/index.php
@@ -34,8 +34,9 @@ if(file_exists(getcwd() . "/Core")) {
 	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
 }
 
+require PROJECT_PATH_ROOT . '/vendor/autoload.php';
+
 # Bootstraping Flake
-require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
diff --git a/Core/Frameworks/BaikalAdmin/WWWRoot/index.php b/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
index b949a80..177f5f8 100755
--- a/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
+++ b/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
@@ -31,7 +31,7 @@ define("BAIKAL_CONTEXT", TRUE);
 define("BAIKAL_CONTEXT_ADMIN", TRUE);
 define("PROJECT_CONTEXT_BASEURI", "/admin/");
 
-if(file_exists(dirname(getcwd()) . "/Core")) {
+if(file_exists(getcwd(). "/Core")) {
 	# Flat FTP mode
 	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
 } else {
@@ -39,8 +39,9 @@ if(file_exists(dirname(getcwd()) . "/Core")) {
 	define("PROJECT_PATH_ROOT", dirname(dirname(getcwd())) . "/");	#../../
 }
 
+require PROJECT_PATH_ROOT . '/vendor/autoload.php';
+
 # Bootstraping Flake
-require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");	# ../../
 \Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
diff --git a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
index 48911af..249e350 100755
--- a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
+++ b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
@@ -40,7 +40,7 @@ if(file_exists(dirname(dirname(getcwd())) . "/Core")) {
 }
 
 # Bootstraping Flake
-require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
+require PROJECT_PATH_ROOT . "vendor/autoload.php";
 \Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
@@ -74,4 +74,4 @@ if(!defined("BAIKAL_CONFIGURED_VERSION")) {
 }
 
 # Render the page
-echo $oPage->render();
\ No newline at end of file
+echo $oPage->render();
diff --git a/composer.json b/composer.json
index b8485d8..0008184 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,9 @@
     },
     "autoload": {
         "psr-0" : {
-            "Baikal"         : "Core/Frameworks/"
+            "Baikal"         : "Core/Frameworks/",
+            "Flake"          : "Core/Frameworks/",
+            "Formal"         : "Core/Frameworks/"
         }
     },
     "support" : {