diff --git a/plugins/Directory/Controller/Directory.php b/plugins/Directory/Controller/Directory.php
new file mode 100644
index 0000000000..5f75e7b881
--- /dev/null
+++ b/plugins/Directory/Controller/Directory.php
@@ -0,0 +1,38 @@
+<?php
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Plugin\Directory\Controller;
+
+use App\Core\DB\DB;
+use Symfony\Component\HttpFoundation\Request;
+
+class Directory
+{
+    public function people(Request $request)
+    {
+        return ['_template' => 'directory/people.html.twig', 'people' => DB::dql('select g from App\Entity\GSActor g order by g.nickname ASC')];
+    }
+
+    public function groups(Request $request)
+    {
+        return ['_template' => 'directory/group.html.twig', 'groups' => DB::dql('select g from App\Entity\Group g order by g.nickname ASC')];
+    }
+}
diff --git a/plugins/Directory/Directory.php b/plugins/Directory/Directory.php
new file mode 100644
index 0000000000..ca731c2962
--- /dev/null
+++ b/plugins/Directory/Directory.php
@@ -0,0 +1,34 @@
+<?php
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Plugin\Directory;
+
+use App\Core\Module;
+
+class Directory extends Module
+{
+    public function onAddRoute($r)
+    {
+        $r->connect('people', '/people', [Controller\Directory::class, 'people']);
+        $r->connect('groups', '/groups', [Controller\Directory::class, 'groups']);
+        return Event::next;
+    }
+}