diff --git a/ugly_hacks/santiago/protocols/https.py b/ugly_hacks/santiago/protocols/https/controller.py
similarity index 100%
rename from ugly_hacks/santiago/protocols/https.py
rename to ugly_hacks/santiago/protocols/https/controller.py
diff --git a/ugly_hacks/santiago/santiago.py b/ugly_hacks/santiago/santiago.py
index 0245bf2a0..4b022a6c4 100644
--- a/ugly_hacks/santiago/santiago.py
+++ b/ugly_hacks/santiago/santiago.py
@@ -22,6 +22,8 @@ We don't:
 - Use a reasonable data-store.
 - Have a decent control (rate-limiting) mechanism.
 
+:FIXME: Remove sets and just do "key in" operations - it's annoying to remember
+    to convert to and from sets with every operation.  Or just build a wrapper.
 :TODO: add doctests
 :FIXME: allow multiple listeners and senders per protocol (with different
     proxies)
@@ -159,7 +161,7 @@ class Santiago(object):
         FIXME: Assumes the current directory is in sys.path
 
         """
-        import_name = "protocols." + protocol
+        import_name = "protocols.{0}.controller".format(protocol)
 
         if not import_name in sys.modules:
             __import__(import_name)