diff --git a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
index 8edc38dce6f60..8c4c90bf111de 100644
--- a/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Authorizenet/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent',
+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
         }
     }
 };
diff --git a/app/code/Magento/Captcha/view/frontend/requirejs-config.js b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
index 3b322711f8b1f..42c80632d3e92 100644
--- a/app/code/Magento/Captcha/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Captcha/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            captcha: 'Magento_Captcha/captcha'
+            captcha: 'Magento_Captcha/js/captcha',
+            'Magento_Captcha/captcha': 'Magento_Captcha/js/captcha'
         }
     }
 };
diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/js/captcha.js
similarity index 100%
rename from app/code/Magento/Captcha/view/frontend/web/captcha.js
rename to app/code/Magento/Captcha/view/frontend/web/js/captcha.js
diff --git a/app/code/Magento/Captcha/view/frontend/web/onepage.js b/app/code/Magento/Captcha/view/frontend/web/js/onepage.js
similarity index 100%
rename from app/code/Magento/Captcha/view/frontend/web/onepage.js
rename to app/code/Magento/Captcha/view/frontend/web/js/onepage.js
diff --git a/app/code/Magento/Customer/view/frontend/requirejs-config.js b/app/code/Magento/Customer/view/frontend/requirejs-config.js
index 20dd53ded11c9..f1bf5c1d1b67f 100644
--- a/app/code/Magento/Customer/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Customer/view/frontend/requirejs-config.js
@@ -7,11 +7,13 @@ var config = {
     map: {
         '*': {
             checkoutBalance:    'Magento_Customer/js/checkout-balance',
-            address:            'Magento_Customer/address',
-            changeEmailPassword: 'Magento_Customer/change-email-password',
+            address:            'Magento_Customer/js/address',
+            changeEmailPassword: 'Magento_Customer/js/change-email-password',
             passwordStrengthIndicator: 'Magento_Customer/js/password-strength-indicator',
             zxcvbn: 'Magento_Customer/js/zxcvbn',
-            addressValidation: 'Magento_Customer/js/addressValidation'
+            addressValidation: 'Magento_Customer/js/addressValidation',
+            'Magento_Customer/address': 'Magento_Customer/js/address',
+            'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password'
         }
     }
 };
diff --git a/app/code/Magento/Customer/view/frontend/web/address.js b/app/code/Magento/Customer/view/frontend/web/js/address.js
similarity index 100%
rename from app/code/Magento/Customer/view/frontend/web/address.js
rename to app/code/Magento/Customer/view/frontend/web/js/address.js
diff --git a/app/code/Magento/Customer/view/frontend/web/change-email-password.js b/app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
similarity index 100%
rename from app/code/Magento/Customer/view/frontend/web/change-email-password.js
rename to app/code/Magento/Customer/view/frontend/web/js/change-email-password.js
diff --git a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
index 59d0558decd16..f615966d801f7 100644
--- a/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Downloadable/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            downloadable: 'Magento_Downloadable/downloadable'
+            downloadable: 'Magento_Downloadable/js/downloadable',
+            'Magento_Downloadable/downloadable': 'Magento_Downloadable/js/downloadable'
         }
     }
 };
