diff --git a/src/about/index.md b/src/about/index.md
index f247561..0a51b7d 100644
--- a/src/about/index.md
+++ b/src/about/index.md
@@ -15,11 +15,11 @@
 
 - [Our Project Philosophy and Goals](philosophy.html)
 
-- [People and Roles](roles.html)
+- [People and Roles](/source/roles.html)
 
 - [Interacting with the Project](/source/index.html)
 
 - [Android Compatibility](/compatibility/index.html)
 
-- [Licensing Information](licenses.html)
+- [Licensing Information](/source/licenses.html)
 
diff --git a/src/about/sidebar.md b/src/about/sidebar.md
index acc32cf..f9f0c6e 100644
--- a/src/about/sidebar.md
+++ b/src/about/sidebar.md
@@ -1,8 +1,8 @@
 # Links #
 
 - [Project Philosophy](philosophy.html)
-- [People and Roles](roles.html)
+- [People and Roles](/source/roles.html)
 - [Getting Involved](/source/index.html)
 - [Compatibility](/compatibility/index.html)
-- [Licensing Information](licenses.html)
+- [Licensing Information](/source/licenses.html)
 
diff --git a/src/images/.found b/src/images/.found
deleted file mode 100644
index d3d266d..0000000
--- a/src/images/.found
+++ /dev/null
@@ -1,22 +0,0 @@
-../site_src/porting/bluetooth-process:<img src="/images/androidBluetoothProcessDiagram.jpg">
-../site_src/porting/audio:<img src="/images/android_audio_architecture.gif">
-../site_src/porting/bluetooth:<img src="/images/androidBluetooth.gif">
-../site_src/porting/power_management:<p><img src='/images/androidPMArchitecture.gif'></p>
-../site_src/porting/camera:<img src="/images/camera_video2.gif">
-../site_src/porting/camera:<img src="/images/cameraPreview.jpg">
-../site_src/porting/camera:<img src="/images/cameraTakePicture.jpg">
-../site_src/porting/stk:<img src="/images/stk.gif" alt="STK schema" width="566" height="516" />
-../site_src/porting/stk:<img src="/images/stk_display_text.gif" border="1"> 
-../site_src/porting/stk:<img src="/images/stk_send_SMS.gif"> 
-../site_src/porting/stk:<img src="/images/stk_refresh_init.gif">
-../site_src/porting/stk:<img src="/images/stk_refresh_update.gif"> 
-../site_src/porting/stk:<img src="/images/stk_refresh_reset.gif"> 
-../site_src/porting/telephony:<img src="/images/telephony.gif">
-../site_src/porting/telephony:<img src="/images/telephony_solicted_example.gif">
-../site_src/porting/telephony:<img src="/images/telephony_unsolicted_example.gif">
-../site_src/source/code-lines:<img src="/images/code-lines.png"/>
-../site_src/source/version-control:  <img src="/images/submit-patches-0.png">
-../site_src/source/version-control:<img src="/images/external-link.png">
-../site_src/source/version-control:<img src="/images/git-repo-1.png">
-../site_src/source/life-of-a-patch:<img src="/images/workflow-0.png"/>
-../site_src/compatibility/cts-intro:    <img src="/images/cts-0.png">
diff --git a/src/about/licenses.md b/src/source/licenses.md
similarity index 100%
rename from src/about/licenses.md
rename to src/source/licenses.md
diff --git a/src/about/roles.md b/src/source/roles.md
similarity index 100%
rename from src/about/roles.md
rename to src/source/roles.md
diff --git a/src/source/submit-patches.md b/src/source/submit-patches.md
index 01e7430..d663727 100644
--- a/src/source/submit-patches.md
+++ b/src/source/submit-patches.md
@@ -11,10 +11,10 @@
 - For details about Repo and Git, see [Version Control](version-control.html).
 
 - For information about the different roles you can play within the Android
-Open Source community, see [Project roles](/about/roles.html).
+Open Source community, see [Project roles](/source/roles.html).
 
 - If you plan to contribute code to the Android platform, be sure to read
-the [AOSP's licensing information](/about/licenses.html).
+the [AOSP's licensing information](/source/licenses.html).
 
 - Note that changes to some of the upstream projects used by Android should be
 made directly to that project, as described in [Upstream Projects](#upstream-projects).
@@ -101,7 +101,7 @@
 
 In short, contribute high-quality code to one or more of the Android projects.
 For details about the different roles in the Android Open Source community and
-who plays them, see [Project Roles](/about/roles.html).
+who plays them, see [Project Roles](/source/roles.html).
 
 ## Using GitWeb to track patch histories ##
 
diff --git a/templates/header b/templates/header
index 6ec42da..6324c6f 100644
--- a/templates/header
+++ b/templates/header
@@ -10,8 +10,6 @@
       <li id="home-link"><a href="/index.html"><span>Home</span></a></li>   
       <li id="source-link"><a href="/source/index.html"
                               onClick="return loadLast('source')"><span>Source</span></a></li>
-      <li id="porting-link"><a href="/porting/index.html"
-                              onClick="return loadLast('porting')"><span>Porting</span></a></li>
       <li id="compatibility-link"><a href="/compatibility/index.html"
                               onClick="return loadLast('compatibility')"><span>Compatibility</span></a></li>
       <li id="community-link"><a href="/community/index.html"