89 files changed, 62 insertions, 57 deletions

diff --git a/.coveragerc b/.coveragerc
index 5d36090c..ecdbc740 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,11 +1,11 @@
 [run]
 branch = true
 source =
-    admin
-    api
-    home
     pysite
-    wiki
+    pysite/apps/admin
+    pysite/apps/api
+    pysite/apps/home
+    pysite/apps/wiki
 omit =
     */admin.py
     */apps.py
diff --git a/.dockerignore b/.dockerignore
index d853d0d2..ec42c3f4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,8 +12,8 @@
 __pycache__
 admin/tests
 admin/tests.py
-api/tests
-api/tests.py
+pysite/apps/api/tests
+pysite/apps/api/tests.py
 CHANGELOG.md
 CONTRIBUTING.md
 docker
@@ -31,5 +31,5 @@ README.md
 scripts
 Vagrantfile
 venv
-wiki/tests
-wiki/tests.py
+pysite/apps/wiki/tests
+pysite/apps/wiki/tests.py
diff --git a/.flake8 b/.flake8
index 2f0a95fb..ee708c7c 100644
--- a/.flake8
+++ b/.flake8
@@ -1,6 +1,6 @@
 [flake8]
 max-line-length=100
 ignore=S106
-application_import_names=admin,api,home,pysite,wiki
+application_import_names=pysite
 exclude=__pycache__, venv, .venv, **/migrations
 import-order-style=pycharm
diff --git a/.gitignore b/.gitignore
index fa1c9106..9e5efd99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,5 +113,6 @@ rethinkdb_data/
 # Node modules
 node_modules/
 
+pip-wheel-metadata/
 *.js.tmp
 log.*
diff --git a/admin/__init__.py b/pysite/apps/__init__.py
index e69de29b..e69de29b 100644
--- a/admin/__init__.py
+++ b/pysite/apps/__init__.py
diff --git a/api/__init__.py b/pysite/apps/admin/__init__.py
index e69de29b..e69de29b 100644
--- a/api/__init__.py
+++ b/pysite/apps/admin/__init__.py
diff --git a/admin/urls.py b/pysite/apps/admin/urls.py
index 146c6496..146c6496 100644
--- a/admin/urls.py
+++ b/pysite/apps/admin/urls.py
diff --git a/api/migrations/__init__.py b/pysite/apps/api/__init__.py
index e69de29b..e69de29b 100644
--- a/api/migrations/__init__.py
+++ b/pysite/apps/api/__init__.py
diff --git a/api/admin.py b/pysite/apps/api/admin.py
index 3ae7f3c5..3ae7f3c5 100644
--- a/api/admin.py
+++ b/pysite/apps/api/admin.py
diff --git a/api/apps.py b/pysite/apps/api/apps.py
index d87006dd..d87006dd 100644
--- a/api/apps.py
+++ b/pysite/apps/api/apps.py
diff --git a/api/migrations/0001_initial.py b/pysite/apps/api/migrations/0001_initial.py
index dca6d17f..dca6d17f 100644
--- a/api/migrations/0001_initial.py
+++ b/pysite/apps/api/migrations/0001_initial.py
diff --git a/api/migrations/0002_documentationlink.py b/pysite/apps/api/migrations/0002_documentationlink.py
index 5dee679a..5dee679a 100644
--- a/api/migrations/0002_documentationlink.py
+++ b/pysite/apps/api/migrations/0002_documentationlink.py
diff --git a/api/migrations/0003_offtopicchannelname.py b/pysite/apps/api/migrations/0003_offtopicchannelname.py
index 2f19bfd8..2f19bfd8 100644
--- a/api/migrations/0003_offtopicchannelname.py
+++ b/pysite/apps/api/migrations/0003_offtopicchannelname.py
diff --git a/api/migrations/0004_role.py b/pysite/apps/api/migrations/0004_role.py
index 0a6b6c43..0a6b6c43 100644
--- a/api/migrations/0004_role.py
+++ b/pysite/apps/api/migrations/0004_role.py
diff --git a/api/migrations/0005_user.py b/pysite/apps/api/migrations/0005_user.py
index a771119c..a771119c 100644
--- a/api/migrations/0005_user.py
+++ b/pysite/apps/api/migrations/0005_user.py
diff --git a/api/migrations/0006_add_help_texts.py b/pysite/apps/api/migrations/0006_add_help_texts.py
index a57d2289..a57d2289 100644
--- a/api/migrations/0006_add_help_texts.py
+++ b/pysite/apps/api/migrations/0006_add_help_texts.py
diff --git a/api/migrations/0007_tag.py b/pysite/apps/api/migrations/0007_tag.py
index fdb3b9cc..d5546ccc 100644
--- a/api/migrations/0007_tag.py
+++ b/pysite/apps/api/migrations/0007_tag.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.1 on 2018-09-21 22:05
 
