diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 514c1adce57..e5f6d2b9672 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -13,7 +13,7 @@ import os
 import logging
 from collections import defaultdict
 
-import homeassistant
+import homeassistant.core as core
 import homeassistant.util.dt as date_util
 import homeassistant.util.package as pkg_util
 import homeassistant.util.location as loc_util
@@ -152,9 +152,9 @@ def from_config_dict(config, hass=None):
     Dynamically loads required components and its dependencies.
     """
     if hass is None:
-        hass = homeassistant.HomeAssistant()
+        hass = core.HomeAssistant()
 
-    process_ha_core_config(hass, config.get(homeassistant.DOMAIN, {}))
+    process_ha_core_config(hass, config.get(core.DOMAIN, {}))
 
     enable_logging(hass)
 
@@ -168,7 +168,7 @@ def from_config_dict(config, hass=None):
 
     # Filter out the repeating and common config section [homeassistant]
     components = (key for key in config.keys()
-                  if ' ' not in key and key != homeassistant.DOMAIN)
+                  if ' ' not in key and key != core.DOMAIN)
 
     if not core_components.setup(hass, config):
         _LOGGER.error('Home Assistant core failed to initialize. '
@@ -192,7 +192,7 @@ def from_config_file(config_path, hass=None):
     instantiates a new Home Assistant object if 'hass' is not given.
     """
     if hass is None:
-        hass = homeassistant.HomeAssistant()
+        hass = core.HomeAssistant()
 
     # Set config dir to directory holding config file
     hass.config.config_dir = os.path.abspath(os.path.dirname(config_path))
@@ -222,7 +222,8 @@ def enable_logging(hass):
             }
         ))
     except ImportError:
-        _LOGGER.warn("Colorlog package not found, console coloring disabled")
+        _LOGGER.warning(
+            "Colorlog package not found, console coloring disabled")
 
     # Log errors to a file if we have write access to file or config dir
     err_log_path = hass.config.path('home-assistant.log')
diff --git a/homeassistant/components/__init__.py b/homeassistant/components/__init__.py
index 0b757766bc0..e5e917c5250 100644
--- a/homeassistant/components/__init__.py
+++ b/homeassistant/components/__init__.py
@@ -17,7 +17,7 @@ Each component should publish services only under its own domain.
 import itertools as it
 import logging
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.util as util
 from homeassistant.helpers import extract_entity_ids
 from homeassistant.loader import get_component
diff --git a/homeassistant/components/api.py b/homeassistant/components/api.py
index b0d6faa2f49..108cc88741b 100644
--- a/homeassistant/components/api.py
+++ b/homeassistant/components/api.py
@@ -9,7 +9,7 @@ import logging
 import threading
 import json
 
