diff --git a/homeassistant/EventBus.py b/homeassistant/EventBus.py
index b523221ca0a..ad207a8a4d7 100644
--- a/homeassistant/EventBus.py
+++ b/homeassistant/EventBus.py
@@ -61,7 +61,7 @@ class EventBus(object):
 class Event(object):
     """ An event to be sent over the eventbus. """
 
-    def __init__(self, event_type, data):
+    def __init__(self, event_type, data={}):
         self.event_type = event_type
         self.data = data
         self.stop_propegating = False
diff --git a/homeassistant/util.py b/homeassistant/common.py
similarity index 100%
rename from homeassistant/util.py
rename to homeassistant/common.py