diff --git a/aio/src/assets/images/icons/feature-icon.svg b/aio/content/images/marketing/features/feature-icon.svg
similarity index 100%
rename from aio/src/assets/images/icons/feature-icon.svg
rename to aio/content/images/marketing/features/feature-icon.svg
diff --git a/aio/content/images/marketing/angular-mix.png b/aio/content/images/marketing/home/angular-mix.png
similarity index 100%
rename from aio/content/images/marketing/angular-mix.png
rename to aio/content/images/marketing/home/angular-mix.png
diff --git a/aio/src/assets/images/icons/code-icon.svg b/aio/content/images/marketing/home/code-icon.svg
similarity index 100%
rename from aio/src/assets/images/icons/code-icon.svg
rename to aio/content/images/marketing/home/code-icon.svg
diff --git a/aio/src/assets/images/home/joyful-development.svg b/aio/content/images/marketing/home/joyful-development.svg
similarity index 100%
rename from aio/src/assets/images/home/joyful-development.svg
rename to aio/content/images/marketing/home/joyful-development.svg
diff --git a/aio/src/assets/images/home/loved-by-millions.svg b/aio/content/images/marketing/home/loved-by-millions.svg
similarity index 100%
rename from aio/src/assets/images/home/loved-by-millions.svg
rename to aio/content/images/marketing/home/loved-by-millions.svg
diff --git a/aio/src/assets/images/home/responsive-framework.svg b/aio/content/images/marketing/home/responsive-framework.svg
similarity index 100%
rename from aio/src/assets/images/home/responsive-framework.svg
rename to aio/content/images/marketing/home/responsive-framework.svg
diff --git a/aio/src/assets/images/home/speed-performance.svg b/aio/content/images/marketing/home/speed-performance.svg
similarity index 100%
rename from aio/src/assets/images/home/speed-performance.svg
rename to aio/content/images/marketing/home/speed-performance.svg
diff --git a/aio/content/marketing/features.html b/aio/content/marketing/features.html
index ccb4d2a5e8..f37cadd10e 100755
--- a/aio/content/marketing/features.html
+++ b/aio/content/marketing/features.html
@@ -8,7 +8,7 @@
       <div class="feature-section">
         <div class="feature-header">
           <div class="text-headline">Cross Platform</div>
-          <img src="assets/images/icons/feature-icon.svg" height="70px">
+          <img src="generated/images/marketing/features/feature-icon.svg" height="70px">
         </div>
         <div class="feature-row">
 
@@ -34,7 +34,7 @@
       <div class="feature-section">
         <div class="feature-header">
           <div class="text-headline">Speed and Performance</div>
-          <img src="assets/images/icons/feature-icon.svg" height="70px">
+          <img src="generated/images/marketing/features/feature-icon.svg" height="70px">
         </div>
         <div class="feature-row">
 
@@ -59,7 +59,7 @@
       <div class="feature-section">
         <div class="feature-header">
           <div class="text-headline">Productivity</div>
-          <img src="assets/images/icons/feature-icon.svg" height="70px">
+          <img src="generated/images/marketing/features/feature-icon.svg" height="70px">
         </div>
         <div class="feature-row">
 
@@ -84,7 +84,7 @@
       <div class="feature-section">
         <div class="feature-header">
           <div class="text-headline">Full Development Story</div>
-          <img src="assets/images/icons/feature-icon.svg" height="70px">
+          <img src="generated/images/marketing/features/feature-icon.svg" height="70px">
         </div>
         <div class="feature-row">
 
diff --git a/aio/content/marketing/index.html b/aio/content/marketing/index.html
index 32e91d086e..afd6ef0611 100755
--- a/aio/content/marketing/index.html
+++ b/aio/content/marketing/index.html
@@ -30,7 +30,7 @@
     <!--Announcement Bar-->
     <div class="homepage-container">
       <div class="announcement-bar">
