diff --git a/homeassistant/components/remote/demo.py b/homeassistant/components/demo/remote.py
similarity index 100%
rename from homeassistant/components/remote/demo.py
rename to homeassistant/components/demo/remote.py
diff --git a/homeassistant/components/harmony/__init__.py b/homeassistant/components/harmony/__init__.py
new file mode 100644
index 00000000000..25a33929c1a
--- /dev/null
+++ b/homeassistant/components/harmony/__init__.py
@@ -0,0 +1,5 @@
+"""The harmony component.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/harmony/
+"""
diff --git a/homeassistant/components/remote/harmony.py b/homeassistant/components/harmony/remote.py
similarity index 100%
rename from homeassistant/components/remote/harmony.py
rename to homeassistant/components/harmony/remote.py
diff --git a/homeassistant/components/itach/__init__.py b/homeassistant/components/itach/__init__.py
new file mode 100644
index 00000000000..267370dbcd7
--- /dev/null
+++ b/homeassistant/components/itach/__init__.py
@@ -0,0 +1,5 @@
+"""The itach component.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/itach/
+"""
diff --git a/homeassistant/components/remote/itach.py b/homeassistant/components/itach/remote.py
similarity index 100%
rename from homeassistant/components/remote/itach.py
rename to homeassistant/components/itach/remote.py
diff --git a/requirements_all.txt b/requirements_all.txt
index 4d07cfd4733..ea8caac47a8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -110,7 +110,7 @@ aiofreepybox==0.0.6
 # homeassistant.components.camera.yi
 aioftp==0.12.0
 
-# homeassistant.components.remote.harmony
+# homeassistant.components.harmony.remote
 aioharmony==0.1.5
 
 # homeassistant.components.emulated_hue
@@ -1082,7 +1082,7 @@ pyirishrail==0.0.2
 # homeassistant.components.binary_sensor.iss
 pyiss==1.0.1
 
-# homeassistant.components.remote.itach
+# homeassistant.components.itach.remote
 pyitachip2ir==0.0.7
 
 # homeassistant.components.kira
diff --git a/tests/components/remote/test_demo.py b/tests/components/demo/test_remote.py
similarity index 100%
rename from tests/components/remote/test_demo.py
rename to tests/components/demo/test_remote.py