-import homeassistant as ha
+import homeassistant.core as ha
 from homeassistant.helpers.state import TrackStates
 import homeassistant.remote as rem
 from homeassistant.const import (
diff --git a/homeassistant/components/conversation.py b/homeassistant/components/conversation.py
index bf78e13a094..2d439a7ac4a 100644
--- a/homeassistant/components/conversation.py
+++ b/homeassistant/components/conversation.py
@@ -8,7 +8,7 @@ This is more a proof of concept.
 import logging
 import re
 
-import homeassistant
+from homeassistant import core
 from homeassistant.const import (
     ATTR_FRIENDLY_NAME, ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF)
 
@@ -52,16 +52,14 @@ def setup(hass, config):
             return
 
         if command == 'on':
-            hass.services.call(
-                homeassistant.DOMAIN, SERVICE_TURN_ON, {
-                    ATTR_ENTITY_ID: entity_ids,
-                }, blocking=True)
+            hass.services.call(core.DOMAIN, SERVICE_TURN_ON, {
+                ATTR_ENTITY_ID: entity_ids,
+            }, blocking=True)
 
         elif command == 'off':
-            hass.services.call(
-                homeassistant.DOMAIN, SERVICE_TURN_OFF, {
-                    ATTR_ENTITY_ID: entity_ids,
-                }, blocking=True)
+            hass.services.call(core.DOMAIN, SERVICE_TURN_OFF, {
+                ATTR_ENTITY_ID: entity_ids,
+            }, blocking=True)
 
         else:
             logger.error(
diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py
index d0b8b155b4a..17d20571f62 100644
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -6,7 +6,7 @@ Sets up a demo environment that mimics interaction with devices.
 """
 import time
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 import homeassistant.loader as loader
 from homeassistant.const import (
diff --git a/homeassistant/components/group.py b/homeassistant/components/group.py
index 6975db4c46c..1d307baaca9 100644
--- a/homeassistant/components/group.py
+++ b/homeassistant/components/group.py
@@ -5,7 +5,7 @@ homeassistant.components.group
 Provides functionality to group devices that can be turned on or off.
 """
 
-import homeassistant as ha
+import homeassistant.core as ha
 from homeassistant.helpers import generate_entity_id
 from homeassistant.helpers.event import track_state_change
 from homeassistant.helpers.entity import Entity
diff --git a/homeassistant/components/http.py b/homeassistant/components/http.py
index fcd17356885..a28def8e7ba 100644
--- a/homeassistant/components/http.py
+++ b/homeassistant/components/http.py
@@ -86,7 +86,7 @@ from http import cookies
 from socketserver import ThreadingMixIn
 from urllib.parse import urlparse, parse_qs
 
-import homeassistant as ha
+import homeassistant.core as ha
 from homeassistant.const import (
     SERVER_PORT, CONTENT_TYPE_JSON,
     HTTP_HEADER_HA_AUTH, HTTP_HEADER_CONTENT_TYPE, HTTP_HEADER_ACCEPT_ENCODING,
diff --git a/homeassistant/components/logbook.py b/homeassistant/components/logbook.py
index acc9a36e494..c7a403f12ec 100644
--- a/homeassistant/components/logbook.py
+++ b/homeassistant/components/logbook.py
@@ -8,7 +8,7 @@ from datetime import timedelta
 from itertools import groupby
 import re
 
-from homeassistant import State, DOMAIN as HA_DOMAIN
+from homeassistant.core import State, DOMAIN as HA_DOMAIN
 from homeassistant.const import (
     EVENT_STATE_CHANGED, STATE_HOME, STATE_ON, STATE_OFF,
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, HTTP_BAD_REQUEST)
diff --git a/homeassistant/components/mqtt.py b/homeassistant/components/mqtt.py
index a892cc5015c..aa1a3167029 100644
--- a/homeassistant/components/mqtt.py
+++ b/homeassistant/components/mqtt.py
@@ -46,7 +46,7 @@ The keep alive in seconds for this client. Default is 60.
 import logging
 import socket
 
-from homeassistant import HomeAssistantError
+from homeassistant.core import HomeAssistantError
 import homeassistant.util as util
 from homeassistant.helpers import validate_config
 from homeassistant.const import (
diff --git a/homeassistant/components/recorder.py b/homeassistant/components/recorder.py
index 5dca3bddde4..73487163425 100644
--- a/homeassistant/components/recorder.py
+++ b/homeassistant/components/recorder.py
@@ -13,7 +13,7 @@ from datetime import datetime, date
 import json
 import atexit
 
-from homeassistant import Event, EventOrigin, State
+from homeassistant.core import Event, EventOrigin, State
 import homeassistant.util.dt as date_util
 from homeassistant.remote import JSONEncoder
 from homeassistant.const import (
diff --git a/homeassistant/components/scene.py b/homeassistant/components/scene.py
index a748e17ec5d..579ce1f20fb 100644
--- a/homeassistant/components/scene.py
+++ b/homeassistant/components/scene.py
@@ -18,7 +18,7 @@ old state will not be restored when it is being deactivated.
 import logging
 from collections import namedtuple
 
-from homeassistant import State
+from homeassistant.core import State
 from homeassistant.helpers.event import track_state_change
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.entity_component import EntityComponent
diff --git a/homeassistant/config.py b/homeassistant/config.py
index 3b2dd1ce740..6ae40e9e7c7 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -7,7 +7,7 @@ Module to help with parsing and generating configuration files.
 import logging
 import os
 
-from homeassistant import HomeAssistantError
+from homeassistant.core import HomeAssistantError
 from homeassistant.const import (
     CONF_LATITUDE, CONF_LONGITUDE, CONF_TEMPERATURE_UNIT, CONF_NAME,
     CONF_TIME_ZONE)
diff --git a/homeassistant/__init__.py b/homeassistant/core.py
similarity index 100%
rename from homeassistant/__init__.py
rename to homeassistant/core.py
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index f9751ffc14c..0ca63856c27 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -7,7 +7,7 @@ Provides ABC for entities in HA.
 
 from collections import defaultdict
 
-from homeassistant import NoEntitySpecifiedError
+from homeassistant.core import NoEntitySpecifiedError
 
 from homeassistant.const import (
     ATTR_FRIENDLY_NAME, ATTR_UNIT_OF_MEASUREMENT, ATTR_HIDDEN,
diff --git a/homeassistant/helpers/state.py b/homeassistant/helpers/state.py
index 66e9a448d8e..d87ee48930c 100644
--- a/homeassistant/helpers/state.py
+++ b/homeassistant/helpers/state.py
@@ -6,7 +6,7 @@ Helpers that help with state related things.
 """
 import logging
 
-from homeassistant import State
+from homeassistant.core import State
 import homeassistant.util.dt as dt_util
 from homeassistant.const import (
     STATE_ON, STATE_OFF, SERVICE_TURN_ON, SERVICE_TURN_OFF, ATTR_ENTITY_ID)
diff --git a/homeassistant/remote.py b/homeassistant/remote.py
index 5a0a828bb21..2488f0a9c46 100644
--- a/homeassistant/remote.py
+++ b/homeassistant/remote.py
@@ -17,7 +17,7 @@ import urllib.parse
 
 import requests
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 
 from homeassistant.const import (
diff --git a/tests/common.py b/tests/common.py
index d6dd6cd3279..be6aa623a25 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -8,7 +8,7 @@ import os
 from datetime import timedelta
 from unittest import mock
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.util.location as location_util
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.entity import ToggleEntity
diff --git a/tests/components/automation/test_event.py b/tests/components/automation/test_event.py
index dc685fa944d..a2c36283c9a 100644
--- a/tests/components/automation/test_event.py
+++ b/tests/components/automation/test_event.py
@@ -6,7 +6,7 @@ Tests demo component.
 """
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.components.automation as automation
 import homeassistant.components.automation.event as event
 from homeassistant.const import CONF_PLATFORM
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index 4bd0f4b96f3..2af17ea405c 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -6,7 +6,7 @@ Tests demo component.
 """
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.components.automation as automation
 import homeassistant.components.automation.event as event
 from homeassistant.const import CONF_PLATFORM, ATTR_ENTITY_ID
diff --git a/tests/components/automation/test_mqtt.py b/tests/components/automation/test_mqtt.py
index 1fdc74bf3ce..9402b5300b6 100644
--- a/tests/components/automation/test_mqtt.py
+++ b/tests/components/automation/test_mqtt.py
@@ -6,7 +6,7 @@ Tests demo component.
 """
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.components.automation as automation
 import homeassistant.components.automation.mqtt as mqtt
 from homeassistant.const import CONF_PLATFORM
diff --git a/tests/components/automation/test_state.py b/tests/components/automation/test_state.py
index 5966946b278..47d612cbb02 100644
--- a/tests/components/automation/test_state.py
+++ b/tests/components/automation/test_state.py
@@ -6,7 +6,7 @@ Tests demo component.
 """
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.components.automation as automation
 import homeassistant.components.automation.state as state
 from homeassistant.const import CONF_PLATFORM
diff --git a/tests/components/automation/test_time.py b/tests/components/automation/test_time.py
index 5581cc01348..0f11a2a67c5 100644
--- a/tests/components/automation/test_time.py
+++ b/tests/components/automation/test_time.py
@@ -6,7 +6,7 @@ Tests demo component.
 """
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.loader as loader
 import homeassistant.util.dt as dt_util
 import homeassistant.components.automation as automation
diff --git a/tests/components/test_api.py b/tests/components/test_api.py
index ff25b476d32..93b1cd06abe 100644
--- a/tests/components/test_api.py
+++ b/tests/components/test_api.py
@@ -10,7 +10,7 @@ import json
 
 import requests
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 import homeassistant.remote as remote
 import homeassistant.components.http as http
diff --git a/tests/components/test_configurator.py b/tests/components/test_configurator.py
index c64fc39e50a..f41a5319ffd 100644
--- a/tests/components/test_configurator.py
+++ b/tests/components/test_configurator.py
@@ -7,7 +7,7 @@ Tests Configurator component.
 # pylint: disable=too-many-public-methods,protected-access
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.components.configurator as configurator
 from homeassistant.const import EVENT_TIME_CHANGED
 
diff --git a/tests/components/test_demo.py b/tests/components/test_demo.py
index 9e697fb0c74..0abd546e4c4 100644
--- a/tests/components/test_demo.py
+++ b/tests/components/test_demo.py
@@ -6,7 +6,7 @@ Tests demo component.
 """
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.components.demo as demo
 
 from tests.common import mock_http_component
diff --git a/tests/components/test_device_tracker.py b/tests/components/test_device_tracker.py
index bbc647987c9..66fd97c4730 100644
--- a/tests/components/test_device_tracker.py
+++ b/tests/components/test_device_tracker.py
@@ -10,7 +10,7 @@ from datetime import timedelta
 import logging
 import os
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.loader as loader
 import homeassistant.util.dt as dt_util
 from homeassistant.const import (
diff --git a/tests/components/test_frontend.py b/tests/components/test_frontend.py
index d6431f5f5df..65fcb5b6091 100644
--- a/tests/components/test_frontend.py
+++ b/tests/components/test_frontend.py
@@ -10,7 +10,7 @@ import unittest
 
 import requests
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 import homeassistant.components.http as http
 from homeassistant.const import HTTP_HEADER_HA_AUTH
diff --git a/tests/components/test_group.py b/tests/components/test_group.py
index 22256057d7a..d66a24606a3 100644
--- a/tests/components/test_group.py
+++ b/tests/components/test_group.py
@@ -8,7 +8,7 @@ Tests the group compoments.
 import unittest
 import logging
 
-import homeassistant as ha
+import homeassistant.core as ha
 from homeassistant.const import STATE_ON, STATE_OFF, STATE_HOME, STATE_UNKNOWN
 import homeassistant.components.group as group
 
diff --git a/tests/components/test_history.py b/tests/components/test_history.py
index 675e2d022d9..12d10c52744 100644
--- a/tests/components/test_history.py
+++ b/tests/components/test_history.py
@@ -9,7 +9,7 @@ import time
 import os
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.util.dt as dt_util
 from homeassistant.components import history, recorder
 
diff --git a/tests/components/test_init.py b/tests/components/test_init.py
index 8c00616bbb4..0074b75e148 100644
--- a/tests/components/test_init.py
+++ b/tests/components/test_init.py
@@ -7,7 +7,7 @@ Tests core compoments.
 # pylint: disable=protected-access,too-many-public-methods
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.loader as loader
 from homeassistant.const import (
     STATE_ON, STATE_OFF, SERVICE_TURN_ON, SERVICE_TURN_OFF)
diff --git a/tests/components/test_logbook.py b/tests/components/test_logbook.py
index cd415590d2d..16f6ba8aa33 100644
--- a/tests/components/test_logbook.py
+++ b/tests/components/test_logbook.py
@@ -8,7 +8,7 @@ Tests the logbook component.
 import unittest
 from datetime import timedelta
 
-import homeassistant as ha
+import homeassistant.core as ha
 from homeassistant.const import (
     EVENT_STATE_CHANGED, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
 import homeassistant.util.dt as dt_util
diff --git a/tests/components/test_media_player.py b/tests/components/test_media_player.py
index f3f0128af3e..1fd406dc026 100644
--- a/tests/components/test_media_player.py
+++ b/tests/components/test_media_player.py
@@ -8,7 +8,7 @@ Tests media_player component.
 import logging
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 from homeassistant.const import (
     STATE_OFF,
     SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_VOLUME_UP, SERVICE_VOLUME_DOWN,
diff --git a/tests/components/test_sun.py b/tests/components/test_sun.py
index 705caadcd3a..9d2ae38fdd6 100644
--- a/tests/components/test_sun.py
+++ b/tests/components/test_sun.py
@@ -10,7 +10,7 @@ from datetime import timedelta
 
 from astral import Astral
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.util.dt as dt_util
 import homeassistant.components.sun as sun
 
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index 14559ded39a..b8823f23a5a 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -7,7 +7,7 @@ Tests the entity helper.
 # pylint: disable=protected-access,too-many-public-methods
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.helpers.entity as entity
 from homeassistant.const import ATTR_HIDDEN
 
diff --git a/tests/helpers/test_event.py b/tests/helpers/test_event.py
index 69338cf431b..89711e2584e 100644
--- a/tests/helpers/test_event.py
+++ b/tests/helpers/test_event.py
@@ -9,7 +9,7 @@ Tests event helpers.
 import unittest
 from datetime import datetime
 
-import homeassistant as ha
+import homeassistant.core as ha
 from homeassistant.helpers.event import *
 
 
diff --git a/tests/helpers/test_init.py b/tests/helpers/test_init.py
index 9257dd634ef..c1af6ba8ccc 100644
--- a/tests/helpers/test_init.py
+++ b/tests/helpers/test_init.py
@@ -9,7 +9,7 @@ import unittest
 
 from common import get_test_home_assistant
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.loader as loader
 from homeassistant.const import STATE_ON, STATE_OFF, ATTR_ENTITY_ID
 from homeassistant.helpers import extract_entity_ids
diff --git a/tests/test_config.py b/tests/test_config.py
index b8d050d14ae..f683fac890c 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -9,7 +9,7 @@ import unittest
 import unittest.mock as mock
 import os
 
-from homeassistant import DOMAIN, HomeAssistantError
+from homeassistant.core import DOMAIN, HomeAssistantError
 import homeassistant.config as config_util
 from homeassistant.const import (
     CONF_LATITUDE, CONF_LONGITUDE, CONF_TEMPERATURE_UNIT, CONF_NAME,
diff --git a/tests/test_init.py b/tests/test_core.py
similarity index 100%
rename from tests/test_init.py
rename to tests/test_core.py
diff --git a/tests/test_remote.py b/tests/test_remote.py
index 7c00cbfd526..0f45091d598 100644
--- a/tests/test_remote.py
+++ b/tests/test_remote.py
@@ -9,7 +9,7 @@ Uses port 8125 as a port that nothing runs on
 # pylint: disable=protected-access,too-many-public-methods
 import unittest
 
-import homeassistant as ha
+import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 import homeassistant.remote as remote
 import homeassistant.components.http as http