diff --git a/source/helpers/ics.php b/source/helpers/ics.php
index 8d68258..91764ed 100644
--- a/source/helpers/ics.php
+++ b/source/helpers/ics.php
@@ -3,8 +3,8 @@
 namespace davina\helpers\ics;
 
 require_once('vendor/autoload.php');
-require_once('helpers/string.php');
-require_once('helpers/pit.php');
+require_once(DIR_LOGIC . '/helpers/string.php');
+require_once(DIR_LOGIC . '/helpers/pit.php');
 
 
 /**
diff --git a/source/helpers/pit.php b/source/helpers/pit.php
index a678c2a..9866dc2 100644
--- a/source/helpers/pit.php
+++ b/source/helpers/pit.php
@@ -2,8 +2,8 @@
 
 namespace davina\helpers\pit;
 
-require_once('helpers/call.php');
-require_once('helpers/string.php');
+require_once(DIR_LOGIC . '/helpers/call.php');
+require_once(DIR_LOGIC . '/helpers/string.php');
 
 
 /**
diff --git a/source/main.php b/source/main.php
index a1761b3..c4b4bdd 100644
--- a/source/main.php
+++ b/source/main.php
@@ -2,13 +2,15 @@
 
 namespace davina;
 
+define("DIR_LOGIC", "logic");
+
 require_once('vendor/autoload.php');
-require_once('base.php');
-require_once('overwrites/principal_backend.php');
-require_once('overwrites/auths/_factory.php');
-require_once('overwrites/caldav_backend.php');
-require_once('sources/_factory.php');
-require_once('conf.php');
+require_once(DIR_LOGIC . '/base.php');
+require_once(DIR_LOGIC . '/overwrites/principal_backend.php');
+require_once(DIR_LOGIC . '/overwrites/auths/_factory.php');
+require_once(DIR_LOGIC . '/overwrites/caldav_backend.php');
+require_once(DIR_LOGIC . '/sources/_factory.php');
+require_once(DIR_LOGIC . '/conf.php');
 
 
 function main(
diff --git a/source/overwrites/auths/_factory.php b/source/overwrites/auths/_factory.php
index 1de1a6b..b24f76f 100644
--- a/source/overwrites/auths/_factory.php
+++ b/source/overwrites/auths/_factory.php
@@ -3,9 +3,9 @@
 namespace davina\overwrites;
 
 require_once('vendor/autoload.php');
-require_once('sources/_interface.php');
-require_once('overwrites/auths/none.php');
-require_once('overwrites/auths/basic.php');
+require_once(DIR_LOGIC . '/sources/_interface.php');
+require_once(DIR_LOGIC . '/overwrites/auths/none.php');
+require_once(DIR_LOGIC . '/overwrites/auths/basic.php');
 
 
 /**
diff --git a/source/overwrites/auths/basic.php b/source/overwrites/auths/basic.php
index cecd100..6d42754 100644
--- a/source/overwrites/auths/basic.php
+++ b/source/overwrites/auths/basic.php
@@ -3,8 +3,8 @@
 namespace davina\overwrites;
 
 require_once('vendor/autoload.php');
-require_once('base.php');
-require_once('sources/_interface.php');
+require_once(DIR_LOGIC . '/base.php');
+require_once(DIR_LOGIC . '/sources/_interface.php');
 
 
 /**
diff --git a/source/overwrites/auths/none.php b/source/overwrites/auths/none.php
index af46fe9..dd2939d 100644
--- a/source/overwrites/auths/none.php
+++ b/source/overwrites/auths/none.php
@@ -3,7 +3,7 @@
 namespace davina\overwrites;
 
 require_once('vendor/autoload.php');
-require_once('sources/_interface.php');
+require_once(DIR_LOGIC . '/sources/_interface.php');
 
 
 /**
diff --git a/source/overwrites/caldav_backend.php b/source/overwrites/caldav_backend.php
index 7887e8a..7353735 100644
--- a/source/overwrites/caldav_backend.php
+++ b/source/overwrites/caldav_backend.php
@@ -3,11 +3,11 @@
 namespace davina\overwrites;
 
 require_once('vendor/autoload.php');
-require_once('helpers/call.php');
-require_once('helpers/ics.php');
-require_once('model.php');
-require_once('sources/_interface.php');
-require_once('conf.php');
+require_once(DIR_LOGIC . '/helpers/call.php');
+require_once(DIR_LOGIC . '/helpers/ics.php');
+require_once(DIR_LOGIC . '/model.php');
+require_once(DIR_LOGIC . '/sources/_interface.php');
+require_once(DIR_LOGIC . '/conf.php');
 
 
 /**
diff --git a/source/sources/_factory.php b/source/sources/_factory.php
index 391c7e7..0721a84 100644
--- a/source/sources/_factory.php
+++ b/source/sources/_factory.php
@@ -2,7 +2,7 @@
 
 namespace davina\sources;
 
-require_once('sources/ics_feed.php');
+require_once(DIR_LOGIC . '/sources/ics_feed.php');
 
 
 /**
diff --git a/source/sources/ics_feed.php b/source/sources/ics_feed.php
index 48517a6..2db9513 100644
--- a/source/sources/ics_feed.php
+++ b/source/sources/ics_feed.php
@@ -2,12 +2,12 @@
 
 namespace davina\sources;
 
-require_once('helpers/string.php');
-require_once('helpers/cache.php');
-require_once('helpers/pit.php');
-require_once('helpers/ics.php');
-require_once('base.php');
-require_once('model.php');
+require_once(DIR_LOGIC . '/helpers/string.php');
+require_once(DIR_LOGIC . '/helpers/cache.php');
+require_once(DIR_LOGIC . '/helpers/pit.php');
+require_once(DIR_LOGIC . '/helpers/ics.php');
+require_once(DIR_LOGIC . '/base.php');
+require_once(DIR_LOGIC . '/model.php');
 
 
 /**
diff --git a/tools/build b/tools/build
index ee8eaa5..6ea28b5 100755
--- a/tools/build
+++ b/tools/build
@@ -51,7 +51,7 @@ def main():
 	if True:
 		_shutil.copytree(
 			_os.path.join(conf["dir_lib"], "composer"),
-			_os.path.join(args.output_directory, "composer"),
+			args.output_directory,
 			dirs_exist_ok = True
 		)
 	### exec:sources