diff --git a/include/HTTPExceptions.php b/include/HTTPExceptions.php
deleted file mode 100644
index 8571c99de5..0000000000
--- a/include/HTTPExceptions.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Throwable exceptions to return HTTP status code
- *
- * This list of Exception has be extracted from
- * here http://racksburg.com/choosing-an-http-status-code/
- */
-
-class HTTPException extends Exception {
-	var $httpcode = 200;
-	var $httpdesc = "";
-	public function __construct($message="", $code = 0, Exception $previous = null) {
-		if ($this->httpdesc=="") {
-			$this->httpdesc = preg_replace("|([a-z])([A-Z])|",'$1 $2', str_replace("Exception","",get_class($this)));
-		}
-		parent::__construct($message, $code, $previous);
-	}
-}
-
-// 4xx
-class TooManyRequestsException extends HTTPException {
-	var $httpcode = 429;
-}
-
-class UnauthorizedException extends HTTPException {
-	var $httpcode = 401;
-}
-
-class ForbiddenException extends HTTPException {
-	var $httpcode = 403;
-}
-
-class NotFoundException extends HTTPException {
-	var $httpcode = 404;
-}
-
-class GoneException extends HTTPException {
-	var $httpcode = 410;
-}
-
-class MethodNotAllowedException extends HTTPException {
-	var $httpcode = 405;
-}
-
-class NonAcceptableException extends HTTPException {
-	var $httpcode = 406;
-}
-
-class LenghtRequiredException extends HTTPException {
-	var $httpcode = 411;
-}
-
-class PreconditionFailedException extends HTTPException {
-	var $httpcode = 412;
-}
-
-class UnsupportedMediaTypeException extends HTTPException {
-	var $httpcode = 415;
-}
-
-class ExpetationFailesException extends HTTPException {
-	var $httpcode = 417;
-}
-
-class ConflictException extends HTTPException {
-	var $httpcode = 409;
-}
-
-class UnprocessableEntityException extends HTTPException {
-	var $httpcode = 422;
-}
-
-class ImATeapotException extends HTTPException {
-	var $httpcode = 418;
-	var $httpdesc = "I'm A Teapot";
-}
-
-class BadRequestException extends HTTPException {
-	var $httpcode = 400;
-}
-
-// 5xx
-
-class ServiceUnavaiableException extends HTTPException {
-	var $httpcode = 503;
-}
-
-class BadGatewayException extends HTTPException {
-	var $httpcode = 502;
-}
-
-class GatewayTimeoutException extends HTTPException {
-	var $httpcode = 504;
-}
-
-class NotImplementedException extends HTTPException {
-	var $httpcode = 501;
-}
-
-class InternalServerErrorException extends HTTPException {
-	var $httpcode = 500;
-}
-
-
-
diff --git a/include/api.php b/include/api.php
index 50aa18c7e0..a5e8063848 100644
--- a/include/api.php
+++ b/include/api.php
@@ -12,11 +12,19 @@ use Friendica\Core\Config;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Network\HTTPException;
+use Friendica\Network\HTTPException\BadRequestException;
+use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException\MethodNotAllowedException;
+use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Network\HTTPException\NotImplementedException;
+use Friendica\Network\HTTPException\UnauthorizedException;
+use Friendica\Network\HTTPException\TooManyRequestsException;
 use Friendica\Object\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\XML;
 
-require_once 'include/HTTPExceptions.php';
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
 require_once 'include/conversation.php';
