diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9c912861a74..6157a955a55 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,8 +1,10 @@
 # This list auto requests reviews from the specified org members
 # when a PR that modifies the file in question is opened
-# This list is alphabetized by User -> Filename KEEP IT THAT WAY
-# In the event that multiple org members are to be informed of changes
-# to the same file or dir, add them to the end under Multiple Owners
+# This list is alphabetized by User -> Filename and separated into sections for Maintainers/Contributors KEEP IT THAT WAY
+# In the event that people are to be informed of changes
+# to the same file or dir, add them to the end of under Multiple Owners
+
+# MAINTAINERS
 
 # Cobby
 /code/modules/reagents/ @ExcessiveUseOfCobblestone
@@ -37,18 +39,6 @@
 /code/__DEFINES/atmospherics.dm @LemonInTheDark
 /code/modules/atmospherics/ @LemonInTheDark
 
-# MrStonedOne
-
-/SQL/database_changelog.txt @MrStonedOne
-/code/__DEFINES/MC.dm @MrStonedOne
-/code/controllers/admin.dm @MrStonedOne
-/code/controllers/master.dm @MrStonedOne
-/code/controllers/failsafe.dm @MrStonedOne
-/code/controllers/subsystem.dm @MrStonedOne
-/code/controllers/subsystem/timer.dm @MrStonedOne
-/code/controllers/configuration/entries @MrStonedOne
-/config/ @MrStonedOne
-
 # Mothblocks
 
 /code/modules/unit_tests/ @Mothblocks
@@ -90,11 +80,25 @@
 
 /code/modules/wiremod/ @Watermelon914
 
-# JohnFulpWillard
+# CONTRIBUTORS
+
+# JohnFulpWizard
 
 /goon/ @JohnFulpWillard
 
-# Multiple Owners
+# MrStonedOne
+
+/SQL/database_changelog.txt @MrStonedOne
+/code/__DEFINES/MC.dm @MrStonedOne
+/code/controllers/admin.dm @MrStonedOne
+/code/controllers/master.dm @MrStonedOne
+/code/controllers/failsafe.dm @MrStonedOne
+/code/controllers/subsystem.dm @MrStonedOne
+/code/controllers/subsystem/timer.dm @MrStonedOne
+/code/controllers/configuration/entries @MrStonedOne
+/config/ @MrStonedOne
+
+# MULTIPLE OWNERS
 
 /icons/ @Twaticus @ShizCalev @Krysonism
 /code/controllers/subsystem/air.dm @LemonInTheDark @MrStonedOne