-        <img src="generated/images/marketing/angular-mix.png" height="40" width="151">
+        <img src="generated/images/marketing/home/angular-mix.png" height="40" width="151">
         <p>Join us at our newest event, October 2017</p>
         <a class="button" href="https://angularmix.com/">Learn More</a>
      </div>
@@ -40,7 +40,7 @@
     <div layout="row" layout-xs="column" class="home-row homepage-container">
       <div class="promo-img-container promo-1">
         <div>
-          <img height="222" width="340" src="assets/images/home/responsive-framework.svg" alt="responsive framework">
+          <img height="222" width="340" src="generated/images/marketing/home/responsive-framework.svg" alt="responsive framework">
         </div>
       </div>
 
@@ -65,7 +65,7 @@
 
       <div class="promo-img-container promo-2">
         <div>
-          <img height="222" width="323" src="assets/images/home/speed-performance.svg" alt="speed and performance">
+          <img height="222" width="323" src="generated/images/marketing/home/speed-performance.svg" alt="speed and performance">
         </div>
       </div>
     </div>
@@ -74,7 +74,7 @@
     <!-- Group 3-->
     <div layout="row" layout-xs="column" class="home-row">
       <div class="promo-img-container promo-3">
-        <div><img src="assets/images/home/joyful-development.svg" alt="IDE example"></div>
+        <div><img src="generated/images/marketing/home/joyful-development.svg" alt="IDE example"></div>
       </div>
 
       <div class="text-container">
@@ -100,7 +100,7 @@
 
       <div class="promo-img-container promo-4">
         <div>
-          <img src="assets/images/home/loved-by-millions.svg" alt="angular on the map" width="455" height="228">
+          <img src="generated/images/marketing/home/loved-by-millions.svg" alt="angular on the map" width="455" height="228">
         </div>
       </div>
     </div>
@@ -110,7 +110,7 @@
 
     <a href="guide/quickstart">
       <div class="card">
-          <img src="assets/images/icons/code-icon.svg" height="70px">
+          <img src="generated/images/marketing/home/code-icon.svg" height="70px">
           <div class="card-text-container">
             <div class="text-headline">Get Started</div>
             <p>Start building your Angular application.</p>
