diff --git a/boot.php b/boot.php
index 4dd781e1..1c869c39 100755
--- a/boot.php
+++ b/boot.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'vendor/autoload.php';
+
 set_time_limit(0);
 
 define('BUILD_ID', 1000);
@@ -32,126 +34,6 @@ define('LOGGER_DEBUG',  2);
 define('LOGGER_DATA',   3);
 define('LOGGER_ALL',    4);
 
-class App
-{
-	public $module_loaded = false;
-	public $query_string;
-	public $config;
-	public $page;
-	public $profile;
-	public $user;
-	public $cid;
-	public $contact;
-	public $content;
-	public $data;
-	public $error = false;
-	public $cmd;
-	public $argv;
-	public $argc;
-	public $module;
-	public $pager;
-	public $strings;
-	public $path;
-
-	private $scheme;
-	private $hostname;
-	private $baseurl;
-	private $db;
-
-	public function __construct()
-	{
-		$this->config = array();
-		$this->page = array();
-		$this->pager = array();
-
-		$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'])) ? 'https' : 'http');
-		$this->hostname = str_replace('www.', '', $_SERVER['SERVER_NAME']);
-		set_include_path("include/$this->hostname"
-				. PATH_SEPARATOR . 'include'
-				. PATH_SEPARATOR . '.');
-
-		if (substr($_SERVER['QUERY_STRING'], 0, 2) == "q=") {
-			$_SERVER['QUERY_STRING'] = substr($_SERVER['QUERY_STRING'], 2);
-		}
-
-		$this->query_string = $_SERVER['QUERY_STRING'];
-
-		$q = isset($_GET['q']) ? $_GET['q'] : '';
-		$this->cmd = trim($q, '/');
-
-		$this->argv = explode('/', $this->cmd);
-		$this->argc = count($this->argv);
-		if ((array_key_exists('0', $this->argv)) && strlen($this->argv[0])) {
-			$this->module = $this->argv[0];
-		} else {
-			$this->module = 'directory';
-		}
-
-		$this->pager['page'] = ((x($_GET, 'page')) ? $_GET['page'] : 1);
-		$this->pager['itemspage'] = 50;
-		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
-		$this->pager['total'] = 0;
-	}
-
-	public function get_baseurl($ssl = false)
-	{
-		if (strlen($this->baseurl)) {
-			return $this->baseurl;
-		}
-
-		$this->baseurl = (($ssl) ? 'https' : $this->scheme) . "://" . $this->hostname
-				. ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '');
-		return $this->baseurl;
-	}
-
-	public function set_baseurl($url)
-	{
-		$this->baseurl = $url;
-		$this->hostname = basename($url);
-	}
-
-	public function get_hostname()
-	{
-		return $this->hostname;
-	}
-
-	public function set_hostname($h)
-	{
-		$this->hostname = $h;
-	}
-
-	public function set_path($p)
-	{
-		$this->path = ltrim(trim($p), '/');
-	}
-
-	public function get_path()
-	{
-		return $this->path;
-	}
-
-	public function set_pager_total($n)
-	{
-		$this->pager['total'] = intval($n);
-	}
-
-	public function set_pager_itemspage($n)
-	{
-		$this->pager['itemspage'] = intval($n);
-		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
-	}
-
-	public function init_pagehead()
-	{
-		if (file_exists("view/head.tpl")) {
-			$s = file_get_contents("view/head.tpl");
-		}
-		$this->page['htmlhead'] = replace_macros($s, array(
-			'$baseurl' => $this->get_baseurl()
-		));
-	}
-}
-
 if (!function_exists('x')) {
 	function x($s, $k = null)
 	{
diff --git a/include/cron_maintain.php b/include/cron_maintain.php
index 40174024..960fe901 100644
--- a/include/cron_maintain.php
+++ b/include/cron_maintain.php
@@ -1,5 +1,10 @@
 <?php
 
+//Startup.
+require_once 'boot.php';
+
+use Friendica\Directory\App;
+
 // Debug stuff.
 // ini_set('display_errors', 1);
 // ini_set('log_errors','0');
@@ -9,9 +14,6 @@ $start_maintain = time();
 
 $verbose = $argv[1] === 'verbose';
 
-//Startup.
-require_once 'boot.php';
-
 $a = new App;
 
 //Config and DB.
diff --git a/include/cron_sync.php b/include/cron_sync.php
index 750e56dd..e9d2eb17 100644
--- a/include/cron_sync.php
+++ b/include/cron_sync.php
@@ -40,6 +40,11 @@
 
  */
 
+//Startup.
+require_once 'boot.php';
+
+use Friendica\Directory\App;
+
 // Debug stuff.
 ini_set('display_errors', 1);
 ini_set('log_errors', '0');
@@ -47,8 +52,6 @@ error_reporting(E_ALL ^ E_NOTICE);
 
 $start_syncing = time();
 
-//Startup.
-require_once 'boot.php';
 $a = new App;
 
 //Create a simple log function for CLI use.
diff --git a/include/directory.php b/include/directory.php
index 23abc861..01d00e02 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,7 +1,10 @@
 <?php
 
+//Startup.
 require_once 'boot.php';
 
+use Friendica\Directory\App;
+
 $a = new App;
 
 @include '.htconfig.php';
diff --git a/include/notifier.php b/include/notifier.php
index e87d9e68..7972bd9a 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,7 +1,10 @@
 <?php
 
+//Startup.
 require_once 'boot.php';
 
+use Friendica\Directory\App;
+
 $a = new App;
 
 @include '.htconfig.php';
diff --git a/include/poller.php b/include/poller.php
index d692bb30..0e3092f5 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,7 +1,10 @@
 <?php
 
+//Startup.
 require_once 'boot.php';
 
+use Friendica\Directory\App;
+
 $a = new App;
 
 @include('.htconfig.php');
@@ -57,7 +60,7 @@ foreach ($contacts as $contact) {
 		}
 		if (!$update) {
 			continue;
-	}
+		}
 	}
 
 	$r = q("SELECT * FROM `contact` WHERE `self` = 1 LIMIT 1");