-import api.models
+import pysite.apps.api.models
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 
@@ -18,6 +18,6 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(help_text='The title of this tag, shown in searches and providing a quick overview over what this embed contains.', max_length=100, primary_key=True, serialize=False)),
                 ('embed', django.contrib.postgres.fields.jsonb.JSONField(help_text='The actual embed shown by this tag.')),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0008_tag_embed_validator.py b/pysite/apps/api/migrations/0008_tag_embed_validator.py
index 4c580294..fd2385d1 100644
--- a/api/migrations/0008_tag_embed_validator.py
+++ b/pysite/apps/api/migrations/0008_tag_embed_validator.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.1 on 2018-09-23 10:07
 
-import api.validators
+import pysite.apps.api.validators
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations
 
@@ -15,6 +15,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='tag',
             name='embed',
-            field=django.contrib.postgres.fields.jsonb.JSONField(help_text='The actual embed shown by this tag.', validators=[api.validators.validate_tag_embed]),
+            field=django.contrib.postgres.fields.jsonb.JSONField(help_text='The actual embed shown by this tag.', validators=[
+
+
+                pysite.apps.api.validators.validate_tag_embed]),
         ),
     ]
diff --git a/api/migrations/0009_snakefact.py b/pysite/apps/api/migrations/0009_snakefact.py
index 966478a9..2a136f83 100644
--- a/api/migrations/0009_snakefact.py
+++ b/pysite/apps/api/migrations/0009_snakefact.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.2 on 2018-10-11 14:25
 
-import api.models
+import pysite.apps.api.models
 from django.db import migrations, models
 
 
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
             fields=[
                 ('fact', models.CharField(help_text='A fact about snakes.', max_length=200, primary_key=True, serialize=False)),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0010_snakeidiom.py b/pysite/apps/api/migrations/0010_snakeidiom.py
index 982a9466..3eb99198 100644
--- a/api/migrations/0010_snakeidiom.py
+++ b/pysite/apps/api/migrations/0010_snakeidiom.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.2 on 2018-10-19 16:27
 
-import api.models
+import pysite.apps.api.models
 from django.db import migrations, models
 
 
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
             fields=[
                 ('idiom', models.CharField(help_text='A snake idiom', max_length=140, primary_key=True, serialize=False)),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0011_auto_20181020_1904.py b/pysite/apps/api/migrations/0011_auto_20181020_1904.py
index bb5a6325..bb5a6325 100644
--- a/api/migrations/0011_auto_20181020_1904.py
+++ b/pysite/apps/api/migrations/0011_auto_20181020_1904.py
diff --git a/api/migrations/0012_specialsnake.py b/pysite/apps/api/migrations/0012_specialsnake.py
index 9c6e8305..ecf1b9d9 100644
--- a/api/migrations/0012_specialsnake.py
+++ b/pysite/apps/api/migrations/0012_specialsnake.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.2 on 2018-10-22 09:53
 
-import api.models
+import pysite.apps.api.models
 from django.db import migrations, models
 
 
@@ -17,6 +17,6 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=140, primary_key=True, serialize=False)),
                 ('info', models.TextField()),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0013_specialsnake_image.py b/pysite/apps/api/migrations/0013_specialsnake_image.py
