diff --git a/mod/probe.php b/mod/probe.php
deleted file mode 100644
index 7fc3a92899..0000000000
--- a/mod/probe.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * @file mod/probe.php
- */
-use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Network\Probe;
-
-function probe_content(App $a)
-{
-	if (!local_user()) {
-		$e = new \Friendica\Network\HTTPException\ForbiddenException(L10n::t("Only logged in users are permitted to perform a probing."));
-		$e->httpdesc = L10n::t("Public access denied.");
-		throw $e;
-	}
-
-	$o = '<div class="generic-page-wrapper">';
-	$o .= '<h3>Probe Diagnostic</h3>';
-
-	$o .= '<form action="probe" method="get">';
-	$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') . '" />';
-	$o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
-	$o .= '<br /><br />';
-
-	if (!empty($_GET['addr'])) {
-		$addr = trim($_GET['addr']);
-		$res = Probe::uri($addr, "", 0, false);
-		$o .= '<pre>';
-		$o .= str_replace("\n", '<br />', print_r($res, true));
-		$o .= '</pre>';
-	}
-	$o .= '</div>';
-
-	return $o;
-}
diff --git a/src/App/Router.php b/src/App/Router.php
index 373bb1c32e..ddb3dbdfe4 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -92,7 +92,7 @@ class Router
 		$this->routeCollector->addRoute(['GET'],         '/allfriends/{id:\d+}', Module\AllFriends::class);
 		$this->routeCollector->addRoute(['GET'],         '/apps',                Module\Apps::class);
 		$this->routeCollector->addRoute(['GET'],         '/attach/{item:\d+}',   Module\Attach::class);
-		$this->routeCollector->addRoute(['GET'],         '/babel',               Module\Babel::class);
+		$this->routeCollector->addRoute(['GET'],         '/babel',               Module\Diagnostic\Babel::class);
 		$this->routeCollector->addRoute(['GET'],         '/bookmarklet',         Module\Bookmarklet::class);
 		$this->routeCollector->addGroup('/contact', function (RouteCollector $collector) {
 			$collector->addRoute(['GET'], '[/]',                                 Module\Contact::class);
@@ -153,9 +153,9 @@ class Router
 			$collector->addRoute(['GET', 'POST'], '[/]',                         Module\Install::class);
 			$collector->addRoute(['GET'],         '/testrewrite',                Module\Install::class);
 		});
-		$this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class);
+		$this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Diagnostic\ItemSource::class);
 		$this->routeCollector->addRoute(['GET'],         '/like/{item:\d+}',     Module\Like::class);
-		$this->routeCollector->addRoute(['GET', 'POST'], '/localtime',           Module\Localtime::class);
+		$this->routeCollector->addRoute(['GET', 'POST'], '/localtime',           Module\Diagnostic\Localtime::class);
 		$this->routeCollector->addRoute(['GET', 'POST'], '/login',               Module\Login::class);
 		$this->routeCollector->addRoute(['GET', 'POST'], '/logout',              Module\Logout::class);
 		$this->routeCollector->addRoute(['GET'],         '/magic',               Module\Magic::class);
@@ -185,6 +185,7 @@ class Router
 			$collector->addRoute(['GET'], '/{type}/{customize}/{name}',          Module\Photo::class);
 		});
 		$this->routeCollector->addRoute(['GET'],         '/pretheme',            Module\ThemeDetails::class);
