diff --git a/src/main/webapp/architecture/index.conf b/src/main/webapp/architecture/index.conf
deleted file mode 100644
index fce56f8..0000000
--- a/src/main/webapp/architecture/index.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache ServiceMix consists of a lot of different components and other Apache projects.  This guide will explain you how
-to use all of these technologies combined and how to select the right components for your own problem or project.
-
-* [What is (in) Apache ServiceMix 4|what-is-smx4]
-* [Technology selection guidelines|technology-selection]
\ No newline at end of file
diff --git a/src/main/webapp/architecture/toc.ssp b/src/main/webapp/architecture/toc.ssp
deleted file mode 100644
index 93dc9e4..0000000
--- a/src/main/webapp/architecture/toc.ssp
+++ /dev/null
@@ -1,11 +0,0 @@
-<ul>
-    <li id="introduction">
-        <a href="${uri("/architecture/index.html")}">Introduction</a>
-    </li>
-    <li id="what-is-smx4">
-        <a href="${uri("/architecture/what-is-smx4.html")}">What is (in) Apache ServiceMix?</a>
-    </li>
-    <li id="basic-commands">
-        <a href="${uri("/architecture/technology-selection.html")}">Technology selection guidelines</a>
-    </li>
-</ul>
\ No newline at end of file
diff --git a/src/main/webapp/images/smx-overview.dia b/src/main/webapp/images/smx-overview.dia
new file mode 100644
index 0000000..01a31f6
--- /dev/null
+++ b/src/main/webapp/images/smx-overview.dia
Binary files differ
diff --git a/src/main/webapp/images/smx-overview.png b/src/main/webapp/images/smx-overview.png
new file mode 100644
index 0000000..fcf005d
--- /dev/null
+++ b/src/main/webapp/images/smx-overview.png
Binary files differ
diff --git a/src/main/webapp/index.ssp b/src/main/webapp/index.ssp
index 135cb00..324e556 100644
--- a/src/main/webapp/index.ssp
+++ b/src/main/webapp/index.ssp
@@ -20,13 +20,13 @@
 </div>
 
 <div class="left">
-  <a href="architecture/index.html">
-    <h2>Architecture Guide</h2>
+  <a href="user/index.html">
+    <h2>User Guide</h2>
   </a>
 </div>
 
 <div class="right">
-  <p>Apache ServiceMix contains a lot of different components and it embeds a lot of other Apache projects.  This architecture guide will help you select and configure the right components when building your own solution.</p>
+  <p>Apache ServiceMix contains a lot of different components and it embeds a lot of other Apache projects.  This user guide will help you select and configure the right components when building your own solution.</p>
 </div>
 
 <div class="left">
diff --git a/src/main/webapp/user/index.conf b/src/main/webapp/user/index.conf
new file mode 100644
index 0000000..3a4ac84
--- /dev/null
+++ b/src/main/webapp/user/index.conf
@@ -0,0 +1,11 @@
+Apache ServiceMix is a flexible, open-source integration container that unifies the features and functionality of
+Apache ActiveMQ, Camel, CXF and Karaf into a powerful runtime platform for building integrations solutions.
+
+!/images/smx-overview.png!
+
+The goal of this document is to introduce you to the different components that are part of Apache ServiceMix and explain
+how and when they can be used together.
+
+Table of contents:
+* [What is (in) Apache ServiceMix 4|what-is-smx4]
+* [Technology selection guidelines|technology-selection]
\ No newline at end of file
diff --git a/src/main/webapp/architecture/technology-selection.conf b/src/main/webapp/user/technology-selection.conf
similarity index 100%
rename from src/main/webapp/architecture/technology-selection.conf
rename to src/main/webapp/user/technology-selection.conf
diff --git a/src/main/webapp/user/toc.ssp b/src/main/webapp/user/toc.ssp
new file mode 100644
index 0000000..cde31c4
--- /dev/null
+++ b/src/main/webapp/user/toc.ssp
@@ -0,0 +1,11 @@
+<ul>
+    <li id="introduction">
+        <a href="${uri("/user/index.html")}">Introduction</a>
+    </li>
+    <li id="what-is-smx4">
+        <a href="${uri("/user/what-is-smx4.html")}">What is (in) Apache ServiceMix?</a>
+    </li>
+    <li id="basic-commands">
+        <a href="${uri("/user/technology-selection.html")}">Technology selection guidelines</a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/src/main/webapp/architecture/what-is-smx4.conf b/src/main/webapp/user/what-is-smx4.conf
similarity index 100%
rename from src/main/webapp/architecture/what-is-smx4.conf
rename to src/main/webapp/user/what-is-smx4.conf