index a0d0d318..a0d0d318 100644
--- a/api/migrations/0013_specialsnake_image.py
+++ b/pysite/apps/api/migrations/0013_specialsnake_image.py
diff --git a/api/migrations/0014_auto_20181025_1959.py b/pysite/apps/api/migrations/0014_auto_20181025_1959.py
index 3599d2cd..3599d2cd 100644
--- a/api/migrations/0014_auto_20181025_1959.py
+++ b/pysite/apps/api/migrations/0014_auto_20181025_1959.py
diff --git a/api/migrations/0015_auto_20181027_1617.py b/pysite/apps/api/migrations/0015_auto_20181027_1617.py
index 8973ff6d..8973ff6d 100644
--- a/api/migrations/0015_auto_20181027_1617.py
+++ b/pysite/apps/api/migrations/0015_auto_20181027_1617.py
diff --git a/api/migrations/0016_auto_20181027_1619.py b/pysite/apps/api/migrations/0016_auto_20181027_1619.py
index b8bdfb16..b8bdfb16 100644
--- a/api/migrations/0016_auto_20181027_1619.py
+++ b/pysite/apps/api/migrations/0016_auto_20181027_1619.py
diff --git a/api/migrations/0017_auto_20181029_1921.py b/pysite/apps/api/migrations/0017_auto_20181029_1921.py
index 012bda61..012bda61 100644
--- a/api/migrations/0017_auto_20181029_1921.py
+++ b/pysite/apps/api/migrations/0017_auto_20181029_1921.py
diff --git a/api/migrations/0018_messagedeletioncontext.py b/pysite/apps/api/migrations/0018_messagedeletioncontext.py
index 88cbab28..10428ceb 100644
--- a/api/migrations/0018_messagedeletioncontext.py
+++ b/pysite/apps/api/migrations/0018_messagedeletioncontext.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.1 on 2018-11-18 20:12
 
-import api.models
+import pysite.apps.api.models
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -19,6 +19,6 @@ class Migration(migrations.Migration):
                 ('creation', models.DateTimeField(help_text='When this deletion took place.')),
                 ('actor', models.ForeignKey(help_text='The original actor causing this deletion. Could be the author of a manual clean command invocation, the bot when executing automatic actions, or nothing to indicate that the bulk deletion was not issued by us.', null=True, on_delete=django.db.models.deletion.CASCADE, to='api.User')),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0018_user_rename.py b/pysite/apps/api/migrations/0018_user_rename.py
index f88eb5bc..f88eb5bc 100644
--- a/api/migrations/0018_user_rename.py
+++ b/pysite/apps/api/migrations/0018_user_rename.py
diff --git a/api/migrations/0019_deletedmessage.py b/pysite/apps/api/migrations/0019_deletedmessage.py
index fbd94949..cb4c59f2 100644
--- a/api/migrations/0019_deletedmessage.py
+++ b/pysite/apps/api/migrations/0019_deletedmessage.py
@@ -1,10 +1,7 @@
 # Generated by Django 2.1.1 on 2018-11-18 20:26
 
-import api.models
-import api.validators
-import django.contrib.postgres.fields
-import django.contrib.postgres.fields.jsonb
-import django.core.validators
+import pysite.apps.api.models
+import pysite.apps.api.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -22,13 +19,16 @@ class Migration(migrations.Migration):
                 ('id', models.BigIntegerField(help_text='The message ID as taken from Discord.', primary_key=True, serialize=False, validators=[django.core.validators.MinValueValidator(limit_value=0, message='Message IDs cannot be negative.')])),
                 ('channel_id', models.BigIntegerField(help_text='The channel ID that this message was sent in, taken from Discord.', validators=[django.core.validators.MinValueValidator(limit_value=0, message='Channel IDs cannot be negative.')])),
                 ('content', models.CharField(help_text='The content of this message, taken from Discord.', max_length=2000)),
-                ('embeds', django.contrib.postgres.fields.ArrayField(base_field=django.contrib.postgres.fields.jsonb.JSONField(validators=[api.validators.validate_tag_embed]), help_text='Embeds attached to this message.', size=None)),
+                ('embeds', django.contrib.postgres.fields.ArrayField(base_field=django.contrib.postgres.fields.jsonb.JSONField(validators=[
+
+
+                    pysite.apps.api.validators.validate_tag_embed]), help_text='Embeds attached to this message.', size=None)),
                 ('author', models.ForeignKey(help_text='The author of this message.', on_delete=django.db.models.deletion.CASCADE, to='api.User')),
                 ('deletion_context', models.ForeignKey(help_text='The deletion context this message is part of.', on_delete=django.db.models.deletion.CASCADE, to='api.MessageDeletionContext')),
             ],
             options={
                 'abstract': False,
             },
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0019_user_in_guild.py b/pysite/apps/api/migrations/0019_user_in_guild.py
index fda008c4..fda008c4 100644
--- a/api/migrations/0019_user_in_guild.py
+++ b/pysite/apps/api/migrations/0019_user_in_guild.py
diff --git a/api/migrations/0020_add_snake_field_validators.py b/pysite/apps/api/migrations/0020_add_snake_field_validators.py
index 3b625f9b..3b625f9b 100644
--- a/api/migrations/0020_add_snake_field_validators.py
+++ b/pysite/apps/api/migrations/0020_add_snake_field_validators.py
diff --git a/api/migrations/0020_infraction.py b/pysite/apps/api/migrations/0020_infraction.py
index 2844a7f7..7f7d5a41 100644
--- a/api/migrations/0020_infraction.py
+++ b/pysite/apps/api/migrations/0020_infraction.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.3 on 2018-11-19 22:02
 
