UPDATED: architecture
diff --git a/index.php b/index.php
index bbeba19..c731162 100755
--- a/index.php
+++ b/index.php
@@ -21,11 +21,7 @@
 	$localVersion = false;
 	
 	// 	# Paste your HTML content between the EOHTML markers!
-	if ($_GET['section'] == "support") {
-		$html = file_get_contents('pages/_support.html');
-	} else {
-		$html = file_get_contents('pages/_index.html');
-	}
+	$html = file_get_contents('pages/template.html');
 
 	# Generate the web page
 	$App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
diff --git a/pages/_index.html b/pages/_index.html
index 0fe33ab..9ebad48 100644
--- a/pages/_index.html
+++ b/pages/_index.html
@@ -1,18 +1,3 @@
-<div id="bigbuttons">
-	<h3>Primary Links</h3>
-	<ul>
-		<li><a id="buttonDownload" href="downloads" title="Download">Eclipse
-		Distribution, Update Site, Dropins</a></li>
-		<li><a id="buttonDocumentation" href="http://wiki.eclipse.org/Intent"
-			title="Documentation">Tutorials, Examples, Videos, Reference Documentation</a></li>
-		<li><a id="buttonSupport" href="index.php?section=support" title="Download">Bug
-		Tracker, Newsgroup, Professional Support</a></li>
-		<li><a id="buttonInvolved" href="#" title="Getting Involved">CVS,
-		Workspace Setup, Wiki, Committers</a></li>
-	</ul>
-</div>
-
-<div id="midcolumn">
 	<h3>EEF - The EMF presentation framework</h3>
 	<div id="introText">
 
@@ -67,31 +52,4 @@
                 <embed width="650" height="380" name="csSWF" src="http://www.eclipse.org/intent/pages/transcripts/2012_AgileALMConnect/demos/demo1_synchronization/sync1-final2_controller.swf" width="1280" height="738" bgcolor="#1a1a1a" quality="best" allowScriptAccess="always" allowFullScreen="true" scale="showall" flashVars="autostart=true&thumb=http://www.eclipse.org/intent/pages/transcripts/2012_AgileALMConnect/demos/demo1_synchronization/FirstFrame.png&thumbscale=45&color=0x000000,0x000000" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></embed>
             </object>
      </div-->
-</div>
 
-<div id="rightcolumn">
-	<div class="sideitem" id="obeo">
-		<a href="http://www.obeo.fr" title="Main Obeo website" rel="nofollow"><img src="images/logos/logo_obeo.png"/></a>
-	</div>
-	
-	<div>
-		<h3>Project Summary</h3>
-		<p >
-		Read more 
-			<a  style="float: right;" href="http://www.eclipse.org/projects/project_summary.php?projectid=modeling.emft.eef" title="about">
-					about this project
-			</a>
-		 and get all useful information and links about it in a nutshell.
-		</p>
-	</div>
-
-	<div id="headlines">
-		<h3>News and Noteworthy</h3>
-		<ul>
-			<li>08/07/2012 - This brand new website for EEF.</li>
-			<li>06/27/2012 - Like each year since the project creation, EEF takes part of the annual Eclipse release train.</li>
-			<li>05/10/2012 - EEF 1.1 is released!</li>
-		</ul>
-	</div>
-	
-</div>
\ No newline at end of file
diff --git a/pages/_support.html b/pages/_support.html
deleted file mode 100644
index c156365..0000000
--- a/pages/_support.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div id="midcolumn">
-	<h3>EEF - Support</h3>
-	<div id="introText">
-
-		<p class="left">
-			The <a href="http://wiki.eclipse.org/EEF"> Extended Editing Framework</a> is a presentation framework for the <a href="http://www.eclipse.org/modeling/emf/"/>Eclipse Modeling Framework</a>. It allows user to create rich user interfaces to edit EMF models.  
-			<br/><br/>
-		</p>
-
-		<p class="right">
-		EEF is currently released in version 1.1. We're working on the 1.2 version for end of the year. 
-		<br/><br/>
-		You can get additional information by consulting: <br/>
-		<a href="http://wiki.eclipse.org/EEF">
-			&#10003; EEF's Wiki
-		</a><br/>
-		<a href="/proposals/eef/">
-			&#10003; EEF Proposal
-		</a>
-
-		</p>
-	</div>
-
-</div>
\ No newline at end of file
diff --git a/pages/support.html b/pages/support.html
new file mode 100644
index 0000000..0eb3d53
--- /dev/null
+++ b/pages/support.html
@@ -0,0 +1,5 @@
+	<h3>EEF - Support</h3>
+	<div id="introText">
+		<p>Obeo provide a full support for EEF framework</p>
+	</div>
+
diff --git a/pages/template.html b/pages/template.html
new file mode 100644
index 0000000..a442f40
--- /dev/null
+++ b/pages/template.html
@@ -0,0 +1,48 @@
+<div id="bigbuttons">
+	<h3>Primary Links</h3>
+	<ul>
+		<li><a id="buttonDownload" href="downloads" title="Download">Eclipse
+		Distribution, Update Site, Dropins</a></li>
+		<li><a id="buttonDocumentation" href="http://wiki.eclipse.org/EEF"
+			title="Documentation">Tutorials, Examples, Videos, Reference Documentation</a></li>
+		<li><a id="buttonSupport" href="index.php?section=support" title="Download">Bug
+		Tracker, Newsgroup, Professional Support</a></li>
+		<li><a id="buttonInvolved" href="#" title="Getting Involved">CVS,
+		Workspace Setup, Wiki, Committers</a></li>
+	</ul>
+</div>
+
+<div id="midcolumn">
+	if ($_GET['section'] == "support") {
+		$html = file_get_contents('pages/_support.html');
+	} else {
+		$html = file_get_contents('pages/template.html');
+	}
+</div>
+
+<div id="rightcolumn">
+	<div class="sideitem" id="obeo">
+		<a href="http://www.obeo.fr" title="Main Obeo website" rel="nofollow"><img src="images/logos/logo_obeo.png"/></a>
+	</div>
+	
+	<div>
+		<h3>Project Summary</h3>
+		<p >
+		Read more 
+			<a  style="float: right;" href="http://www.eclipse.org/projects/project_summary.php?projectid=modeling.emft.eef" title="about">
+					about this project
+			</a>
+		 and get all useful information and links about it in a nutshell.
+		</p>
+	</div>
+
+	<div id="headlines">
+		<h3>News and Noteworthy</h3>
+		<ul>
+			<li>08/07/2012 - This brand new website for EEF.</li>
+			<li>06/27/2012 - Like each year since the project creation, EEF takes part of the annual Eclipse release train.</li>
+			<li>05/10/2012 - EEF 1.1 is released!</li>
+		</ul>
+	</div>
+	
+</div>
\ No newline at end of file