rename from devtools/client/responsive.html/app.js
rename to devtools/client/responsive.html/components/App.js
--- a/devtools/client/responsive.html/app.js
+++ b/devtools/client/responsive.html/components/App.js
@@ -12,32 +12,34 @@ const PropTypes = require("devtools/clie
 const { connect } = require("devtools/client/shared/vendor/react-redux");
 
 const {
   addCustomDevice,
   removeCustomDevice,
   updateDeviceDisplayed,
   updateDeviceModal,
   updatePreferredDevices,
-} = require("./actions/devices");
+} = require("../actions/devices");
 const { changeNetworkThrottling } = require("devtools/client/shared/components/throttling/actions");
-const { changeReloadCondition } = require("./actions/reload-conditions");
-const { takeScreenshot } = require("./actions/screenshot");
-const { changeTouchSimulation } = require("./actions/touch-simulation");
+const { changeReloadCondition } = require("../actions/reload-conditions");
+const { takeScreenshot } = require("../actions/screenshot");
+const { changeTouchSimulation } = require("../actions/touch-simulation");
 const {
   changeDevice,
   changePixelRatio,
   removeDeviceAssociation,
   resizeViewport,
   rotateViewport,
-} = require("./actions/viewports");
-const DeviceModal = createFactory(require("./components/DeviceModal"));
-const GlobalToolbar = createFactory(require("./components/GlobalToolbar"));
-const Viewports = createFactory(require("./components/Viewports"));
-const Types = require("./types");
+} = require("../actions/viewports");
+
+const DeviceModal = createFactory(require("./DeviceModal"));
+const GlobalToolbar = createFactory(require("./GlobalToolbar"));
+const Viewports = createFactory(require("./Viewports"));
+
+const Types = require("../types");
 
 class App extends Component {
   static get propTypes() {
     return {
       devices: PropTypes.shape(Types.devices).isRequired,
       dispatch: PropTypes.func.isRequired,
       displayPixelRatio: Types.pixelRatio.value.isRequired,
       networkThrottling: PropTypes.shape(Types.networkThrottling).isRequired,

--- a/devtools/client/responsive.html/components/moz.build
+++ b/devtools/client/responsive.html/components/moz.build
@@ -1,15 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'App.js',
     'Browser.js',
     'DeviceAdder.js',
     'DeviceModal.js',
     'DevicePixelRatioSelector.js',
     'DeviceSelector.js',
     'GlobalToolbar.js',
     'ReloadConditions.js',
     'ResizableViewport.js',

--- a/devtools/client/responsive.html/index.js
+++ b/devtools/client/responsive.html/index.js
@@ -16,17 +16,17 @@ const Telemetry = require("devtools/clie
 const { loadAgentSheet } = require("./utils/css");
 
 const { createFactory, createElement } =
   require("devtools/client/shared/vendor/react");
 const ReactDOM = require("devtools/client/shared/vendor/react-dom");
 const { Provider } = require("devtools/client/shared/vendor/react-redux");
 
 const message = require("./utils/message");
-const App = createFactory(require("./app"));
+const App = createFactory(require("./components/App"));
 const Store = require("./store");
 const { loadDevices } = require("./actions/devices");
 const { changeDisplayPixelRatio } = require("./actions/display-pixel-ratio");
 const { changeLocation } = require("./actions/location");
 const { loadReloadConditions } = require("./actions/reload-conditions");
 const { addViewport, resizeViewport } = require("./actions/viewports");
 
 // Exposed for use by tests

--- a/devtools/client/responsive.html/moz.build
+++ b/devtools/client/responsive.html/moz.build
@@ -9,17 +9,16 @@ DIRS += [
     'browser',
     'components',
     'images',
     'reducers',
     'utils',
 ]
 
 DevToolsModules(
-    'app.js',
     'commands.js',
     'constants.js',
     'index.css',
     'index.js',
     'manager.js',
     'reducers.js',
     'responsive-ua.css',
     'store.js',