-import api.models
+import pysite.apps.api.models
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -25,6 +25,6 @@ class Migration(migrations.Migration):
                 ('actor', models.ForeignKey(help_text='The user which applied the infraction.', on_delete=django.db.models.deletion.CASCADE, related_name='infractions_given', to='api.User')),
                 ('user', models.ForeignKey(help_text='The user to which the infraction was applied.', on_delete=django.db.models.deletion.CASCADE, related_name='infractions_received', to='api.User')),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0021_add_special_snake_validator.py b/pysite/apps/api/migrations/0021_add_special_snake_validator.py
index d41b96e5..d41b96e5 100644
--- a/api/migrations/0021_add_special_snake_validator.py
+++ b/pysite/apps/api/migrations/0021_add_special_snake_validator.py
diff --git a/api/migrations/0021_infraction_reason_null.py b/pysite/apps/api/migrations/0021_infraction_reason_null.py
index 6600f230..6600f230 100644
--- a/api/migrations/0021_infraction_reason_null.py
+++ b/pysite/apps/api/migrations/0021_infraction_reason_null.py
diff --git a/api/migrations/0021_merge_20181125_1015.py b/pysite/apps/api/migrations/0021_merge_20181125_1015.py
index d8eaa510..d8eaa510 100644
--- a/api/migrations/0021_merge_20181125_1015.py
+++ b/pysite/apps/api/migrations/0021_merge_20181125_1015.py
diff --git a/api/migrations/0022_infraction_remove_note.py b/pysite/apps/api/migrations/0022_infraction_remove_note.py
index eba84610..eba84610 100644
--- a/api/migrations/0022_infraction_remove_note.py
+++ b/pysite/apps/api/migrations/0022_infraction_remove_note.py
diff --git a/api/migrations/0023_merge_infractions_snake_validators.py b/pysite/apps/api/migrations/0023_merge_infractions_snake_validators.py
index 916f78f2..916f78f2 100644
--- a/api/migrations/0023_merge_infractions_snake_validators.py
+++ b/pysite/apps/api/migrations/0023_merge_infractions_snake_validators.py
diff --git a/api/migrations/0024_add_note_infraction_type.py b/pysite/apps/api/migrations/0024_add_note_infraction_type.py
index 4adb53b8..4adb53b8 100644
--- a/api/migrations/0024_add_note_infraction_type.py
+++ b/pysite/apps/api/migrations/0024_add_note_infraction_type.py
diff --git a/api/migrations/0025_allow_custom_inserted_at_infraction_field.py b/pysite/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py
index 0c02cb91..0c02cb91 100644
--- a/api/migrations/0025_allow_custom_inserted_at_infraction_field.py
+++ b/pysite/apps/api/migrations/0025_allow_custom_inserted_at_infraction_field.py
diff --git a/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py b/pysite/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py
index 56f3b2b8..56f3b2b8 100644
--- a/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py
+++ b/pysite/apps/api/migrations/0026_use_proper_default_for_infraction_insertion_date.py
diff --git a/api/migrations/0027_merge_20190120_0852.py b/pysite/apps/api/migrations/0027_merge_20190120_0852.py
index 6fab4fd0..6fab4fd0 100644
--- a/api/migrations/0027_merge_20190120_0852.py
+++ b/pysite/apps/api/migrations/0027_merge_20190120_0852.py
diff --git a/api/migrations/0028_allow_message_content_blank.py b/pysite/apps/api/migrations/0028_allow_message_content_blank.py
index 6d57db27..6d57db27 100644
--- a/api/migrations/0028_allow_message_content_blank.py
+++ b/pysite/apps/api/migrations/0028_allow_message_content_blank.py
diff --git a/api/migrations/0029_add_infraction_type_watch.py b/pysite/apps/api/migrations/0029_add_infraction_type_watch.py
index c6f88a11..c6f88a11 100644
--- a/api/migrations/0029_add_infraction_type_watch.py
+++ b/pysite/apps/api/migrations/0029_add_infraction_type_watch.py
diff --git a/api/migrations/0030_reminder.py b/pysite/apps/api/migrations/0030_reminder.py
index f0c14ccb..8448ac8c 100644
--- a/api/migrations/0030_reminder.py
+++ b/pysite/apps/api/migrations/0030_reminder.py
@@ -1,7 +1,6 @@
 # Generated by Django 2.1.5 on 2019-01-22 22:17
 
