diff --git a/disco/bot/bot.py b/disco/bot/bot.py
index 2850f76..c4f391b 100644
--- a/disco/bot/bot.py
+++ b/disco/bot/bot.py
@@ -113,7 +113,9 @@ class Bot(object):
     def __init__(self, client, config=None):
         self.client = client
         self.config = config or BotConfig()
-        self.shards = {}
+
+        # Shard manager
+        self.shards = None
 
         # The context carries information about events in a threadlocal storage
         self.ctx = ThreadLocal()
@@ -123,6 +125,7 @@ class Bot(object):
         if self.config.storage_enabled:
             self.storage = Storage(self.ctx, self.config.from_prefix('storage'))
 
+        # If the manhole is enabled, add this bot as a local
         if self.client.config.manhole_enable:
             self.client.manhole_locals['bot'] = self
 
diff --git a/disco/gateway/ipc/gipc.py b/disco/gateway/ipc.py
similarity index 100%
rename from disco/gateway/ipc/gipc.py
rename to disco/gateway/ipc.py
diff --git a/disco/gateway/ipc/__init__.py b/disco/gateway/ipc/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/disco/gateway/packets.py b/disco/gateway/packets.py
index e78c1ce..a15bfd8 100644
--- a/disco/gateway/packets.py
+++ b/disco/gateway/packets.py
@@ -1,7 +1,7 @@
 from holster.enum import Enum
 
-SEND = object()
-RECV = object()
+SEND = 1
+RECV = 2
 
 OPCode = Enum(
     DISPATCH=0,
diff --git a/disco/gateway/sharder.py b/disco/gateway/sharder.py
index b77d9b9..f718c3d 100644
--- a/disco/gateway/sharder.py
+++ b/disco/gateway/sharder.py
@@ -12,7 +12,7 @@ from holster.log import set_logging_levels
 from disco.client import Client
 from disco.bot import Bot, BotConfig
 from disco.api.client import APIClient
-from disco.gateway.ipc.gipc import GIPCProxy
+from disco.gateway.ipc import GIPCProxy
 from disco.util.snowflake import calculate_shard