diff --git a/app/code/Magento/Downloadable/view/frontend/web/downloadable.js b/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
similarity index 100%
rename from app/code/Magento/Downloadable/view/frontend/web/downloadable.js
rename to app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
diff --git a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
index db33efeba1a94..f8a463bec37f9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
+++ b/app/code/Magento/GiftMessage/view/frontend/requirejs-config.js
@@ -6,8 +6,10 @@
 var config = {
     map: {
         '*': {
-            giftOptions:    'Magento_GiftMessage/gift-options',
-            extraOptions:   'Magento_GiftMessage/extra-options'
+            giftOptions:    'Magento_GiftMessage/js/gift-options',
+            extraOptions:   'Magento_GiftMessage/js/extra-options',
+            'Magento_GiftMessage/gift-options':    'Magento_GiftMessage/js/gift-options',
+            'Magento_GiftMessage/extra-options':   'Magento_GiftMessage/js/extra-options'
         }
     }
 };
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/extra-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
similarity index 100%
rename from app/code/Magento/GiftMessage/view/frontend/web/extra-options.js
rename to app/code/Magento/GiftMessage/view/frontend/web/js/extra-options.js
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/gift-options.js b/app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
similarity index 100%
rename from app/code/Magento/GiftMessage/view/frontend/web/gift-options.js
rename to app/code/Magento/GiftMessage/view/frontend/web/js/gift-options.js
diff --git a/app/code/Magento/Payment/view/frontend/requirejs-config.js b/app/code/Magento/Payment/view/frontend/requirejs-config.js
index 70f93854ead4b..949b1554a6f7d 100644
--- a/app/code/Magento/Payment/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Payment/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            creditCardType: 'Magento_Payment/cc-type'
+            creditCardType: 'Magento_Payment/js/cc-type',
+            'Magento_Payment/cc-type': 'Magento_Payment/js/cc-type'
         }
     }
 };
diff --git a/app/code/Magento/Payment/view/frontend/web/cc-type.js b/app/code/Magento/Payment/view/frontend/web/js/cc-type.js
similarity index 100%
rename from app/code/Magento/Payment/view/frontend/web/cc-type.js
rename to app/code/Magento/Payment/view/frontend/web/js/cc-type.js
diff --git a/app/code/Magento/Payment/view/frontend/web/transparent.js b/app/code/Magento/Payment/view/frontend/web/js/transparent.js
similarity index 100%
rename from app/code/Magento/Payment/view/frontend/web/transparent.js
rename to app/code/Magento/Payment/view/frontend/web/js/transparent.js
diff --git a/app/code/Magento/Paypal/view/base/requirejs-config.js b/app/code/Magento/Paypal/view/base/requirejs-config.js
index 8edc38dce6f60..8c4c90bf111de 100644
--- a/app/code/Magento/Paypal/view/base/requirejs-config.js
+++ b/app/code/Magento/Paypal/view/base/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent',
+            'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
         }
     }
 };
diff --git a/app/code/Magento/Paypal/view/frontend/requirejs-config.js b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
index d2cf3f9a0ce7d..223ade43d86e5 100644
--- a/app/code/Magento/Paypal/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Paypal/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            orderReview: 'Magento_Paypal/order-review',
+            orderReview: 'Magento_Paypal/js/order-review',
+            'Magento_Paypal/order-review': 'Magento_Paypal/js/order-review',
             paypalCheckout: 'Magento_Paypal/js/paypal-checkout'
         }
     },
diff --git a/app/code/Magento/Paypal/view/frontend/web/order-review.js b/app/code/Magento/Paypal/view/frontend/web/js/order-review.js
similarity index 100%
rename from app/code/Magento/Paypal/view/frontend/web/order-review.js
rename to app/code/Magento/Paypal/view/frontend/web/js/order-review.js
diff --git a/app/code/Magento/Sales/view/frontend/requirejs-config.js b/app/code/Magento/Sales/view/frontend/requirejs-config.js
index 04778765f3c97..4d323684afff6 100644
--- a/app/code/Magento/Sales/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Sales/view/frontend/requirejs-config.js
@@ -6,8 +6,10 @@
 var config = {
     map: {
         '*': {
-            giftMessage:    'Magento_Sales/gift-message',
-            ordersReturns:  'Magento_Sales/orders-returns'
+            giftMessage:    'Magento_Sales/js/gift-message',
+            ordersReturns:  'Magento_Sales/js/orders-returns',
+            'Magento_Sales/gift-message':    'Magento_Sales/js/gift-message',
+            'Magento_Sales/orders-returns':  'Magento_Sales/js/orders-returns'
         }
     }
 };