+		$this->routeCollector->addRoute(['GET'],         '/probe',               Module\Diagnostic\Probe::class);
 		$this->routeCollector->addGroup('/profile', function (RouteCollector $collector) {
 			$collector->addRoute(['GET'], '/{nickname}',                         Module\Profile::class);
 			$collector->addRoute(['GET'], '/{profile:\d+}/view',                 Module\Profile::class);
@@ -213,8 +214,8 @@ class Router
 		$this->routeCollector->addRoute(['GET'],         '/toggle_mobile',       Module\ToggleMobile::class);
 		$this->routeCollector->addRoute(['GET'],         '/tos',                 Module\Tos::class);
 		$this->routeCollector->addRoute(['GET'],         '/view/theme/{theme}/style.pcss',  Module\Theme::class);
-		$this->routeCollector->addRoute(['GET'],         '/viewsrc/{item:\d+}',  Module\ItemBody::class);
-		$this->routeCollector->addRoute(['GET'],         '/webfinger',           Module\WebFinger::class);
+		$this->routeCollector->addRoute(['GET'],         '/viewsrc/{item:\d+}',  Module\Diagnostic\ItemBody::class);
+		$this->routeCollector->addRoute(['GET'],         '/webfinger',           Module\Diagnostic\WebFinger::class);
 		$this->routeCollector->addRoute(['GET'],         '/xrd',                 Module\Xrd::class);
 	}
 
diff --git a/src/Module/Babel.php b/src/Module/Diagnostic/Babel.php
similarity index 99%
rename from src/Module/Babel.php
rename to src/Module/Diagnostic/Babel.php
index 93bb3107f0..797584a4f7 100644
--- a/src/Module/Babel.php
+++ b/src/Module/Diagnostic/Babel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\Diagnostic;
 
 use Friendica\BaseModule;
 use Friendica\Content\Text;
diff --git a/src/Module/Feedtest.php b/src/Module/Diagnostic/Feed.php
similarity index 94%
rename from src/Module/Feedtest.php
rename to src/Module/Diagnostic/Feed.php
index 75cca52086..c54431fce3 100644
--- a/src/Module/Feedtest.php
+++ b/src/Module/Diagnostic/Feed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\Diagnostic;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
@@ -12,7 +12,7 @@ use Friendica\Util\Network;
 /**
  * Tests a given feed of a contact
  */
-class Feedtest extends BaseModule
+class Feed extends BaseModule
 {
 	public static function init()
 	{
diff --git a/src/Module/ItemBody.php b/src/Module/Diagnostic/ItemBody.php
similarity index 95%
rename from src/Module/ItemBody.php
rename to src/Module/Diagnostic/ItemBody.php
index ee50b52b28..e4e45b7223 100644
--- a/src/Module/ItemBody.php
+++ b/src/Module/Diagnostic/ItemBody.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\Diagnostic;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
diff --git a/src/Module/Itemsource.php b/src/Module/Diagnostic/ItemSource.php
similarity index 93%
rename from src/Module/Itemsource.php
rename to src/Module/Diagnostic/ItemSource.php
index d781db3ac5..bd580cf892 100644
--- a/src/Module/Itemsource.php
+++ b/src/Module/Diagnostic/ItemSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\Diagnostic;
 
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -9,7 +9,7 @@ use Friendica\Model;
 /**
  * @author Hypolite Petovan <mrpetovan@gmail.com>
  */
-class Itemsource extends \Friendica\BaseModule
+class ItemSource extends \Friendica\BaseModule
 {
 	public static function content()
 	{
diff --git a/src/Module/Localtime.php b/src/Module/Diagnostic/Localtime.php
similarity index 97%
rename from src/Module/Localtime.php
rename to src/Module/Diagnostic/Localtime.php
index d0b540879b..a3870ca95e 100644
--- a/src/Module/Localtime.php
+++ b/src/Module/Diagnostic/Localtime.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\Diagnostic;
 
 use Friendica\BaseModule;
 use Friendica\Core\Installer;
diff --git a/src/Module/Diagnostic/Probe.php b/src/Module/Diagnostic/Probe.php
new file mode 100644
index 0000000000..516c49411b
--- /dev/null
+++ b/src/Module/Diagnostic/Probe.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Friendica\Module\Diagnostic;
+
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Network\HTTPException;
+use Friendica\Network\Probe as NetworkProbe;
+
+/**
+ * Fetch information (protocol endpoints and user information) about a given uri
+ */
+class Probe extends BaseModule
+{
+	public static function content()
+	{
+		if (!local_user()) {
+			$e           = new HTTPException\ForbiddenException(L10n::t("Only logged in users are permitted to perform a probing."));
+			$e->httpdesc = L10n::t("Public access denied.");
+			throw $e;
+		}
+
+		$addr = defaults($_GET, 'addr', '');
+		$res  = '';
+
+		if (!empty($addr)) {
+			$res = NetworkProbe::uri($addr, '', 0, false);
+			$res = print_r($res, true);
+		}
+
+		$tpl = Renderer::getMarkupTemplate('probe.tpl');
+		return Renderer::replaceMacros($tpl, [
+			'$addr' => ['addr',
+			            L10n::t('Lookup address'),
+			            $addr,
+			            '',
+			            'required'
+			],
+			'$res'  => $res,
+		]);
+	}
+}
diff --git a/src/Module/WebFinger.php b/src/Module/Diagnostic/WebFinger.php
similarity index 93%
rename from src/Module/WebFinger.php
rename to src/Module/Diagnostic/WebFinger.php
index 0c1a692e1b..5d6e05a27d 100644
--- a/src/Module/WebFinger.php
+++ b/src/Module/Diagnostic/WebFinger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\Diagnostic;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
@@ -20,8 +20,6 @@ class WebFinger extends BaseModule
 			throw $e;
 		}
 
-		$app = self::getApp();
-
 		$addr = defaults($_GET, 'addr', '');
 		$res = '';
 
diff --git a/view/templates/probe.tpl b/view/templates/probe.tpl
new file mode 100644
index 0000000000..5f31cc5488
--- /dev/null
+++ b/view/templates/probe.tpl
@@ -0,0 +1,24 @@
+<div id="probe" class="generic-page-wrapper">
+	<h2>Probe Diagnostic</h2>
+	<form action="probe" method="get" class="panel panel-default">
+		<div class="panel-body">
+			<div class="form-group">
+				{{include file="field_input.tpl" field=$addr}}
+			</div>
+			<p><button type="submit" class="btn btn-primary">Submit</button></p>
+		</div>
+	</form>
+
+	{{if $res}}
+		<div class="probe-result">
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<h3 class="panel-title">Output</h3>
+				</div>
+				<div class="panel-body">
+					<pre>{{$res}}</pre>
+				</div>
+			</div>
+		</div>
+	{{/if}}
+</div>