Move the cogs into a subdir

py/matchy.py

@@ -6,9 +6,9 @@ import discord
 from discord.ext import commands
 import config
 import state
-from matchy_cog import MatchyCog
+from cogs.matchy_cog import MatchyCog
-from owner_cog import OwnerCog
+from cogs.owner_cog import OwnerCog
-import match_button
+import cogs.match_button as match_button
 
 State = state.load_from_file()
 

py/util.py

@@ -21,7 +21,7 @@ def format_day(time: datetime) -> str:
     return f"{day} {num}"
 
 
-def format_list(list) -> str:
+def format_list(list: list) -> str:
     """Format a list into a human readable format of foo, bar and bob"""
     if len(list) > 1:
         return f"{', '.join(list[:-1])} and {list[-1]}"