diff --git a/mod/localtime.php b/mod/localtime.php
deleted file mode 100644
index f68c3fba50..0000000000
--- a/mod/localtime.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * @file mod/localtime.php
- */
-
-use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Temporal;
-
-function localtime_post(App $a)
-{
-	$t = $_REQUEST['time'];
-	if (! $t) {
-		$t = 'now';
-	}
-
-	$bd_format = L10n::t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
-
-	if ($_POST['timezone']) {
-		$a->data['mod-localtime'] = DateTimeFormat::convert($t, $_POST['timezone'], 'UTC', $bd_format);
-	}
-}
-
-function localtime_content(App $a)
-{
-	$t = $_REQUEST['time'];
-	if (! $t) {
-		$t = 'now';
-	}
-
-	$o  = '<h3>' . L10n::t('Time Conversion') . '</h3>';
-
-	$o .= '<p>' . L10n::t('Friendica provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
-
-
-
-	$o .= '<p>' . L10n::t('UTC time: %s', $t) . '</p>';
-
-	if ($_REQUEST['timezone']) {
-		$o .= '<p>' . L10n::t('Current timezone: %s', $_REQUEST['timezone']) . '</p>';
-	}
-
-	if (!empty($a->data['mod-localtime'])) {
-		$o .= '<p>' . L10n::t('Converted localtime: %s', $a->data['mod-localtime']) . '</p>';
-	}
-
-
-	$o .= '<form action ="' . System::baseUrl() . '/localtime?f=&time=' . $t . '" method="post" >';
-
-	$o .= '<p>' . L10n::t('Please select your timezone:') . '</p>';
-
-	$o .= Temporal::getTimezoneSelect(($_REQUEST['timezone']) ? $_REQUEST['timezone'] : 'America/Los_Angeles');
-
-	$o .= '<input type="submit" name="submit" value="' . L10n::t('Submit') . '" /></form>';
-
-	return $o;
-}
diff --git a/src/Module/Localtime.php b/src/Module/Localtime.php
new file mode 100644
index 0000000000..d0b540879b
--- /dev/null
+++ b/src/Module/Localtime.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Installer;
+use Friendica\Core\L10n;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
+
+class Localtime extends BaseModule
+{
+	public static function post()
+	{
+		$time = defaults($_REQUEST, 'time', 'now');
+
+		$bd_format = L10n::t('l F d, Y \@ g:i A');
+
+		if (!empty($_POST['timezone'])) {
+			self::getApp()->data['mod-localtime'] = DateTimeFormat::convert($time, $_POST['timezone'], 'UTC', $bd_format);
+		}
+	}
+
+	public static function content()
+	{
+		$app = self::getApp();
+
+		$time = defaults($_REQUEST, 'time', 'now');
+
+		$output  = '<h3>' . L10n::t('Time Conversion') . '</h3>';
+		$output .= '<p>' . L10n::t('Friendica provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
+		$output .= '<p>' . L10n::t('UTC time: %s', $time) . '</p>';
+
+		if (!empty($_REQUEST['timezone'])) {
+			$output .= '<p>' . L10n::t('Current timezone: %s', $_REQUEST['timezone']) . '</p>';
+		}
+
+		if (!empty($app->data['mod-localtime'])) {
+			$output .= '<p>' . L10n::t('Converted localtime: %s', $app->data['mod-localtime']) . '</p>';
+		}
+
+		$output .= '<form action ="' . $app->getBaseURL() . '/localtime?f=&time=' . $time . '" method="post" >';
+		$output .= '<p>' . L10n::t('Please select your timezone:') . '</p>';
+		$output .= Temporal::getTimezoneSelect(defaults($_REQUEST, 'timezone', Installer::DEFAULT_TZ));
+		$output .= '<input type="submit" name="submit" value="' . L10n::t('Submit') . '" /></form>';
+
+		return $output;
+	}
+}