diff --git a/SUMMARY.md b/SUMMARY.md
index 0cc96e27..339f1689 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -2,6 +2,9 @@
 
 * [Hello world!](README.md)
 * [Architecture](/architecture/README.md)
-  * [Entities](/architecture/entities.md)
-* [Integrations](/architecture/README.md)
+  * [Core](/architecture/core.md)
+  * [Entities](/architecture/entity.md)
+  * [Authentication](/architecture/authentication.md)
+* [Integrations](/integrations/README.md)
+  * [Platform Requirementst](/integrations/PlatformRequirements.md)
 * [Frontend](/frontend/README.md)
diff --git a/architecture/README.md b/architecture/README.md
index 8a447ee1..1d59c30e 100644
--- a/architecture/README.md
+++ b/architecture/README.md
@@ -10,11 +10,3 @@ For more information about each part in this overview, <a href='/blog/2014/12/26
 
 ![Home Automation landscape](home_automation_landscape.svg)
 
-The Home Assistant core is responsible for Home Control. Home Assistant contains four parts which make this possible:
-
- * **Event Bus**: facilitates the firing and listening of events -- the beating heart of Home Assistant.
- * **State Machine**: keeps track of the states of things and fires a `state_changed` event when a state has been changed.
- * **Service Registry**: listens on the event bus for `call_service` events and allows other code to register services.
- * **Timer**: sends a `time_changed` event every 1 second on the event bus.
-
-![Home Assistant core architecture](ha_architecture.svg)
diff --git a/architecture/authentication.md b/architecture/authentication.md
new file mode 100644
index 00000000..42284534
--- /dev/null
+++ b/architecture/authentication.md
@@ -0,0 +1,3 @@
+# Authentication Architecture
+
+Explain here how our authentication works.
diff --git a/architecture/core.md b/architecture/core.md
new file mode 100644
index 00000000..db4164d4
--- /dev/null
+++ b/architecture/core.md
@@ -0,0 +1,10 @@
+# Core Architecture
+
+The Home Assistant core is responsible for Home Control. Home Assistant contains four parts which make this possible:
+
+ * **Event Bus**: facilitates the firing and listening of events -- the beating heart of Home Assistant.
+ * **State Machine**: keeps track of the states of things and fires a `state_changed` event when a state has been changed.
+ * **Service Registry**: listens on the event bus for `call_service` events and allows other code to register services.
+ * **Timer**: sends a `time_changed` event every 1 second on the event bus.
+
+![Home Assistant core architecture](ha_architecture.svg)
diff --git a/architecture/entities.md b/architecture/entity.md
similarity index 87%
rename from architecture/entities.md
rename to architecture/entity.md
index ccfd6712..50093ecc 100644
--- a/architecture/entities.md
+++ b/architecture/entity.md
@@ -1,4 +1,4 @@
-# Entities
+# Entity Architecture
 
 Entities are an abstraction on top of the Home Assistant core.
 
diff --git a/integrations/PlatformRequirements.md b/integrations/PlatformRequirements.md
new file mode 100644
index 00000000..9f36e632
--- /dev/null
+++ b/integrations/PlatformRequirements.md
@@ -0,0 +1,3 @@
+# Platform requirements
+
+These are the requirements.