diff --git a/include/items.php b/include/items.php
index 8f15f94799..4bb00cdddd 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3,7 +3,6 @@
  * @file include/items.php
  */
 use Friendica\App;
-use Friendica\ParseUrl;
 use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
@@ -18,6 +17,7 @@ use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Feed;
+use Friendica\Util\ParseUrl;
 
 require_once 'include/bbcode.php';
 require_once 'include/tags.php';
diff --git a/include/plaintext.php b/include/plaintext.php
index 39dcc9ecdb..5931cba573 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -3,9 +3,9 @@
  * @file include/plaintext.php
  */
 use Friendica\App;
-use Friendica\ParseUrl;
 use Friendica\Core\PConfig;
 use Friendica\Object\Image;
+use Friendica\Util\ParseUrl;
 
 require_once "include/bbcode.php";
 require_once "include/html2plain.php";
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 4fe9256349..4fabba6c7e 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -11,7 +11,7 @@
 */
 
 use Friendica\App;
-use Friendica\ParseUrl;
+use Friendica\Util\ParseUrl;
 
 require_once("include/items.php");
 
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 30493e1b8b..51c987755e 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -10,7 +10,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-use Friendica\ParseUrl;
+use Friendica\Util\ParseUrl;
 use dba;
 use DOMDocument;
 use DOMXPath;
diff --git a/src/ParseUrl.php b/src/Util/ParseUrl.php
similarity index 99%
rename from src/ParseUrl.php
rename to src/Util/ParseUrl.php
index 0c67589ddf..7154e0f4af 100644
--- a/src/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * @file include/ParseUrl.php
+ * @file src/Util/ParseUrl.php
  * @brief Get informations about a given URL
  */
-namespace Friendica;
+namespace Friendica\Util;
 
 use Friendica\Content\OEmbed;
 use Friendica\Object\Image;