diff --git a/templates/AzureBlue/exception.html b/templates/AzureBlue/exception.html
index fe3fc49..0f845d1 100644
--- a/templates/AzureBlue/exception.html
+++ b/templates/AzureBlue/exception.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -124,14 +124,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/1-1.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/1-1.png" alt="Illustration"/>
     </div>
     <div class="container  self_asserted_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/AzureBlue/idpSelector.html b/templates/AzureBlue/idpSelector.html
index 21bfcba..8b7f441 100644
--- a/templates/AzureBlue/idpSelector.html
+++ b/templates/AzureBlue/idpSelector.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -127,14 +127,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/1-1.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/1-1.png" alt="Illustration"/>
     </div>
     <div class="container  unified_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/AzureBlue/multifactor-1.0.0.html b/templates/AzureBlue/multifactor-1.0.0.html
index f1c9a96..c4f8c27 100644
--- a/templates/AzureBlue/multifactor-1.0.0.html
+++ b/templates/AzureBlue/multifactor-1.0.0.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -125,14 +125,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/1-1.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/1-1.png" alt="Illustration"/>
     </div>
     <div class="container  phonefactor_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/AzureBlue/selfAsserted.html b/templates/AzureBlue/selfAsserted.html
index 5893041..7082685 100644
--- a/templates/AzureBlue/selfAsserted.html
+++ b/templates/AzureBlue/selfAsserted.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -125,14 +125,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/1-1.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/1-1.png" alt="Illustration"/>
     </div>
     <div class="container  self_asserted_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/AzureBlue/unified.html b/templates/AzureBlue/unified.html
index 58b56e5..18ab70f 100644
--- a/templates/AzureBlue/unified.html
+++ b/templates/AzureBlue/unified.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -125,14 +125,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/1-1.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/1-1.png" alt="Illustration"/>
     </div>
     <div class="container  unified_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/MSA/exception.html b/templates/MSA/exception.html
index a7bbfd1..b48f37c 100644
--- a/templates/MSA/exception.html
+++ b/templates/MSA/exception.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -126,14 +126,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/4-2.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/4-2.png" alt="Illustration"/>
     </div>
     <div class="container  self_asserted_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/MSA/idpSelector.html b/templates/MSA/idpSelector.html
index 5ecff41..70e4619 100644
--- a/templates/MSA/idpSelector.html
+++ b/templates/MSA/idpSelector.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -128,14 +128,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/4-2.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/4-2.png" alt="Illustration"/>
     </div>
     <div class="container  unified_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/MSA/multifactor-1.0.0.html b/templates/MSA/multifactor-1.0.0.html
index a079502..82adc0b 100644
--- a/templates/MSA/multifactor-1.0.0.html
+++ b/templates/MSA/multifactor-1.0.0.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -126,14 +126,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/4-2.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/4-2.png" alt="Illustration"/>
     </div>
     <div class="container  phonefactor_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/MSA/selfAsserted.html b/templates/MSA/selfAsserted.html
index 3efb151..ee8e325 100644
--- a/templates/MSA/selfAsserted.html
+++ b/templates/MSA/selfAsserted.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -125,14 +125,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/4-2.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/4-2.png" alt="Illustration"/>
     </div>
     <div class="container  self_asserted_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>
diff --git a/templates/MSA/unified.html b/templates/MSA/unified.html
index 240f311..0d02698 100644
--- a/templates/MSA/unified.html
+++ b/templates/MSA/unified.html
@@ -12,90 +12,90 @@
     <style id="common">
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui.WOFF);
             font-weight: normal;
         }
         @font-face {
             font-family: 'SegoeUI';
-            src: url(https://login.microsoftonline.com/templates/src/fonts/segoeui_bold.WOFF);
+            src: url(https://login.microsoftonline.com/templates/fonts/segoeui_bold.WOFF);
             font-weight: bold;
         }
         #AmazonExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/amazon.svg);
         }
         #AmazonExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/amazon.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/amazon.svg);
         }
         #FacebookExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/facebook.svg);
         }
         #FacebookExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/facebook.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/facebook.svg);
         }
         #GitHubExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/github.svg);
         }
         #GitHubExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/github.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/github.svg);
         }
         #AppleExchange,#AppleManagedExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/apple.svg);
         }
         #AppleExchange:hover,#AppleManagedExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/apple.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/apple.svg);
         }
         #GoogleExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/google.svg);
         }
         #GoogleExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/google.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/google.svg);
         }
         #LinkedInExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/linkedin.svg);
         }
         #LinkedInExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/linkedin.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/linkedin.svg);
         }
         #MicrosoftAccountExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/microsoft.svg);
         }
         #MicrosoftAccountExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/microsoft.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/microsoft.svg);
         }
         #QQExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/qq.svg);
         }
         #QQExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/qq.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/qq.svg);
         }
         #TwitterExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/twitter.svg);
         }
         #TwitterExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/twitter.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/twitter.svg);
         }
         #WeChatExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/wechat.svg);
         }
         #WeChatExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/wechat.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/wechat.svg);
         }
         #WeiboExchange {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/weibo.svg);
         }
         #WeiboExchange:hover {
-          background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/weibo.svg);
+          background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/weibo.svg);
         }
         .buttons #cancel:before {
-            content: url(https://login.microsoftonline.com/templates/src/images/left-arrow.svg);
+            content: url(https://login.microsoftonline.com/templates/images/left-arrow.svg);
         }
     </style>
     <style id="idpselector">
         #SignInWithLogonNameExchange, #SignUpWithLogonEmailExchange, #SignUpWithLogonNameExchange {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/colored/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/colored/local.svg);
         }
         #SignInWithLogonNameExchange:hover, #SignUpWithLogonEmailExchange:hover, #SignUpWithLogonNameExchange:hover {
-            background-image: url(https://login.microsoftonline.com/templates/src/idp_logos/white/local.svg);
+            background-image: url(https://login.microsoftonline.com/static/tenant/templates/idp_logos/white/local.svg);
         }
         #SignUpWithLogonEmailExchange.text-link {
             background-image: none;
@@ -126,14 +126,14 @@
 </head>
 <body>
     <div id="background_branding_container" data-tenant-branding-background-color="true">
-      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/templates/src/backgrounds/4-2.png" alt="Illustration"/>
+      <img data-tenant-branding-background="true" src="https://login.microsoftonline.com/static/tenant/templates/backgrounds/4-2.png" alt="Illustration"/>
     </div>
     <div class="container  unified_container " role="presentation">
         <div class="row">
             <div class="col-lg-6">
                 <div class="panel panel-default">
                     <div class="panel-body">
-                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/src/images/logo.svg" alt="Company Logo">
+                        <img class="companyLogo" data-tenant-branding-logo="true" src="https://login.microsoftonline.com/templates/images/logo.svg" alt="Company Logo">
                         <div id="api" role="main">
                         </div>
                     </div>