diff --git a/composer.json b/composer.json
index 0aaee0a0..a909e884 100644
--- a/composer.json
+++ b/composer.json
@@ -28,13 +28,11 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "src/App/",
             "Acelaya\\UrlShortener\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "AppTest\\": "tests/AppTest/",
             "AcelayaTest\\UrlShortener\\": "tests"
         }
     },
diff --git a/config/autoload/templates.global.php b/config/autoload/templates.global.php
index b0a57959..2beb9918 100644
--- a/config/autoload/templates.global.php
+++ b/config/autoload/templates.global.php
@@ -3,7 +3,9 @@
 return [
 
     'templates' => [
-        'extension' => 'html.twig',
+        'paths' => [
+            'templates'
+        ],
     ],
 
     'twig' => [
diff --git a/config/autoload/templates.local.php.dist b/config/autoload/templates.local.php.dist
deleted file mode 100644
index 13d4a711..00000000
--- a/config/autoload/templates.local.php.dist
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-return [
-
-    'twig' => [
-        'cache_dir' => false,
-    ],
-
-];
diff --git a/templates/app/home-page.html.twig b/templates/app/home-page.html.twig
index fc793c1e..b048b139 100644
--- a/templates/app/home-page.html.twig
+++ b/templates/app/home-page.html.twig
@@ -1,4 +1,4 @@
-{% extends '@layout/default.html.twig' %}
+{% extends 'layout/default.html.twig' %}
 
 {% block title %}Home{% endblock %}