@@ -4,12 +4,11 @@ namespace elanpl\L3;

 class Application{

     public $Config; // L3 Config object

-    public $Request; // build from received HTTP request

+    public $Request; // build from received HTTP request or created in L3 Config object

     public $Response; // response to be send

     public $Router; // routing engine

     public $Serialization; // serialization engine

     public $BaseDirectory; // directory root of the application

-    public $ConfigDirectory; // directory containing application configuration files

     public $ControllersDirectory; // subdirectory/namespace part added to controller class 

     public $ViewsDirectory; // subdirectory to search for the view files

     public $ApplicationDirectory; // subdirectory/namespace part of the application

@@ -20,6 +19,14 @@ class Application{

     public function __construct($config){

         //set L3 application config

         $this->Config = $config;

+        // directory root of the application

+        $this->BaseDirectory = $config->getBaseDirectory();

+        // subdirectory/namespace part added to controller class

+        $this->ControllersDirectory = $config->getControllersDirectory();

+        // subdirectory to search for the view files 

+        $this->ViewsDirectory = $config->getViewsDirectory();

+        // subdirectory/namespace part of the application

+        $this->ApplicationDirectory = $config->getApplicationDirectory();

         //create request object

         $this->Request = $this->Config->getRequest();

         //create router object

@@ -43,23 +50,6 @@ class Application{

         return $this->Router->link($name, $parameters);

     }

-    public function LoadApplicationConfiguration(){

-        //include routing configuration

-        include_once($this->ConfigDirectory."routing.php");

-        //include the application configuration

-        include_once($this->ConfigDirectory.'app.php');

-    }

-

-    public function LoadConfigFile($file){

-        //include configuration file

-        return include_once($this->ConfigDirectory.$file);

-    }

-

-    public function IncludeFromConfigDir($file){

-        //include configuration file

-        return include($this->ConfigDirectory.$file);

-    }

-

     /*

     //not need - PSR-4 autoload handles that

     function IncludeControler($Controller){

@@ -10,4 +10,20 @@ class Config{

     public function getRouting(){

         return new \app\config\routing();

     }

+

+    public function getBaseDirectory(){

+        return _L3_BASE_PATH;

+    }

+

+    public function getApplicationDirectory(){

+        return "app";

+    }

+

+    public function getControllersDirectory(){

+        return "controllers";

+    }

+

+    public function getViewsDirectory(){

+        return "views";

+    }

 }

\ No newline at end of file