diff --git a/include/text.php b/include/text.php
index ffa0ad0ed..3244d7bb9 100644
--- a/include/text.php
+++ b/include/text.php
@@ -16,7 +16,6 @@ use Friendica\Model\Profile;
 use Friendica\Model\Term;
 use Friendica\Util\Map;
 
-require_once "include/friendica_smarty.php";
 require_once "mod/proxy.php";
 require_once "include/conversation.php";
 
diff --git a/src/App.php b/src/App.php
index 7c87130b3..6eff22f54 100644
--- a/src/App.php
+++ b/src/App.php
@@ -288,12 +288,7 @@ class App
 		$this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)');
 
 		// Register template engines
-		$dc = get_declared_classes();
-		foreach ($dc as $k) {
-			if (in_array('Friendica\Render\ITemplateEngine', class_implements($k))) {
-				$this->register_template_engine($k);
-			}
-		}
+		$this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
 
 		self::$a = $this;
 	}
@@ -602,7 +597,7 @@ class App
 			$this->template_engines[$name] = $class;
 		} else {
 			echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
-			killme();
+			die();
 		}
 	}
 
diff --git a/include/friendica_smarty.php b/src/Render/FriendicaSmarty.php
similarity index 50%
rename from include/friendica_smarty.php
rename to src/Render/FriendicaSmarty.php
index a7d153e30..b147d7e81 100644
--- a/include/friendica_smarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -1,96 +1,56 @@
-<?php
-
-use Friendica\Core\Addon;
-use Friendica\Render\ITemplateEngine;
-
-define('SMARTY3_TEMPLATE_FOLDER', 'templates');
-
-class FriendicaSmarty extends Smarty
-{
-	public $filename;
-
-	function __construct()
-	{
-		parent::__construct();
-
-		$a = get_app();
-		$theme = current_theme();
-
-		// setTemplateDir can be set to an array, which Smarty will parse in order.
-		// The order is thus very important here
-		$template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"];
-		if (x($a->theme_info, "extends"))
-			$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];
-		$template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"];
-		$this->setTemplateDir($template_dirs);
-
-		$this->setCompileDir('view/smarty3/compiled/');
-		$this->setConfigDir('view/smarty3/config/');
-		$this->setCacheDir('view/smarty3/cache/');
-
-		$this->left_delimiter = $a->get_template_ldelim('smarty3');
-		$this->right_delimiter = $a->get_template_rdelim('smarty3');
-
-		// Don't report errors so verbosely
-		$this->error_reporting = E_ALL & ~E_NOTICE;
-	}
-
-	function parsed($template = '')
-	{
-		if ($template) {
-			return $this->fetch('string:' . $template);
-		}
-		return $this->fetch('file:' . $this->filename);
-	}
-
-}
-
-class FriendicaSmartyEngine implements ITemplateEngine
-{
-	static $name = "smarty3";
-
-	public function __construct()
-	{
-		if (!is_writable('view/smarty3/')) {
-			echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
-			killme();
-		}
-	}
-
-	// ITemplateEngine interface
-	public function replaceMacros($s, $r)
-	{
-		$template = '';
-		if (gettype($s) === 'string') {
-			$template = $s;
-			$s = new FriendicaSmarty();
-		}
-
-		$r['$APP'] = get_app();
-
-		// "middleware": inject variables into templates
-		$arr = [
-			"template" => basename($s->filename),
-			"vars" => $r
-		];
-		Addon::callHooks("template_vars", $arr);
-		$r = $arr['vars'];
-
-		foreach ($r as $key => $value) {
-			if ($key[0] === '$') {
-				$key = substr($key, 1);
-			}
-			$s->assign($key, $value);
-		}
-		return $s->parsed($template);
-	}
-
-	public function getTemplateFile($file, $root = '')
-	{
-		$a = get_app();
-		$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
-		$template = new FriendicaSmarty();
-		$template->filename = $template_file;
-		return $template;
-	}
-}
+<?php
+/**
+ * @file src/Render/FriendicaSmarty.php
+ */
+namespace Friendica\Render;
+
+use Smarty;
+
+define('SMARTY3_TEMPLATE_FOLDER', 'templates');
+
+/**
+ * Description of FriendicaSmarty
+ *
+ * @author benlo
+ */
+class FriendicaSmarty extends Smarty
+{
+	public $filename;
+
+	function __construct()
+	{
+		parent::__construct();
+
+		$a = get_app();
+		$theme = current_theme();
+
+		// setTemplateDir can be set to an array, which Smarty will parse in order.
+		// The order is thus very important here
+		$template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"];
+		if (x($a->theme_info, "extends")) {
+			$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];
+		}
+
+		$template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"];
+		$this->setTemplateDir($template_dirs);
+
+		$this->setCompileDir('view/smarty3/compiled/');
+		$this->setConfigDir('view/smarty3/config/');
+		$this->setCacheDir('view/smarty3/cache/');
+
+		$this->left_delimiter = $a->get_template_ldelim('smarty3');
+		$this->right_delimiter = $a->get_template_rdelim('smarty3');
+
+		// Don't report errors so verbosely
+		$this->error_reporting = E_ALL & ~E_NOTICE;
+	}
+
+	function parsed($template = '')
+	{
+		if ($template) {
+			return $this->fetch('string:' . $template);
+		}
+		return $this->fetch('file:' . $this->filename);
+	}
+
+}
\ No newline at end of file
diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
new file mode 100644
index 000000000..2cfce760a
--- /dev/null
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @file src/Render/FriendicaSmartyEngine.php
+ */
+namespace Friendica\Render;
+
+use Friendica\Core\Addon;
+
+class FriendicaSmartyEngine implements ITemplateEngine
+{
+	static $name = "smarty3";
+
+	public function __construct()
+	{
+		if (!is_writable('view/smarty3/')) {
+			echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
+			killme();
+		}
+	}
+
+	// ITemplateEngine interface
+	public function replaceMacros($s, $r)
+	{
+		$template = '';
+		if (gettype($s) === 'string') {
+			$template = $s;
+			$s = new FriendicaSmarty();
+		}
+
+		$r['$APP'] = get_app();
+
+		// "middleware": inject variables into templates
+		$arr = [
+			"template" => basename($s->filename),
+			"vars" => $r
+		];
+		Addon::callHooks("template_vars", $arr);
+		$r = $arr['vars'];
+
+		foreach ($r as $key => $value) {
+			if ($key[0] === '$') {
+				$key = substr($key, 1);
+			}
+
+			$s->assign($key, $value);
+		}
+		return $s->parsed($template);
+	}
+
+	public function getTemplateFile($file, $root = '')
+	{
+		$a = get_app();
+		$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
+		$template = new FriendicaSmarty();
+		$template->filename = $template_file;
+
+		return $template;
+	}
+}