diff --git a/app/code/Magento/Sales/view/frontend/web/gift-message.js b/app/code/Magento/Sales/view/frontend/web/js/gift-message.js
similarity index 100%
rename from app/code/Magento/Sales/view/frontend/web/gift-message.js
rename to app/code/Magento/Sales/view/frontend/web/js/gift-message.js
diff --git a/app/code/Magento/Sales/view/frontend/web/orders-returns.js b/app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
similarity index 100%
rename from app/code/Magento/Sales/view/frontend/web/orders-returns.js
rename to app/code/Magento/Sales/view/frontend/web/js/orders-returns.js
diff --git a/app/code/Magento/Search/view/frontend/requirejs-config.js b/app/code/Magento/Search/view/frontend/requirejs-config.js
index c38cba4315eac..d945944daa1b0 100644
--- a/app/code/Magento/Search/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Search/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            quickSearch: 'Magento_Search/form-mini'
+            quickSearch: 'Magento_Search/js/form-mini',
+            'Magento_Search/form-mini': 'Magento_Search/js/form-mini'
         }
     }
 };
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
similarity index 100%
rename from app/code/Magento/Search/view/frontend/web/form-mini.js
rename to app/code/Magento/Search/view/frontend/web/js/form-mini.js
diff --git a/app/code/Magento/SendFriend/view/frontend/requirejs-config.js b/app/code/Magento/SendFriend/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..f356cebe57946
--- /dev/null
+++ b/app/code/Magento/SendFriend/view/frontend/requirejs-config.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            'Magento_SendFriend/back-event': 'Magento_SendFriend/js/back-event'
+        }
+    }
+};
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 3342530f01eb5..2b25e0efab84a 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -123,7 +123,7 @@
 <script type="text/x-magento-init">
     {
         "a[role='back']": {
-            "Magento_SendFriend/back-event": {}
+            "Magento_SendFriend/js/back-event": {}
         }
     }
 </script>
diff --git a/app/code/Magento/SendFriend/view/frontend/web/back-event.js b/app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
similarity index 100%
rename from app/code/Magento/SendFriend/view/frontend/web/back-event.js
rename to app/code/Magento/SendFriend/view/frontend/web/js/back-event.js
diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
index 47ccaf5a33e57..b4b3ce0f8c554 100644
--- a/app/code/Magento/Translation/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js
@@ -7,7 +7,8 @@ var config = {
     map: {
         '*': {
             editTrigger: 'mage/edit-trigger',
-            addClass: 'Magento_Translation/add-class'
+            addClass: 'Magento_Translation/js/add-class',
+            'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
         }
     },
     deps: [
diff --git a/app/code/Magento/Translation/view/frontend/web/add-class.js b/app/code/Magento/Translation/view/frontend/web/js/add-class.js
similarity index 100%
rename from app/code/Magento/Translation/view/frontend/web/add-class.js
rename to app/code/Magento/Translation/view/frontend/web/js/add-class.js
diff --git a/app/code/Magento/Weee/view/frontend/requirejs-config.js b/app/code/Magento/Weee/view/frontend/requirejs-config.js
index 49dfb6b9d469b..94c59da65216d 100644
--- a/app/code/Magento/Weee/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Weee/view/frontend/requirejs-config.js
@@ -6,7 +6,8 @@
 var config = {
     map: {
         '*': {
-            'taxToggle': 'Magento_Weee/tax-toggle'
+            'taxToggle': 'Magento_Weee/js/tax-toggle',
+            'Magento_Weee/tax-toggle': 'Magento_Weee/js/tax-toggle'
         }
     }
 };
diff --git a/app/code/Magento/Weee/view/frontend/web/tax-toggle.js b/app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js
similarity index 100%
rename from app/code/Magento/Weee/view/frontend/web/tax-toggle.js
rename to app/code/Magento/Weee/view/frontend/web/js/tax-toggle.js