diff --git a/src/Network/HTTPException.php b/src/Network/HTTPException.php
new file mode 100644
index 0000000000..7602290c2b
--- /dev/null
+++ b/src/Network/HTTPException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Throwable exceptions to return HTTP status code
+ *
+ * This list of Exception has be extracted from
+ * here http://racksburg.com/choosing-an-http-status-code/
+ */
+
+namespace Friendica\Network;
+
+use Exception;
+
+class HTTPException extends Exception
+{
+	var $httpcode = 200;
+	var $httpdesc = "";
+
+	public function __construct($message = '', $code = 0, Exception $previous = null)
+	{
+		if ($this->httpdesc == '') {
+			$classname = str_replace('Exception', '', str_replace('Friendica\Network\HTTPException\\', '', get_class($this)));
+			$this->httpdesc = preg_replace("|([a-z])([A-Z])|",'$1 $2', $classname);
+		}
+		parent::__construct($message, $code, $previous);
+	}
+}
diff --git a/src/Network/HTTPException/BadGatewayException.php b/src/Network/HTTPException/BadGatewayException.php
new file mode 100644
index 0000000000..1bb8b29e98
--- /dev/null
+++ b/src/Network/HTTPException/BadGatewayException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class BadGatewayException extends HTTPException
+{
+	var $httpcode = 502;
+}
diff --git a/src/Network/HTTPException/BadRequestException.php b/src/Network/HTTPException/BadRequestException.php
new file mode 100644
index 0000000000..23e59b3ca2
--- /dev/null
+++ b/src/Network/HTTPException/BadRequestException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class BadRequestException extends HTTPException
+{
+	var $httpcode = 400;
+}
diff --git a/src/Network/HTTPException/ConflictException.php b/src/Network/HTTPException/ConflictException.php
new file mode 100644
index 0000000000..b1aef72d7e
--- /dev/null
+++ b/src/Network/HTTPException/ConflictException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class ConflictException extends HTTPException
+{
+	var $httpcode = 409;
+}
diff --git a/src/Network/HTTPException/ExpectationFailedException.php b/src/Network/HTTPException/ExpectationFailedException.php
new file mode 100644
index 0000000000..2b7b1febb7
--- /dev/null
+++ b/src/Network/HTTPException/ExpectationFailedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class ExpectationFailedException extends HTTPException
+{
+	var $httpcode = 417;
+}
diff --git a/src/Network/HTTPException/ForbiddenException.php b/src/Network/HTTPException/ForbiddenException.php
new file mode 100644
index 0000000000..75622c4c86
--- /dev/null
+++ b/src/Network/HTTPException/ForbiddenException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class ForbiddenException extends HTTPException
+{
+	var $httpcode = 403;
+}
\ No newline at end of file
diff --git a/src/Network/HTTPException/GatewayTimeoutException.php b/src/Network/HTTPException/GatewayTimeoutException.php
new file mode 100644
index 0000000000..306fbd4112
--- /dev/null
+++ b/src/Network/HTTPException/GatewayTimeoutException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class GatewayTimeoutException extends HTTPException
+{
+	var $httpcode = 504;
+}
diff --git a/src/Network/HTTPException/GoneException.php b/src/Network/HTTPException/GoneException.php
new file mode 100644
index 0000000000..ea844b087b
--- /dev/null
+++ b/src/Network/HTTPException/GoneException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class GoneException extends HTTPException
+{
+	var $httpcode = 410;
+}
diff --git a/src/Network/HTTPException/ImATeapotException.php b/src/Network/HTTPException/ImATeapotException.php
new file mode 100644
index 0000000000..fccf632be6
--- /dev/null
+++ b/src/Network/HTTPException/ImATeapotException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class ImATeapotException extends HTTPException
+{
+	var $httpcode = 418;
+	var $httpdesc = "I'm A Teapot";
+}
diff --git a/src/Network/HTTPException/InternalServerErrorException.php b/src/Network/HTTPException/InternalServerErrorException.php
new file mode 100644
index 0000000000..09c969419d
--- /dev/null
+++ b/src/Network/HTTPException/InternalServerErrorException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class InternalServerErrorException extends HTTPException
+{
+	var $httpcode = 500;
+}
diff --git a/src/Network/HTTPException/LenghtRequiredException.php b/src/Network/HTTPException/LenghtRequiredException.php
new file mode 100644
index 0000000000..dd952b0646
--- /dev/null
+++ b/src/Network/HTTPException/LenghtRequiredException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class LenghtRequiredException extends HTTPException
+{
+	var $httpcode = 411;
+}
diff --git a/src/Network/HTTPException/MethodNotAllowedException.php b/src/Network/HTTPException/MethodNotAllowedException.php
new file mode 100644
index 0000000000..8dce41432d
--- /dev/null
+++ b/src/Network/HTTPException/MethodNotAllowedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class MethodNotAllowedException extends HTTPException
+{
+	var $httpcode = 405;
+}
diff --git a/src/Network/HTTPException/NonAcceptableException.php b/src/Network/HTTPException/NonAcceptableException.php
new file mode 100644
index 0000000000..8705a13e0c
--- /dev/null
+++ b/src/Network/HTTPException/NonAcceptableException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class NonAcceptableException extends HTTPException
+{
+	var $httpcode = 406;
+}
diff --git a/src/Network/HTTPException/NotFoundException.php b/src/Network/HTTPException/NotFoundException.php
new file mode 100644
index 0000000000..bd4f6151b4
--- /dev/null
+++ b/src/Network/HTTPException/NotFoundException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class NotFoundException extends HTTPException {
+	var $httpcode = 404;
+}
diff --git a/src/Network/HTTPException/NotImplementedException.php b/src/Network/HTTPException/NotImplementedException.php
new file mode 100644
index 0000000000..74bc8adf56
--- /dev/null
+++ b/src/Network/HTTPException/NotImplementedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class NotImplementedException extends HTTPException
+{
+	var $httpcode = 501;
+}
diff --git a/src/Network/HTTPException/PreconditionFailedException.php b/src/Network/HTTPException/PreconditionFailedException.php
new file mode 100644
index 0000000000..b0f4e71caf
--- /dev/null
+++ b/src/Network/HTTPException/PreconditionFailedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class PreconditionFailedException extends HTTPException
+{
+	var $httpcode = 412;
+}
diff --git a/src/Network/HTTPException/ServiceUnavaiableException.php b/src/Network/HTTPException/ServiceUnavaiableException.php
new file mode 100644
index 0000000000..0dd21259cf
--- /dev/null
+++ b/src/Network/HTTPException/ServiceUnavaiableException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class ServiceUnavaiableException extends HTTPException
+{
+	var $httpcode = 503;
+}
diff --git a/src/Network/HTTPException/TooManyRequestsException.php b/src/Network/HTTPException/TooManyRequestsException.php
new file mode 100644
index 0000000000..c21b22325a
--- /dev/null
+++ b/src/Network/HTTPException/TooManyRequestsException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class TooManyRequestsException extends HTTPException
+{
+	var $httpcode = 429;
+}
diff --git a/src/Network/HTTPException/UnauthorizedException.php b/src/Network/HTTPException/UnauthorizedException.php
new file mode 100644
index 0000000000..79e6114a92
--- /dev/null
+++ b/src/Network/HTTPException/UnauthorizedException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class UnauthorizedException extends HTTPException
+{
+	var $httpcode = 401;
+}
diff --git a/src/Network/HTTPException/UnprocessableEntityException.php b/src/Network/HTTPException/UnprocessableEntityException.php
new file mode 100644
index 0000000000..9d92778328
--- /dev/null
+++ b/src/Network/HTTPException/UnprocessableEntityException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class UnprocessableEntityException extends HTTPException
+{
+	var $httpcode = 422;
+}
diff --git a/src/Network/HTTPException/UnsupportedMediaTypeException.php b/src/Network/HTTPException/UnsupportedMediaTypeException.php
new file mode 100644
index 0000000000..e73049333e
--- /dev/null
+++ b/src/Network/HTTPException/UnsupportedMediaTypeException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Friendica\Network\HTTPException;
+
+use Friendica\Network\HTTPException;
+
+class UnsupportedMediaTypeException extends HTTPException
+{
+	var $httpcode = 415;
+}