diff --git a/app/EventBus.py b/homeassistant/EventBus.py
similarity index 100%
rename from app/EventBus.py
rename to homeassistant/EventBus.py
diff --git a/app/HomeAssistant.py b/homeassistant/HomeAssistant.py
similarity index 89%
rename from app/HomeAssistant.py
rename to homeassistant/HomeAssistant.py
index d61ac98b8cf..987ebb7edd5 100644
--- a/app/HomeAssistant.py
+++ b/homeassistant/HomeAssistant.py
@@ -2,15 +2,15 @@ import logging
 from ConfigParser import SafeConfigParser
 import time
 
-from app.StateMachine import StateMachine
-from app.EventBus import EventBus
-from app.HttpInterface import HttpInterface
+from homeassistant.StateMachine import StateMachine
+from homeassistant.EventBus import EventBus
+from homeassistant.HttpInterface import HttpInterface
 
-from app.observer.DeviceTracker import DeviceTracker
-from app.observer.WeatherWatcher import WeatherWatcher
-from app.observer.Timer import Timer
+from homeassistant.observer.DeviceTracker import DeviceTracker
+from homeassistant.observer.WeatherWatcher import WeatherWatcher
+from homeassistant.observer.Timer import Timer
 
-from app.actor.LightTrigger import LightTrigger
+from homeassistant.actor.LightTrigger import LightTrigger
 
 CONFIG_FILE = "home-assistant.conf"
 
diff --git a/app/HttpInterface.py b/homeassistant/HttpInterface.py
similarity index 100%
rename from app/HttpInterface.py
rename to homeassistant/HttpInterface.py
diff --git a/app/StateMachine.py b/homeassistant/StateMachine.py
similarity index 96%
rename from app/StateMachine.py
rename to homeassistant/StateMachine.py
index 175b784d823..3ed8d1f776b 100644
--- a/app/StateMachine.py
+++ b/homeassistant/StateMachine.py
@@ -2,8 +2,8 @@ from collections import namedtuple
 from threading import RLock
 from datetime import datetime
 
-from app.EventBus import Event
-from app.util import matcher
+from homeassistant.EventBus import Event
+from homeassistant.util import matcher
 
 EVENT_STATE_CHANGED = "state_changed"
 
diff --git a/app/__init__.py b/homeassistant/__init__.py
similarity index 100%
rename from app/__init__.py
rename to homeassistant/__init__.py
diff --git a/app/actor/HueLightControl.py b/homeassistant/actor/HueLightControl.py
similarity index 100%
rename from app/actor/HueLightControl.py
rename to homeassistant/actor/HueLightControl.py
diff --git a/app/actor/LightTrigger.py b/homeassistant/actor/LightTrigger.py
similarity index 91%
rename from app/actor/LightTrigger.py
rename to homeassistant/actor/LightTrigger.py
index 8f812ffe8f7..eca02eccf29 100644
--- a/app/actor/LightTrigger.py
+++ b/homeassistant/actor/LightTrigger.py
@@ -1,10 +1,10 @@
 import logging
 from datetime import datetime, timedelta
 
-from app.observer.WeatherWatcher import STATE_CATEGORY_SUN, SUN_STATE_BELOW_HORIZON, SUN_STATE_ABOVE_HORIZON
-from app.observer.DeviceTracker import STATE_CATEGORY_ALL_DEVICES, STATE_DEVICE_HOME, STATE_DEVICE_NOT_HOME
-from app.StateMachine import track_state_change
-from app.observer.Timer import track_time_change
+from homeassistant.observer.WeatherWatcher import STATE_CATEGORY_SUN, SUN_STATE_BELOW_HORIZON, SUN_STATE_ABOVE_HORIZON
+from homeassistant.observer.DeviceTracker import STATE_CATEGORY_ALL_DEVICES, STATE_DEVICE_HOME, STATE_DEVICE_NOT_HOME
+from homeassistant.StateMachine import track_state_change
+from homeassistant.observer.Timer import track_time_change
 
 LIGHT_TRANSITION_TIME = timedelta(minutes=15)
 
diff --git a/app/actor/__init__.py b/homeassistant/actor/__init__.py
similarity index 100%
rename from app/actor/__init__.py
rename to homeassistant/actor/__init__.py
diff --git a/app/observer/DeviceTracker.py b/homeassistant/observer/DeviceTracker.py
similarity index 98%
rename from app/observer/DeviceTracker.py
rename to homeassistant/observer/DeviceTracker.py
index c3d04db53a8..0143abfd786 100644
--- a/app/observer/DeviceTracker.py
+++ b/homeassistant/observer/DeviceTracker.py
@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-from app.observer.Timer import track_time_change
+from homeassistant.observer.Timer import track_time_change
 
 STATE_DEVICE_NOT_HOME = 'device_not_home'
 STATE_DEVICE_HOME = 'device_home'
diff --git a/app/observer/Timer.py b/homeassistant/observer/Timer.py
similarity index 96%
rename from app/observer/Timer.py
rename to homeassistant/observer/Timer.py
index df8b9c98b05..5273dfc9c55 100644
--- a/app/observer/Timer.py
+++ b/homeassistant/observer/Timer.py
@@ -3,8 +3,8 @@ from datetime import datetime
 import threading
 import time
 
-from app.EventBus import Event
-from app.util import matcher
+from homeassistant.EventBus import Event
+from homeassistant.util import matcher
 
 TIME_INTERVAL = 10 # seconds
 
diff --git a/app/observer/TomatoDeviceScanner.py b/homeassistant/observer/TomatoDeviceScanner.py
similarity index 100%
rename from app/observer/TomatoDeviceScanner.py
rename to homeassistant/observer/TomatoDeviceScanner.py
diff --git a/app/observer/WeatherWatcher.py b/homeassistant/observer/WeatherWatcher.py
similarity index 97%
rename from app/observer/WeatherWatcher.py
rename to homeassistant/observer/WeatherWatcher.py
index 0ae3752782f..c83039b2f26 100644
--- a/app/observer/WeatherWatcher.py
+++ b/homeassistant/observer/WeatherWatcher.py
@@ -3,7 +3,7 @@ from datetime import timedelta
 
 import ephem
 
-from app.observer.Timer import track_time_change
+from homeassistant.observer.Timer import track_time_change
 
 STATE_CATEGORY_SUN = "weather.sun"
 
diff --git a/app/observer/__init__.py b/homeassistant/observer/__init__.py
similarity index 100%
rename from app/observer/__init__.py
rename to homeassistant/observer/__init__.py
diff --git a/app/util.py b/homeassistant/util.py
similarity index 100%
rename from app/util.py
rename to homeassistant/util.py
diff --git a/start.py b/start.py
index 4206bbb3093..c14413f669b 100644
--- a/start.py
+++ b/start.py
@@ -1,7 +1,7 @@
-from app.HomeAssistant import HomeAssistant
+from homeassistant.HomeAssistant import HomeAssistant
 
-from app.actor.HueLightControl import HueLightControl
-from app.observer.TomatoDeviceScanner import TomatoDeviceScanner
+from homeassistant.actor.HueLightControl import HueLightControl
+from homeassistant.observer.TomatoDeviceScanner import TomatoDeviceScanner
 
 ha = HomeAssistant()