-import api.models
-import django.core.validators
+import pysite.apps.api.models
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -23,6 +22,6 @@ class Migration(migrations.Migration):
                 ('expiration', models.DateTimeField(help_text='When this reminder should be sent.')),
                 ('author', models.ForeignKey(help_text='The creator of this reminder.', on_delete=django.db.models.deletion.CASCADE, to='api.User')),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0031_nomination.py b/pysite/apps/api/migrations/0031_nomination.py
index b739d5cb..f15da5c3 100644
--- a/api/migrations/0031_nomination.py
+++ b/pysite/apps/api/migrations/0031_nomination.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.5 on 2019-01-27 11:01
 
-import api.models
+import pysite.apps.api.models
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -21,6 +21,6 @@ class Migration(migrations.Migration):
                 ('inserted_at', models.DateTimeField(auto_now_add=True, help_text='The creation date of this nomination.')),
                 ('author', models.ForeignKey(help_text='The staff member that nominated this user.', on_delete=django.db.models.deletion.CASCADE, related_name='nomination_set', to='api.User')),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0032_botsetting.py b/pysite/apps/api/migrations/0032_botsetting.py
index 4ad1323e..b7916dff 100644
--- a/api/migrations/0032_botsetting.py
+++ b/pysite/apps/api/migrations/0032_botsetting.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-07 19:03
 
-import api.models
+import pysite.apps.api.models
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 
@@ -18,6 +18,6 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=50, primary_key=True, serialize=False)),
                 ('data', django.contrib.postgres.fields.jsonb.JSONField(help_text='The actual settings of this setting.')),
             ],
-            bases=(api.models.ModelReprMixin, models.Model),
+            bases=(pysite.apps.api.models.ModelReprMixin, models.Model),
         ),
     ]
diff --git a/api/migrations/0033_create_defcon_settings.py b/pysite/apps/api/migrations/0033_create_defcon_settings.py
index 830f3fb0..830f3fb0 100644
--- a/api/migrations/0033_create_defcon_settings.py
+++ b/pysite/apps/api/migrations/0033_create_defcon_settings.py
diff --git a/api/migrations/0034_add_botsetting_name_validator.py b/pysite/apps/api/migrations/0034_add_botsetting_name_validator.py
index c5681ef3..79aee41e 100644
--- a/api/migrations/0034_add_botsetting_name_validator.py
+++ b/pysite/apps/api/migrations/0034_add_botsetting_name_validator.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.1.5 on 2019-02-18 19:41
 
-import api.validators
+import pysite.apps.api.validators
 from django.db import migrations, models
 
 
@@ -14,6 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='botsetting',
             name='name',
-            field=models.CharField(max_length=50, primary_key=True, serialize=False, validators=[api.validators.validate_bot_setting_name]),
+            field=models.CharField(max_length=50, primary_key=True, serialize=False, validators=[
+                pysite.apps.api.validators.validate_bot_setting_name]),
         ),
     ]
diff --git a/api/tests/__init__.py b/pysite/apps/api/migrations/__init__.py
index e69de29b..e69de29b 100644
--- a/api/tests/__init__.py
+++ b/pysite/apps/api/migrations/__init__.py
diff --git a/api/models.py b/pysite/apps/api/models.py
index 86c99f86..86c99f86 100644
--- a/api/models.py
+++ b/pysite/apps/api/models.py
diff --git a/api/serializers.py b/pysite/apps/api/serializers.py
index 9a92313a..9a92313a 100644
--- a/api/serializers.py
+++ b/pysite/apps/api/serializers.py
diff --git a/home/__init__.py b/pysite/apps/api/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/home/__init__.py
+++ b/pysite/apps/api/tests/__init__.py
diff --git a/api/tests/base.py b/pysite/apps/api/tests/base.py
index 5d8ccf8c..61829d6f 100644
--- a/api/tests/base.py
+++ b/pysite/apps/api/tests/base.py
@@ -28,7 +28,7 @@ class APISubdomainTestCase(APITestCase):
     If you don't want to force authentication (for example, to test a route's response
     for an unauthenticated user), un-force authentication by using the following:
 
