diff --git a/src/Model/Group.php b/src/Model/Group.php
index 0af10995b4..feff4661ab 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -16,6 +16,26 @@ use Friendica\Database\DBA;
  */
 class Group extends BaseObject
 {
+	/**
+	 *
+	 *
+	 * @param int $group_id
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public static function exists($group_id, $uid = null)
+	{
+		$condition = ['id' => $group_id, 'deleted' => false];
+
+		if (isset($uid)) {
+			$condition = [
+				'uid' => $uid
+			];
+		}
+
+		return DBA::exists('group', $condition);
+	}
+
 	/**
 	 * @brief Create a new contact group
 	 *
diff --git a/src/Module/Group.php b/src/Module/Group.php
new file mode 100644
index 0000000000..c178c5201e
--- /dev/null
+++ b/src/Module/Group.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * @file src/Module/Group.php
+ */
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model;
+use Friendica\Util\Strings;
+
+require_once 'boot.php';
+
+class Group extends BaseModule
+{
+	public static function post()
+	{
+		$a = self::getApp();
+
+		if (!local_user()) {
+			notice(L10n::t('Permission denied.'));
+			$a->internalRedirect();
+		}
+
+		if (($a->argc == 2) && ($a->argv[1] === 'new')) {
+			BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
+
+			$name = Strings::escapeTags(trim($_POST['groupname']));
+			$r = Model\Group::create(local_user(), $name);
+			if ($r) {
+				info(L10n::t('Group created.'));
+				$r = Model\Group::getIdByName(local_user(), $name);
+				if ($r) {
+					$a->internalRedirect('group/' . $r);
+				}
+			} else {
+				notice(L10n::t('Could not create group.'));
+			}
+			$a->internalRedirect('group');
+		}
+
+		if (($a->argc == 2) && intval($a->argv[1])) {
+			BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit');
+
+			$group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user()]);
+			if (!DBA::isResult($group)) {
+				notice(L10n::t('Group not found.'));
+				$a->internalRedirect('contact');
+			}
+			$groupname = Strings::escapeTags(trim($_POST['groupname']));
+			if (strlen($groupname) && ($groupname != $group['name'])) {
+				if (Model\Group::update($group['id'], $groupname)) {
+					info(L10n::t('Group name changed.'));
+				}
+			}
+		}
+	}
+
+	public static function content()
+	{
+		$change = false;
+
+		if (!local_user()) {
+			System::httpExit(403);
+		}
+
+		$a = self::getApp();
+
+		$a->page['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
+
+		// With no group number provided we jump to the unassigned contacts as a starting point
+		if ($a->argc == 1) {
+			$a->internalRedirect('group/none');
+		}
+
+		// Switch to text mode interface if we have more than 'n' contacts or group members
+		$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
+		if (is_null($switchtotext)) {
+			$switchtotext = Config::get('system', 'groupedit_image_limit', 200);
+		}
+
+		$tpl = Renderer::getMarkupTemplate('group_edit.tpl');
+
+
+		$context = [
+			'$submit' => L10n::t('Save Group'),
+			'$submit_filter' => L10n::t('Filter'),
+		];
+
+		if (($a->argc == 2) && ($a->argv[1] === 'new')) {
+			return Renderer::replaceMacros($tpl, $context + [
+				'$title' => L10n::t('Create a group of contacts/friends.'),
+				'$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
+				'$gid' => 'new',
+				'$form_security_token' => BaseModule::getFormSecurityToken("group_edit"),
+			]);
+		}
+
+		$nogroup = false;
+
+		if (($a->argc == 2) && ($a->argv[1] === 'none')) {
+			$id = -1;
+			$nogroup = true;
+			$group = [
+				'id' => $id,
+				'name' => L10n::t('Contacts not in any group'),
+			];
+
+			$members = [];
+			$preselected = [];
+
+			$context = $context + [
+				'$title' => $group['name'],
+				'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+				'$gid' => $id,
+				'$editable' => 0,
+			];
+		}
+
+		if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
+			BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't');
+
+			if (intval($a->argv[2])) {
+				if (!Model\Group::exists($a->argv[2], local_user())) {
+					notice(L10n::t('Group not found.'));
+					$a->internalRedirect('contact');
+				}
+
+				if (Model\Group::remove($a->argv[2])) {
+					info(L10n::t('Group removed.'));
+				} else {
+					notice(L10n::t('Unable to remove group.'));
+				}
+			}
+			$a->internalRedirect('group');
+		}
+
+		if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+			BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't');
+
+			if (DBA::exists('contact', ['id' => $a->argv[2], 'uid' => local_user(), 'self' => false, 'pending' => false, 'blocked' => false])) {
+				$change = intval($a->argv[2]);
+			}
+		}
+
+		if (($a->argc > 1) && intval($a->argv[1])) {
+			$group = DBA::selectFirst('group', ['id', 'name'], ['id' => $a->argv[1], 'uid' => local_user(), 'deleted' => false]);
+			if (!DBA::isResult($group)) {
+				notice(L10n::t('Group not found.'));
+				$a->internalRedirect('contact');
+			}
+
+			$members = Model\Contact::getByGroupId($group['id']);
+			$preselected = [];
+
+			if (count($members)) {
+				foreach ($members as $member) {
+					$preselected[] = $member['id'];
+				}
+			}
+
+			if ($change) {
+				if (in_array($change, $preselected)) {
+					Model\Group::removeMember($group['id'], $change);
+				} else {
+					Model\Group::addMember($group['id'], $change);
+				}
+
+				$members = Model\Contact::getByGroupId($group['id']);
+				$preselected = [];
+				if (count($members)) {
+					foreach ($members as $member) {
+						$preselected[] = $member['id'];
+					}
+				}
+			}
+
+			$drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl');
+			$drop_txt = Renderer::replaceMacros($drop_tpl, [
+				'$id' => $group['id'],
+				'$delete' => L10n::t('Delete Group'),
+				'$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
+			]);
+
+			$context = $context + [
+				'$title' => $group['name'],
+				'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+				'$gid' => $group['id'],
+				'$drop' => $drop_txt,
+				'$form_security_token' => BaseModule::getFormSecurityToken('group_edit'),
+				'$edit_name' => L10n::t('Edit Group Name'),
+				'$editable' => 1,
+			];
+		}
+
+		if (!isset($group)) {
+			System::httpExit(400);
+		}
+
+		$groupeditor = [
+			'label_members' => L10n::t('Members'),
+			'members' => [],
+			'label_contacts' => L10n::t('All Contacts'),
+			'group_is_empty' => L10n::t('Group is empty'),
+			'contacts' => [],
+		];
+
+		$sec_token = addslashes(BaseModule::getFormSecurityToken('group_member_change'));
+
+		// Format the data of the group members
+		foreach ($members as $member) {
+			if ($member['url']) {
+				$entry = Contact::getContactTemplateVars($member);
+				$entry['label'] = 'members';
+				$entry['photo_menu'] = '';
+				$entry['change_member'] = [
+					'title'     => L10n::t("Remove contact from group"),
+					'gid'       => $group['id'],
+					'cid'       => $member['id'],
+					'sec_token' => $sec_token
+				];
+
+				$groupeditor['members'][] = $entry;
+			} else {
+				Model\Group::removeMember($group['id'], $member['id']);
+			}
+		}
+
+		if ($nogroup) {
+			$contacts = Model\Contact::getUngroupedList(local_user());
+		} else {
+			$contacts_stmt = DBA::select('contact', [],
+				['uid' => local_user(), 'pending' => false, 'blocked' => false, 'self' => false],
+				['order' => ['name']]
+			);
+			$contacts = DBA::toArray($contacts_stmt);
+			$context['$desc'] = L10n::t('Click on a contact to add or remove.');
+		}
+
+		if (DBA::isResult($contacts)) {
+			// Format the data of the contacts who aren't in the contact group
+			foreach ($contacts as $member) {
+				if (!in_array($member['id'], $preselected)) {
+					$entry = Contact::getContactTemplateVars($member);
+					$entry['label'] = 'contacts';
+					if (!$nogroup)
+						$entry['photo_menu'] = [];
+
+					if (!$nogroup) {
+						$entry['change_member'] = [
+							'title'     => L10n::t("Add contact to group"),
+							'gid'       => $group['id'],
+							'cid'       => $member['id'],
+							'sec_token' => $sec_token
+						];
+					}
+
+					$groupeditor['contacts'][] = $entry;
+				}
+			}
+		}
+
+		$context['$groupeditor'] = $groupeditor;
+
+		// If there are to many contacts we could provide an alternative view mode
+		$total = count($groupeditor['members']) + count($groupeditor['contacts']);
+		$context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false);
+
+		if ($change) {
+			$tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
+			echo Renderer::replaceMacros($tpl, $context);
+			exit();
+		}
+
+		return Renderer::replaceMacros($tpl, $context);
+	}
+}
\ No newline at end of file