diff --git a/include/rockstar.php b/include/rockstar.php
index 427fec68..58009214 100644
--- a/include/rockstar.php
+++ b/include/rockstar.php
@@ -1,7 +1,10 @@
 <?php
 
+//Startup.
 require_once 'boot.php';
 
+use Friendica\Directory\App;
+
 $a = new App;
 
 @include(".htconfig.php");
diff --git a/include/sync.php b/include/sync.php
index fd9c0840..3d816cee 100644
--- a/include/sync.php
+++ b/include/sync.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Directory\App;
+
 /**
  * Pull this URL to our pulling queue.
  * @param  string $url
@@ -92,7 +94,7 @@ function get_push_targets()
  * @param object $a The App instance.
  * @return array Batch of URL's.
  */
-function get_push_batch($a)
+function get_push_batch(App $a)
 {
 	return q("SELECT * FROM `sync-push-queue` LIMIT %u", intval($a->config['syncing']['max_push_items']));
 }
@@ -102,7 +104,7 @@ function get_push_batch($a)
  * @param object $a The App instance.
  * @return list($targets, $batch) A list of both the targets array and batch array.
  */
-function get_pushing_job($a)
+function get_pushing_job(App $a)
 {
 	//When pushing is requested...
 	if (!!$a->config['syncing']['enable_pushing']) {
@@ -221,7 +223,7 @@ function run_pushing_job($targets, $batch, $db_host, $db_user, $db_pass, $db_dat
  * @param object $a The App instance.
  * @return array Batch of URL's.
  */
-function get_queued_pull_batch($a)
+function get_queued_pull_batch(App $a)
 {
 	//Randomize this, to prevent scraping the same servers too much or dead URL's.
 	$batch = q("SELECT * FROM `sync-pull-queue` ORDER BY RAND() LIMIT %u", intval($a->config['syncing']['max_pull_items']));
@@ -243,7 +245,7 @@ function get_pull_targets()
  * @param object $a The App instance.
  * @return array Batch of URL's.
  */
-function get_remote_pull_batch($a)
+function get_remote_pull_batch(App $a)
 {
 	//Find our targets.
 	$targets = get_pull_targets();
@@ -305,7 +307,7 @@ function get_remote_pull_batch($a)
  * @param  object $a The App instance.
  * @return array URL's to scrape.
  */
-function get_pulling_job($a)
+function get_pulling_job(App $a)
 {
 	//No pulling today...
 	if (!$a->config['syncing']['enable_pulling']) {
@@ -375,7 +377,7 @@ function pull_worker($i, $threadc, $pull_batch, $db_host, $db_user, $db_pass, $d
  * @param  mixed  $install    Maybe a boolean.
  * @return void
  */
-function run_pulling_job($a, $pull_batch, $db_host, $db_user, $db_pass, $db_data, $install)
+function run_pulling_job(App $a, $pull_batch, $db_host, $db_user, $db_pass, $db_data, $install)
 {
 	//We need the scraper.
 	require_once 'include/submit.php';
diff --git a/index.php b/index.php
index e3568349..325d6208 100644
--- a/index.php
+++ b/index.php
@@ -1,8 +1,9 @@
 <?php
 
-require_once 'vendor/autoload.php';
 require_once 'boot.php';
 
+use Friendica\Directory\App;
+
 $a = new App;
 
 error_reporting(E_ERROR | E_WARNING | E_PARSE);
diff --git a/mod/directory.php b/mod/directory.php
index 2e9ade0b..752b2f59 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Directory\App;
+
 require_once 'include/widget.php';
 
 function directory_init(App $a)
diff --git a/mod/photo.php b/mod/photo.php
index f0654040..c832a9e9 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Directory\App;
+
 require_once 'datetime.php';
 
 function photo_init(App $a)
diff --git a/mod/search.php b/mod/search.php
index e964d9d0..6240e62f 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Directory\App;
 use Friendica\Directory\Rendering\View;
 use Friendica\Directory\Helper\Search as SearchHelper;
 use Friendica\Directory\Helper\Profile as ProfileHelper;
diff --git a/src/App.php b/src/App.php
new file mode 100644
index 00000000..8540892a
--- /dev/null
+++ b/src/App.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Friendica\Directory;
+
+class App
+{
+	public $module_loaded = false;
+	public $query_string;
+	public $config;
+	public $page;
+	public $profile;
+	public $user;
+	public $cid;
+	public $contact;
+	public $content;
+	public $data;
+	public $error = false;
+	public $cmd;
+	public $argv;
+	public $argc;
+	public $module;
+	public $pager;
+	public $strings;
+	public $path;
+
+	private $scheme;
+	private $hostname;
+	private $baseurl;
+
+	public function __construct()
+	{
+		$this->config = array();
+		$this->page = array();
+		$this->pager = array();
+
+		$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'])) ? 'https' : 'http');
+		$this->hostname = str_replace('www.', '', $_SERVER['SERVER_NAME']);
+		set_include_path(get_include_path()
+				. PATH_SEPARATOR . "include/$this->hostname"
+				. PATH_SEPARATOR . 'include'
+				. PATH_SEPARATOR . '.');
+
+		if (substr($_SERVER['QUERY_STRING'], 0, 2) == "q=") {
+			$_SERVER['QUERY_STRING'] = substr($_SERVER['QUERY_STRING'], 2);
+		}
+
+		$this->query_string = $_SERVER['QUERY_STRING'];
+
+		$q = isset($_GET['q']) ? $_GET['q'] : '';
+		$this->cmd = trim($q, '/');
+
+		$this->argv = explode('/', $this->cmd);
+		$this->argc = count($this->argv);
+		if ((array_key_exists('0', $this->argv)) && strlen($this->argv[0])) {
+			$this->module = $this->argv[0];
+		} else {
+			$this->module = 'directory';
+		}
+
+		$this->pager['page'] = ((x($_GET, 'page')) ? $_GET['page'] : 1);
+		$this->pager['itemspage'] = 50;
+		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+		$this->pager['total'] = 0;
+	}
+
+	public function get_baseurl($ssl = false)
+	{
+		if (strlen($this->baseurl)) {
+			return $this->baseurl;
+		}
+
+		$this->baseurl = (($ssl) ? 'https' : $this->scheme) . "://" . $this->hostname
+				. ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '');
+		return $this->baseurl;
+	}
+
+	public function set_baseurl($url)
+	{
+		$this->baseurl = $url;
+		$this->hostname = basename($url);
+	}
+
+	public function get_hostname()
+	{
+		return $this->hostname;
+	}
+
+	public function set_hostname($h)
+	{
+		$this->hostname = $h;
+	}
+
+	public function set_path($p)
+	{
+		$this->path = ltrim(trim($p), '/');
+	}
+
+	public function get_path()
+	{
+		return $this->path;
+	}
+
+	public function set_pager_total($n)
+	{
+		$this->pager['total'] = intval($n);
+	}
+
+	public function set_pager_itemspage($n)
+	{
+		$this->pager['itemspage'] = intval($n);
+		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+	}
+
+	public function init_pagehead()
+	{
+		if (file_exists("view/head.tpl")) {
+			$s = file_get_contents("view/head.tpl");
+		}
+		$this->page['htmlhead'] = replace_macros($s, array(
+			'$baseurl' => $this->get_baseurl()
+		));
+	}
+}
\ No newline at end of file
diff --git a/src/Helper/BaseHelper.php b/src/Helper/BaseHelper.php
index 35fa0c47..f611feaa 100644
--- a/src/Helper/BaseHelper.php
+++ b/src/Helper/BaseHelper.php
@@ -2,6 +2,8 @@
 
 namespace Friendica\Directory\Helper;
 
+use Friendica\Directory\App;
+
 use \OutOfBoundsException;
 use \ReflectionMethod;
 
@@ -12,7 +14,7 @@ abstract class BaseHelper
 {
 	/**
 	 * A reference to the global App.
-	 * @var \App
+	 * @var Friendica\Directory\App
 	 */
 	protected $app;