-    >>> from api.test.base import APISubdomainTestCase
+    >>> from pysite.apps.api import APISubdomainTestCase
     >>> class UnauthedUserTestCase(APISubdomainTestCase):
     ...     def setUp(self):
     ...         super().setUp()
@@ -46,7 +46,7 @@ class APISubdomainTestCase(APITestCase):
     ## Example
     Using this in a test case is rather straightforward:
 
-    >>> from api.tests.base import APISubdomainTestCase
+    >>> from pysite.apps.api import APISubdomainTestCase
     >>> class MyAPITestCase(APISubdomainTestCase):
     ...     def test_that_it_works(self):
     ...         response = self.client.get('/my-endpoint')
@@ -55,7 +55,7 @@ class APISubdomainTestCase(APITestCase):
     To reverse URLs of the API host, you need to use `django_hosts`:
 
     >>> from django_hosts.resolvers import reverse
-    >>> from api.test.base import APISubdomainTestCase
+    >>> from pysite.apps.api import APISubdomainTestCase
     >>> class MyReversedTestCase(APISubdomainTestCase):
     ...     def test_my_endpoint(self):
     ...         url = reverse('user-detail', host='api')
diff --git a/api/tests/test_deleted_messages.py b/pysite/apps/api/tests/test_deleted_messages.py
index cd5acab0..cd5acab0 100644
--- a/api/tests/test_deleted_messages.py
+++ b/pysite/apps/api/tests/test_deleted_messages.py
diff --git a/api/tests/test_documentation_links.py b/pysite/apps/api/tests/test_documentation_links.py
index f6c78391..f6c78391 100644
--- a/api/tests/test_documentation_links.py
+++ b/pysite/apps/api/tests/test_documentation_links.py
diff --git a/api/tests/test_healthcheck.py b/pysite/apps/api/tests/test_healthcheck.py
index b0fd71bf..b0fd71bf 100644
--- a/api/tests/test_healthcheck.py
+++ b/pysite/apps/api/tests/test_healthcheck.py
diff --git a/api/tests/test_infractions.py b/pysite/apps/api/tests/test_infractions.py
index 7c370c17..7c370c17 100644
--- a/api/tests/test_infractions.py
+++ b/pysite/apps/api/tests/test_infractions.py
diff --git a/api/tests/test_models.py b/pysite/apps/api/tests/test_models.py
index 43d1eb41..43d1eb41 100644
--- a/api/tests/test_models.py
+++ b/pysite/apps/api/tests/test_models.py
diff --git a/api/tests/test_nominations.py b/pysite/apps/api/tests/test_nominations.py
index 1f03d1b0..1f03d1b0 100644
--- a/api/tests/test_nominations.py
+++ b/pysite/apps/api/tests/test_nominations.py
diff --git a/api/tests/test_off_topic_channel_names.py b/pysite/apps/api/tests/test_off_topic_channel_names.py
index 60af1f62..60af1f62 100644
--- a/api/tests/test_off_topic_channel_names.py
+++ b/pysite/apps/api/tests/test_off_topic_channel_names.py
diff --git a/api/tests/test_rules.py b/pysite/apps/api/tests/test_rules.py
index c94f89cc..c94f89cc 100644
--- a/api/tests/test_rules.py
+++ b/pysite/apps/api/tests/test_rules.py
diff --git a/api/tests/test_snake_names.py b/pysite/apps/api/tests/test_snake_names.py
index 41dfae63..41dfae63 100644
--- a/api/tests/test_snake_names.py
+++ b/pysite/apps/api/tests/test_snake_names.py
diff --git a/api/tests/test_users.py b/pysite/apps/api/tests/test_users.py
index 90bc3d30..90bc3d30 100644
--- a/api/tests/test_users.py
+++ b/pysite/apps/api/tests/test_users.py
diff --git a/api/tests/test_validators.py b/pysite/apps/api/tests/test_validators.py
index d2c0a136..d2c0a136 100644
--- a/api/tests/test_validators.py
+++ b/pysite/apps/api/tests/test_validators.py
diff --git a/api/urls.py b/pysite/apps/api/urls.py
index 6c89a52e..6c89a52e 100644
--- a/api/urls.py
+++ b/pysite/apps/api/urls.py
diff --git a/api/validators.py b/pysite/apps/api/validators.py
index 35bbfab4..5159cdb3 100644
--- a/api/validators.py
+++ b/pysite/apps/api/validators.py
@@ -86,7 +86,7 @@ def validate_tag_embed(embed):
 
         >>> from django.contrib.postgres import fields as pgfields
         >>> from django.db import models
