diff --git a/homeassistant/util/template.py b/homeassistant/helpers/template.py
similarity index 100%
rename from homeassistant/util/template.py
rename to homeassistant/helpers/template.py
diff --git a/tests/util/test_template.py b/tests/helpers/test_template.py
similarity index 100%
rename from tests/util/test_template.py
rename to tests/helpers/test_template.py