diff --git a/aio/ngsw-manifest.json b/aio/ngsw-manifest.json
index ab8ec7c825..a9e2470c31 100644
--- a/aio/ngsw-manifest.json
+++ b/aio/ngsw-manifest.json
@@ -10,8 +10,8 @@
   },
   "static.ignore": [
     "\\.js\\.map$",
-    "^/assets/images/.*/_unused/",
-    "^/generated/(?:docs/(?!api/api-list\\.json).*|images|live-examples|zips)/"
+    "^(?:/|\\\\)assets(?:/|\\\\)images(?:/|\\\\).*(?:/|\\\\)_unused(?:/|\\\\)",
+    "^(?:/|\\\\)generated(?:/|\\\\)(?:docs(?:/|\\\\)(?!api(?:/|\\\\)api-list\\.json).*|images(?:/|\\\\)(?!marketing(?:/|\\\\)).*|live-examples|zips)(?:/|\\\\)"
   ],
   "static.versioned": [
     "\\.[0-9a-z]{20}\\."
diff --git a/aio/src/app/app.component.ts b/aio/src/app/app.component.ts
index 5308bdce56..3ba0293a4b 100644
--- a/aio/src/app/app.component.ts
+++ b/aio/src/app/app.component.ts
@@ -76,8 +76,8 @@ export class AppComponent implements OnInit {
 
   get homeImageUrl() {
     return this.isSideBySide ?
-      'assets/images/logos/standard/logo-nav@2x.png' :
-      'assets/images/logos/standard/shield-large.svg';
+      'assets/images/logos/angular/logo-nav@2x.png' :
+      'assets/images/logos/angular/shield-large.svg';
   }
   get isOpened() { return this.isSideBySide && this.isSideNavDoc; }
   get mode() { return this.isSideBySide ? 'side' : 'over'; }
diff --git a/aio/src/assets/images/support/_unused/angular-gde-logo.png b/aio/src/assets/images/logos/angular/_unused/angular-gde-logo.png
similarity index 100%
rename from aio/src/assets/images/support/_unused/angular-gde-logo.png
rename to aio/src/assets/images/logos/angular/_unused/angular-gde-logo.png
diff --git a/aio/src/assets/images/logos/standard/_unused/angular-gde-logo@2x.png b/aio/src/assets/images/logos/angular/_unused/angular-gde-logo@2x.png
similarity index 100%
rename from aio/src/assets/images/logos/standard/_unused/angular-gde-logo@2x.png
rename to aio/src/assets/images/logos/angular/_unused/angular-gde-logo@2x.png
diff --git a/aio/src/assets/images/logos/standard/_unused/logo-nav-small.png b/aio/src/assets/images/logos/angular/_unused/logo-nav-small.png
similarity index 100%
rename from aio/src/assets/images/logos/standard/_unused/logo-nav-small.png
rename to aio/src/assets/images/logos/angular/_unused/logo-nav-small.png
diff --git a/aio/src/assets/images/logos/standard/_unused/logo-nav.png b/aio/src/assets/images/logos/angular/_unused/logo-nav.png
similarity index 100%
rename from aio/src/assets/images/logos/standard/_unused/logo-nav.png
rename to aio/src/assets/images/logos/angular/_unused/logo-nav.png
diff --git a/aio/src/assets/images/logos/standard/_unused/shield-large.png b/aio/src/assets/images/logos/angular/_unused/shield-large.png
similarity index 100%
rename from aio/src/assets/images/logos/standard/_unused/shield-large.png
rename to aio/src/assets/images/logos/angular/_unused/shield-large.png
diff --git a/aio/src/assets/images/logos/standard/_unused/shield-large@2x.png b/aio/src/assets/images/logos/angular/_unused/shield-large@2x.png
similarity index 100%
rename from aio/src/assets/images/logos/standard/_unused/shield-large@2x.png
rename to aio/src/assets/images/logos/angular/_unused/shield-large@2x.png
diff --git a/aio/src/assets/images/logos/standard/logo-nav@2x.png b/aio/src/assets/images/logos/angular/logo-nav@2x.png
similarity index 100%
rename from aio/src/assets/images/logos/standard/logo-nav@2x.png
rename to aio/src/assets/images/logos/angular/logo-nav@2x.png
diff --git a/aio/src/assets/images/logos/standard/shield-large.svg b/aio/src/assets/images/logos/angular/shield-large.svg
similarity index 100%
rename from aio/src/assets/images/logos/standard/shield-large.svg
rename to aio/src/assets/images/logos/angular/shield-large.svg
diff --git a/aio/src/assets/images/support/_unused/github-logo.png b/aio/src/assets/images/logos/misc/_unused/github-logo.png
similarity index 100%
rename from aio/src/assets/images/support/_unused/github-logo.png
rename to aio/src/assets/images/logos/misc/_unused/github-logo.png
diff --git a/aio/src/assets/images/support/_unused/gitter-logo.png b/aio/src/assets/images/logos/misc/_unused/gitter-logo.png
similarity index 100%
rename from aio/src/assets/images/support/_unused/gitter-logo.png
rename to aio/src/assets/images/logos/misc/_unused/gitter-logo.png
diff --git a/aio/src/assets/images/support/_unused/reddit-logo.png b/aio/src/assets/images/logos/misc/_unused/reddit-logo.png
similarity index 100%
rename from aio/src/assets/images/support/_unused/reddit-logo.png
rename to aio/src/assets/images/logos/misc/_unused/reddit-logo.png
diff --git a/aio/src/assets/images/support/_unused/stackoverflow-logo.png b/aio/src/assets/images/logos/misc/_unused/stackoverflow-logo.png
similarity index 100%
rename from aio/src/assets/images/support/_unused/stackoverflow-logo.png
rename to aio/src/assets/images/logos/misc/_unused/stackoverflow-logo.png