-        >>> from api.validators import validate_tag_embed
+        >>> from pysite.apps.api import validate_tag_embed
         >>> class MyMessage(models.Model):
         ...     embed = pgfields.JSONField(
         ...         validators=(
diff --git a/api/views.py b/pysite/apps/api/views.py
index c529da0f..f88e1039 100644
--- a/api/views.py
+++ b/pysite/apps/api/views.py
@@ -131,7 +131,7 @@ class RulesView(APIView):
             ),
             (
                 "We will not help you with anything that might break a law or the "
-                "terms of service of any other community, site, service, or "
+                "terms of service of any other community, pysite, service, or "
                 "otherwise - No piracy, brute-forcing, captcha circumvention, "
                 "sneaker bots, or anything else of that nature."
             ),
diff --git a/api/viewsets.py b/pysite/apps/api/viewsets.py
index 17024fe8..0bd6149f 100644
--- a/api/viewsets.py
+++ b/pysite/apps/api/viewsets.py
@@ -54,7 +54,7 @@ class DeletedMessageViewSet(CreateModelMixin, GenericViewSet):
     #### Body schema
     >>> {
     ...     # The member ID of the original actor, if applicable.
-    ...     # If a member ID is given, it must be present on the site.
+    ...     # If a member ID is given, it must be present on the pysite.
     ...     'actor': Optional[int]
     ...     'creation': datetime,
     ...     'messages': [
@@ -192,7 +192,7 @@ class InfractionViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     ### POST /bot/infractions
     Create a new infraction and return the created infraction.
     Only `actor`, `type`, and `user` are required.
-    The `actor` and `user` must be users known by the site.
+    The `actor` and `user` must be users known by the pysite.
 
     #### Request body
     >>> {
@@ -427,7 +427,7 @@ class ReminderViewSet(CreateModelMixin, ListModelMixin, DestroyModelMixin, Gener
 class RoleViewSet(ModelViewSet):
     """
     View providing CRUD access to the roles on our server, used
-    by the bot to keep a mirror of our server's roles on the site.
+    by the bot to keep a mirror of our server's roles on the pysite.
 
     ## Routes
     ### GET /bot/roles
@@ -802,7 +802,7 @@ class UserViewSet(BulkCreateModelMixin, ModelViewSet):
 
     ### POST /bot/users
     Adds a single or multiple new users.
-    The roles attached to the user(s) must be roles known by the site.
+    The roles attached to the user(s) must be roles known by the pysite.
 
     #### Request body
     >>> {
diff --git a/home/migrations/__init__.py b/pysite/apps/home/__init__.py
index e69de29b..e69de29b 100644
--- a/home/migrations/__init__.py
+++ b/pysite/apps/home/__init__.py
diff --git a/home/admin.py b/pysite/apps/home/admin.py
index 4185d360..4185d360 100644
--- a/home/admin.py
+++ b/pysite/apps/home/admin.py
diff --git a/home/apps.py b/pysite/apps/home/apps.py
index 90dc7137..90dc7137 100644
--- a/home/apps.py
+++ b/pysite/apps/home/apps.py
diff --git a/wiki/__init__.py b/pysite/apps/home/migrations/__init__.py
index e69de29b..e69de29b 100644
--- a/wiki/__init__.py
+++ b/pysite/apps/home/migrations/__init__.py
diff --git a/home/models.py b/pysite/apps/home/models.py
index 0b4331b3..0b4331b3 100644
--- a/home/models.py
+++ b/pysite/apps/home/models.py
diff --git a/home/tests.py b/pysite/apps/home/tests.py
index 54fac6e8..54fac6e8 100644
--- a/home/tests.py
+++ b/pysite/apps/home/tests.py
diff --git a/home/urls.py b/pysite/apps/home/urls.py
index a01e019e..a01e019e 100644
--- a/home/urls.py
+++ b/pysite/apps/home/urls.py
diff --git a/home/views.py b/pysite/apps/home/views.py
index fd0e0449..fd0e0449 100644
--- a/home/views.py
+++ b/pysite/apps/home/views.py
diff --git a/wiki/migrations/__init__.py b/pysite/apps/wiki/__init__.py
index e69de29b..e69de29b 100644
--- a/wiki/migrations/__init__.py
+++ b/pysite/apps/wiki/__init__.py
diff --git a/wiki/admin.py b/pysite/apps/wiki/admin.py
index 4185d360..4185d360 100644
--- a/wiki/admin.py
+++ b/pysite/apps/wiki/admin.py
diff --git a/wiki/apps.py b/pysite/apps/wiki/apps.py
index fce4708e..fce4708e 100644
--- a/wiki/apps.py
+++ b/pysite/apps/wiki/apps.py
diff --git a/pysite/apps/wiki/migrations/__init__.py b/pysite/apps/wiki/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/pysite/apps/wiki/migrations/__init__.py
diff --git a/wiki/models.py b/pysite/apps/wiki/models.py
index 0b4331b3..0b4331b3 100644
--- a/wiki/models.py
+++ b/pysite/apps/wiki/models.py
diff --git a/wiki/tests.py b/pysite/apps/wiki/tests.py
index a79ca8be..a79ca8be 100644
--- a/wiki/tests.py
+++ b/pysite/apps/wiki/tests.py
diff --git a/wiki/views.py b/pysite/apps/wiki/views.py
index fd0e0449..fd0e0449 100644
--- a/wiki/views.py
+++ b/pysite/apps/wiki/views.py
diff --git a/pysite/hosts.py b/pysite/hosts.py
index 9d4c1ce9..bb8f867d 100644
--- a/pysite/hosts.py
+++ b/pysite/hosts.py
@@ -4,10 +4,10 @@ from django_hosts import host, patterns
 host_patterns = patterns(
     '',
     # > | Subdomain | URL Module   | Host entry name |
-    host(r'admin', 'admin.urls', name="admin"),
-    host(r'api', 'api.urls', name='api'),
-    # host(r"staff",    "staff",  name="staff"),
-    # host(r"wiki",     "wiki",   name="wiki"),
-    # host(r"ws",       "ws",     name="ws"),
-    host(r'.*', 'home.urls', name=settings.DEFAULT_HOST)
+    host(r'admin', 'pysite.apps.admin.urls', name="admin"),
+    host(r'api', 'pysite.apps.api.urls', name='api'),
+    # host(r"staff",    "pysite.apps.staff",  name="staff"),
+    # host(r"wiki",     "pysite.apps.wiki",   name="wiki"),
+    # host(r"ws",       "pysite.apps. ws",     name="ws"),
+    host(r'.*', 'pysite.apps.home.urls', name=settings.DEFAULT_HOST)
 )
diff --git a/pysite/settings.py b/pysite/settings.py
index b27e2a41..ac043248 100644
--- a/pysite/settings.py
+++ b/pysite/settings.py
@@ -62,8 +62,9 @@ else:
 # Application definition
 
 INSTALLED_APPS = [
-    'api',
-    'home',
+    'pysite.apps.api',
+    'pysite.apps.home',
+    'pysite.apps.wiki',
 
     'django.contrib.admin',
     'django.contrib.auth',
diff --git a/home/static/home/css/index.css b/pysite/static/home/css/index.css
index 76653320..76653320 100644
--- a/home/static/home/css/index.css
+++ b/pysite/static/home/css/index.css
diff --git a/home/templates/home/index.html b/pysite/templates/home/index.html
index cc99763b..cc99763b 100644
--- a/home/templates/home/index.html
+++ b/pysite/templates/home/index.html
diff --git a/pysite/urls.py b/pysite/urls.py
index e162a092..25ce2106 100644
--- a/pysite/urls.py
+++ b/pysite/urls.py
@@ -2,5 +2,5 @@ from django.urls import include, path
 
 
 urlpatterns = (
-    path('', include('home.urls', namespace='home')),
+    path('', include('pysite.apps.home.urls', namespace='home')),
 )