Move content from ./src/popup/scripts/ to ./src/popup/ (#478)

* Move content from ./src/popup/scripts/ to ./src/popup/

* Remove 'unneeded' react import

* Move all tests out of scripts folder

src/DetailsView/components/left-nav/nav-link-handler.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { autobind } from '@uifabric/utilities';
-
 import { DetailsViewPivotType } from '../../../common/types/details-view-pivot-type';
 import { VisualizationType } from '../../../common/types/visualization-type';
 import { DetailsViewActionMessageCreator } from '../../actions/details-view-action-message-creator';

src/background/actions/action-payloads.ts

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { BaseTelemetryData, TelemetryData, ToggleTelemetryData } from '../../common/telemetry-events';
 import * as TelemetryEvents from '../../common/telemetry-events';
+import { BaseTelemetryData, TelemetryData, ToggleTelemetryData } from '../../common/telemetry-events';
 import { DetailsViewPivotType } from '../../common/types/details-view-pivot-type';
 import { ManualTestStatus } from '../../common/types/manual-test-status';
 import { VisualizationType } from '../../common/types/visualization-type';
 import { TabStopEvent } from '../../injected/tab-stops-listener';
-import { LaunchPanelType } from '../../popup/scripts/components/popup-view';
+import { LaunchPanelType } from '../../popup/components/popup-view';
 
 export interface BaseActionPayload {
     telemetry?: TelemetryData;

src/background/actions/launch-panel-state-action.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { Action } from '../../common/flux/action';
-import { LaunchPanelType } from '../../popup/scripts/components/popup-view';
+import { LaunchPanelType } from '../../popup/components/popup-view';
 
 export class LaunchPanelStateActions {
     public readonly setLaunchPanelType = new Action<LaunchPanelType>();

src/background/stores/global/launch-panel-store.ts

@@ -4,7 +4,7 @@ import { autobind } from '@uifabric/utilities';
 
 import { StoreNames } from '../../../common/stores/store-names';
 import { ILaunchPanelStoreData } from '../../../common/types/store-data/ilaunch-panel-store-data';
-import { LaunchPanelType } from '../../../popup/scripts/components/popup-view';
+import { LaunchPanelType } from '../../../popup/components/popup-view';
 import { BrowserAdapter } from '../../browser-adapter';
 import { LocalStorageDataKeys } from '../../local-storage-data-keys';
 import { ILocalStorageData } from '../../storage-data';

src/common/types/store-data/ilaunch-panel-store-data.d.ts

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { LaunchPanelType } from '../../../popup/scripts/components/popup-view';
+import { LaunchPanelType } from '../../../popup/components/popup-view';
 
 // tslint:disable-next-line:interface-name
 export interface ILaunchPanelStoreData {

src/popup/actions/popup-action-message-creator.ts

@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import * as React from 'react';
-import { BaseActionPayload, OnDetailsViewOpenPayload, SetLaunchPanelState } from '../../../background/actions/action-payloads';
-import { BaseActionMessageCreator } from '../../../common/message-creators/base-action-message-creator';
-import { Messages } from '../../../common/messages';
-import { SupportedMouseEvent, TelemetryDataFactory } from '../../../common/telemetry-data-factory';
-import * as TelemetryEvents from '../../../common/telemetry-events';
-import { TelemetryEventSource } from '../../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../../common/types/details-view-pivot-type';
-import { VisualizationType } from '../../../common/types/visualization-type';
-import { WindowUtils } from '../../../common/window-utils';
+import { BaseActionPayload, OnDetailsViewOpenPayload, SetLaunchPanelState } from '../../background/actions/action-payloads';
+import { BaseActionMessageCreator } from '../../common/message-creators/base-action-message-creator';
+import { Messages } from '../../common/messages';
+import { SupportedMouseEvent, TelemetryDataFactory } from '../../common/telemetry-data-factory';
+import * as TelemetryEvents from '../../common/telemetry-events';
+import { TelemetryEventSource } from '../../common/telemetry-events';
+import { DetailsViewPivotType } from '../../common/types/details-view-pivot-type';
+import { VisualizationType } from '../../common/types/visualization-type';
+import { WindowUtils } from '../../common/window-utils';
 import { LaunchPanelType } from '../components/popup-view';
 
 const visualizationMessages = Messages.Visualizations;

src/popup/components/diagnostic-view-toggle-factory.tsx

@@ -2,15 +2,14 @@
 // Licensed under the MIT License.
 import { map } from 'lodash';
 import * as React from 'react';
-
-import { BaseStore } from '../../../common/base-store';
-import { TestMode } from '../../../common/configs/test-mode';
-import { VisualizationConfigurationFactory } from '../../../common/configs/visualization-configuration-factory';
-import { TelemetryEventSource } from '../../../common/telemetry-events';
-import { CommandStoreData } from '../../../common/types/store-data/command-store-data';
-import { FeatureFlagStoreData } from '../../../common/types/store-data/feature-flag-store-data';
-import { IVisualizationStoreData } from '../../../common/types/store-data/ivisualization-store-data';
-import { VisualizationType } from '../../../common/types/visualization-type';
+import { BaseStore } from '../../common/base-store';
+import { TestMode } from '../../common/configs/test-mode';
+import { VisualizationConfigurationFactory } from '../../common/configs/visualization-configuration-factory';
+import { TelemetryEventSource } from '../../common/telemetry-events';
+import { CommandStoreData } from '../../common/types/store-data/command-store-data';
+import { FeatureFlagStoreData } from '../../common/types/store-data/feature-flag-store-data';
+import { IVisualizationStoreData } from '../../common/types/store-data/ivisualization-store-data';
+import { VisualizationType } from '../../common/types/visualization-type';
 import { PopupActionMessageCreator } from '../actions/popup-action-message-creator';
 import { DiagnosticViewClickHandler } from '../handlers/diagnostic-view-toggle-click-handler';
 import { DiagnosticViewToggle, DiagnosticViewToggleDeps } from './diagnostic-view-toggle';

src/popup/components/diagnostic-view-toggle.tsx

@@ -5,15 +5,15 @@ import { Link } from 'office-ui-fabric-react/lib/Link';
 import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
 import { IToggle } from 'office-ui-fabric-react/lib/Toggle';
 import * as React from 'react';
-import { VisualizationToggle } from '../../../common/components/visualization-toggle';
-import { VisualizationConfiguration, VisualizationConfigurationFactory } from '../../../common/configs/visualization-configuration-factory';
-import { KeyCodeConstants } from '../../../common/constants/keycode-constants';
-import { TelemetryEventSource } from '../../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../../common/types/details-view-pivot-type';
-import { IVisualizationStoreData } from '../../../common/types/store-data/ivisualization-store-data';
-import { VisualizationType } from '../../../common/types/visualization-type';
-import { DictionaryStringTo } from '../../../types/common-types';
-import { ContentLink, ContentLinkDeps } from '../../../views/content/content-link';
+import { VisualizationToggle } from '../../common/components/visualization-toggle';
+import { VisualizationConfiguration, VisualizationConfigurationFactory } from '../../common/configs/visualization-configuration-factory';
+import { KeyCodeConstants } from '../../common/constants/keycode-constants';
+import { TelemetryEventSource } from '../../common/telemetry-events';
+import { DetailsViewPivotType } from '../../common/types/details-view-pivot-type';
+import { IVisualizationStoreData } from '../../common/types/store-data/ivisualization-store-data';
+import { VisualizationType } from '../../common/types/visualization-type';
+import { DictionaryStringTo } from '../../types/common-types';
+import { ContentLink, ContentLinkDeps } from '../../views/content/content-link';
 import { PopupActionMessageCreator } from '../actions/popup-action-message-creator';
 import { DiagnosticViewClickHandler } from '../handlers/diagnostic-view-toggle-click-handler';
 

src/popup/components/header-contextual-menu.tsx

@@ -3,13 +3,11 @@
 import { getRTL } from '@uifabric/utilities';
 import { ContextualMenu, ContextualMenuItemType, DirectionalHint, IContextualMenuItem } from 'office-ui-fabric-react/lib/ContextualMenu';
 import * as React from 'react';
-
-import { FeatureFlags } from '../../../common/feature-flags';
-import { NamedSFC } from '../../../common/react/named-sfc';
-import { TelemetryEventSource } from '../../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../../common/types/details-view-pivot-type';
-import { VisualizationType } from '../../../common/types/visualization-type';
-import { DictionaryStringTo } from '../../../types/common-types';
+import { NamedSFC } from '../../common/react/named-sfc';
+import { TelemetryEventSource } from '../../common/telemetry-events';
+import { DetailsViewPivotType } from '../../common/types/details-view-pivot-type';
+import { VisualizationType } from '../../common/types/visualization-type';
+import { DictionaryStringTo } from '../../types/common-types';
 import { PopupActionMessageCreator } from '../actions/popup-action-message-creator';
 import { LaunchPanelHeaderClickHandler } from '../handlers/launch-panel-header-click-handler';
 import { LaunchPanelHeader } from './launch-panel-header';

src/popup/components/header.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 import { css } from '@uifabric/utilities';
 import * as React from 'react';
-import { NamedSFC } from '../../../common/react/named-sfc';
+import { NamedSFC } from '../../common/react/named-sfc';
 
 export interface HeaderProps {
     title: string;

src/popup/components/launch-pad.tsx

@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 import * as React from 'react';
 
-import { AxeInfo } from '../../../common/axe-info';
-import { ExternalLink, ExternalLinkDeps } from '../../../common/components/external-link';
+import { AxeInfo } from '../../common/axe-info';
+import { ExternalLink, ExternalLinkDeps } from '../../common/components/external-link';
 import { PopupActionMessageCreator } from '../actions/popup-action-message-creator';
 import { LaunchPadItemRow } from './launch-pad-item-row';
 

src/popup/components/launch-panel-header.tsx

@@ -3,12 +3,12 @@
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import { IContextualMenuItem } from 'office-ui-fabric-react/lib/ContextualMenu';
 import * as React from 'react';
-import { GearOptionsButtonComponent } from '../../../common/components/gear-options-button-component';
-import { DropdownClickHandler } from '../../../common/dropdown-click-handler';
-import { FeatureFlagStoreData } from '../../../common/types/store-data/feature-flag-store-data';
-import { SupportLinkHandler } from '../../support-link-handler';
+import { GearOptionsButtonComponent } from '../../common/components/gear-options-button-component';
+import { DropdownClickHandler } from '../../common/dropdown-click-handler';
+import { FeatureFlagStoreData } from '../../common/types/store-data/feature-flag-store-data';
 import { PopupActionMessageCreator } from '../actions/popup-action-message-creator';
 import { LaunchPanelHeaderClickHandler } from '../handlers/launch-panel-header-click-handler';
+import { SupportLinkHandler } from '../support-link-handler';
 import { Header } from './header';
 import { HeaderContextualMenu, HeaderContextualMenuDeps } from './header-contextual-menu';
 

src/popup/components/popup-view.tsx

@@ -3,16 +3,15 @@
 import { autobind } from '@uifabric/utilities';
 import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
 import * as React from 'react';
-
-import { BrowserAdapter } from '../../../background/browser-adapter';
-import { NewTabLink } from '../../../common/components/new-tab-link';
-import { withStoreSubscription, WithStoreSubscriptionDeps } from '../../../common/components/with-store-subscription';
-import { DisplayableStrings } from '../../../common/constants/displayable-strings';
-import { DropdownClickHandler } from '../../../common/dropdown-click-handler';
-import { FeatureFlagStoreData } from '../../../common/types/store-data/feature-flag-store-data';
-import { ILaunchPanelStoreData } from '../../../common/types/store-data/ilaunch-panel-store-data';
-import { UserConfigurationStoreData } from '../../../common/types/store-data/user-configuration-store';
-import { UrlValidator } from '../../../common/url-validator';
+import { BrowserAdapter } from '../../background/browser-adapter';
+import { NewTabLink } from '../../common/components/new-tab-link';
+import { withStoreSubscription, WithStoreSubscriptionDeps } from '../../common/components/with-store-subscription';
+import { DisplayableStrings } from '../../common/constants/displayable-strings';
+import { DropdownClickHandler } from '../../common/dropdown-click-handler';
+import { FeatureFlagStoreData } from '../../common/types/store-data/feature-flag-store-data';
+import { ILaunchPanelStoreData } from '../../common/types/store-data/ilaunch-panel-store-data';
+import { UserConfigurationStoreData } from '../../common/types/store-data/user-configuration-store';
+import { UrlValidator } from '../../common/url-validator';
 import { IPopupHandlers } from '../handlers/ipopup-handlers';
 import { PopupViewControllerHandler } from '../handlers/popup-view-controller-handler';
 import { LaunchPadRowConfigurationFactory } from '../launch-pad-row-configuration-factory';

src/popup/components/telemetry-permission-dialog.tsx

@@ -5,14 +5,13 @@ import { PrimaryButton } from 'office-ui-fabric-react/lib/Button';
 import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
 import { Dialog, DialogFooter, DialogType } from 'office-ui-fabric-react/lib/Dialog';
 import * as React from 'react';
-
-import { UserConfigMessageCreator } from '../../../common/message-creators/user-config-message-creator';
+import { UserConfigMessageCreator } from '../../common/message-creators/user-config-message-creator';
 import {
     privacyStatementPopupText,
     telemetryPopupCheckboxTitle,
     telemetryPopupNotice,
     telemetryPopupTitle,
-} from '../../../content/settings/improve-accessibility-insights';
+} from '../../content/settings/improve-accessibility-insights';
 
 export interface TelemetryPermissionDialogState {
     isEnableTelemetryChecked: boolean;

src/popup/handlers/diagnostic-view-toggle-click-handler.ts

@@ -1,13 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import * as React from 'react';
-
-import { VisualizationConfigurationFactory } from '../../../common/configs/visualization-configuration-factory';
-import { VisualizationActionMessageCreator } from '../../../common/message-creators/visualization-action-message-creator';
-import { TelemetryDataFactory } from '../../../common/telemetry-data-factory';
-import { TelemetryEventSource } from '../../../common/telemetry-events';
-import { IVisualizationStoreData } from '../../../common/types/store-data/ivisualization-store-data';
-import { VisualizationType } from '../../../common/types/visualization-type';
+import { VisualizationConfigurationFactory } from '../../common/configs/visualization-configuration-factory';
+import { VisualizationActionMessageCreator } from '../../common/message-creators/visualization-action-message-creator';
+import { TelemetryDataFactory } from '../../common/telemetry-data-factory';
+import { TelemetryEventSource } from '../../common/telemetry-events';
+import { IVisualizationStoreData } from '../../common/types/store-data/ivisualization-store-data';
+import { VisualizationType } from '../../common/types/visualization-type';
 
 export class DiagnosticViewClickHandler {
     private telemetryFactory: TelemetryDataFactory;

src/popup/handlers/popup-view-controller-handler.ts

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { LaunchPanelType, PopupView } from './../components/popup-view';
+import { LaunchPanelType, PopupView } from '../components/popup-view';
 
 export class PopupViewControllerHandler {
     public openLaunchPad(component: PopupView): void {

src/popup/launch-pad-row-configuration-factory.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { TelemetryEventSource } from '../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../common/types/details-view-pivot-type';
-import { VisualizationType } from '../../common/types/visualization-type';
+import { TelemetryEventSource } from '../common/telemetry-events';
+import { DetailsViewPivotType } from '../common/types/details-view-pivot-type';
+import { VisualizationType } from '../common/types/visualization-type';
 import { PopupActionMessageCreator } from './actions/popup-action-message-creator';
 import { LaunchPadRowConfiguration } from './components/launch-pad';
 import { PopupView } from './components/popup-view';

src/popup/main-renderer.tsx

@@ -2,12 +2,11 @@
 // Licensed under the MIT License.
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-
-import { BrowserAdapter } from '../../background/browser-adapter';
-import { Theme, ThemeDeps, ThemeInnerState } from '../../common/components/theme';
-import { WithStoreSubscriptionDeps } from '../../common/components/with-store-subscription';
-import { DropdownClickHandler } from '../../common/dropdown-click-handler';
-import { title } from '../../content/strings/application';
+import { BrowserAdapter } from '../background/browser-adapter';
+import { Theme, ThemeDeps, ThemeInnerState } from '../common/components/theme';
+import { WithStoreSubscriptionDeps } from '../common/components/with-store-subscription';
+import { DropdownClickHandler } from '../common/dropdown-click-handler';
+import { title } from '../content/strings/application';
 import { DiagnosticViewToggleFactory } from './components/diagnostic-view-toggle-factory';
 import { PopupViewControllerDeps, PopupViewWithStoreSubscription } from './components/popup-view';
 import { IPopupHandlers } from './handlers/ipopup-handlers';

src/popup/popup-init.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { initializeFabricIcons } from '../../common/fabric-icons';
-import { UrlParser } from '../../common/url-parser';
-import { UrlValidator } from '../../common/url-validator';
-import { ChromeAdapter } from './../../background/browser-adapter';
+import { ChromeAdapter } from '../background/browser-adapter';
+import { initializeFabricIcons } from '../common/fabric-icons';
+import { UrlParser } from '../common/url-parser';
+import { UrlValidator } from '../common/url-validator';
 import { PopupInitializer } from './popup-initializer';
 import { TargetTabFinder } from './target-tab-finder';
 

src/popup/popup-initializer.ts

@@ -3,38 +3,36 @@
 import { autobind } from '@uifabric/utilities';
 import { loadTheme } from 'office-ui-fabric-react';
 import * as ReactDOM from 'react-dom';
-
-import { BrowserAdapter } from '../../background/browser-adapter';
-import { A11YSelfValidator } from '../../common/a11y-self-validator';
-import { AxeInfo } from '../../common/axe-info';
-import { VisualizationConfigurationFactory } from '../../common/configs/visualization-configuration-factory';
-import { DropdownClickHandler } from '../../common/dropdown-click-handler';
-import { EnumHelper } from '../../common/enum-helper';
-import { HTMLElementUtils } from '../../common/html-element-utils';
-import { createDefaultLogger } from '../../common/logging/default-logger';
-import { Logger } from '../../common/logging/logger';
-import { ContentActionMessageCreator } from '../../common/message-creators/content-action-message-creator';
-import { DropdownActionMessageCreator } from '../../common/message-creators/dropdown-action-message-creator';
-import { StoreActionMessageCreatorFactory } from '../../common/message-creators/store-action-message-creator-factory';
-import { UserConfigMessageCreator } from '../../common/message-creators/user-config-message-creator';
-import { VisualizationActionMessageCreator } from '../../common/message-creators/visualization-action-message-creator';
-import { AutoChecker } from '../../common/self-validator';
-import { StoreProxy } from '../../common/store-proxy';
-import { BaseClientStoresHub } from '../../common/stores/base-client-stores-hub';
-import { StoreNames } from '../../common/stores/store-names';
-import { TelemetryDataFactory } from '../../common/telemetry-data-factory';
-import { TelemetryEventSource } from '../../common/telemetry-events';
-import { CommandStoreData } from '../../common/types/store-data/command-store-data';
-import { FeatureFlagStoreData } from '../../common/types/store-data/feature-flag-store-data';
-import { ILaunchPanelStoreData } from '../../common/types/store-data/ilaunch-panel-store-data';
-import { IVisualizationStoreData } from '../../common/types/store-data/ivisualization-store-data';
-import { UserConfigurationStoreData } from '../../common/types/store-data/user-configuration-store';
-import { VisualizationType } from '../../common/types/visualization-type';
-import { WindowUtils } from '../../common/window-utils';
-import { contentPages } from '../../content';
-import { ScannerUtils } from '../../injected/scanner-utils';
-import { scan } from '../../scanner/exposed-apis';
-import { SupportLinkHandler } from '../support-link-handler';
+import { BrowserAdapter } from '../background/browser-adapter';
+import { A11YSelfValidator } from '../common/a11y-self-validator';
+import { AxeInfo } from '../common/axe-info';
+import { VisualizationConfigurationFactory } from '../common/configs/visualization-configuration-factory';
+import { DropdownClickHandler } from '../common/dropdown-click-handler';
+import { EnumHelper } from '../common/enum-helper';
+import { HTMLElementUtils } from '../common/html-element-utils';
+import { createDefaultLogger } from '../common/logging/default-logger';
+import { Logger } from '../common/logging/logger';
+import { ContentActionMessageCreator } from '../common/message-creators/content-action-message-creator';
+import { DropdownActionMessageCreator } from '../common/message-creators/dropdown-action-message-creator';
+import { StoreActionMessageCreatorFactory } from '../common/message-creators/store-action-message-creator-factory';
+import { UserConfigMessageCreator } from '../common/message-creators/user-config-message-creator';
+import { VisualizationActionMessageCreator } from '../common/message-creators/visualization-action-message-creator';
+import { AutoChecker } from '../common/self-validator';
+import { StoreProxy } from '../common/store-proxy';
+import { BaseClientStoresHub } from '../common/stores/base-client-stores-hub';
+import { StoreNames } from '../common/stores/store-names';
+import { TelemetryDataFactory } from '../common/telemetry-data-factory';
+import { TelemetryEventSource } from '../common/telemetry-events';
+import { CommandStoreData } from '../common/types/store-data/command-store-data';
+import { FeatureFlagStoreData } from '../common/types/store-data/feature-flag-store-data';
+import { ILaunchPanelStoreData } from '../common/types/store-data/ilaunch-panel-store-data';
+import { IVisualizationStoreData } from '../common/types/store-data/ivisualization-store-data';
+import { UserConfigurationStoreData } from '../common/types/store-data/user-configuration-store';
+import { VisualizationType } from '../common/types/visualization-type';
+import { WindowUtils } from '../common/window-utils';
+import { contentPages } from '../content';
+import { ScannerUtils } from '../injected/scanner-utils';
+import { scan } from '../scanner/exposed-apis';
 import { PopupActionMessageCreator } from './actions/popup-action-message-creator';
 import { DiagnosticViewToggleDeps } from './components/diagnostic-view-toggle';
 import { DiagnosticViewToggleFactory } from './components/diagnostic-view-toggle-factory';
@@ -45,6 +43,7 @@ import { LaunchPanelHeaderClickHandler } from './handlers/launch-panel-header-cl
 import { PopupViewControllerHandler } from './handlers/popup-view-controller-handler';
 import { LaunchPadRowConfigurationFactory } from './launch-pad-row-configuration-factory';
 import { MainRenderer, MainRendererDeps } from './main-renderer';
+import { SupportLinkHandler } from './support-link-handler';
 import { TargetTabFinder, TargetTabInfo } from './target-tab-finder';
 
 declare var window: AutoChecker & Window;

src/popup/target-tab-finder.ts

@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { autobind } from '@uifabric/utilities';
-
-import { BrowserAdapter } from '../../background/browser-adapter';
-import { Tab } from '../../common/itab';
-import { UrlParser } from '../../common/url-parser';
-import { UrlValidator } from '../../common/url-validator';
+import { BrowserAdapter } from '../background/browser-adapter';
+import { Tab } from '../common/itab';
+import { UrlParser } from '../common/url-parser';
+import { UrlValidator } from '../common/url-validator';
 
 export interface TargetTabInfo {
     tab: Tab;

src/tests/unit/tests/background/actions/global-action-creator.test.ts

@@ -23,7 +23,7 @@ import { Action } from '../../../../../common/flux/action';
 import { Messages } from '../../../../../common/messages';
 import * as TelemetryEvents from '../../../../../common/telemetry-events';
 import { UserConfigurationStoreData } from '../../../../../common/types/store-data/user-configuration-store';
-import { LaunchPanelType } from '../../../../../popup/scripts/components/popup-view';
+import { LaunchPanelType } from '../../../../../popup/components/popup-view';
 import { DictionaryStringTo } from '../../../../../types/common-types';
 
 describe('GlobalActionCreatorTest', () => {

src/tests/unit/tests/background/stores/global/global-store-hub.test.ts

@@ -17,7 +17,7 @@ import { BaseStore } from '../../../../../../common/base-store';
 import { IndexedDBAPI } from '../../../../../../common/indexedDB/indexedDB';
 import { PersistedTabInfo } from '../../../../../../common/types/store-data/iassessment-result-data';
 import { StoreType } from '../../../../../../common/types/store-type';
-import { LaunchPanelType } from '../../../../../../popup/scripts/components/popup-view';
+import { LaunchPanelType } from '../../../../../../popup/components/popup-view';
 import { CreateTestAssessmentProvider } from '../../../../common/test-assessment-provider';
 
 describe('GlobalStoreHubTest', () => {

src/tests/unit/tests/background/stores/global/launch-panel-state-store.test.ts

@@ -9,7 +9,7 @@ import { ILocalStorageData } from '../../../../../../background/storage-data';
 import { LaunchPanelStore } from '../../../../../../background/stores/global/launch-panel-store';
 import { StoreNames } from '../../../../../../common/stores/store-names';
 import { ILaunchPanelStoreData } from '../../../../../../common/types/store-data/ilaunch-panel-store-data';
-import { LaunchPanelType } from '../../../../../../popup/scripts/components/popup-view';
+import { LaunchPanelType } from '../../../../../../popup/components/popup-view';
 import { createStoreWithNullParams, StoreTester } from '../../../../common/store-tester';
 
 describe('LaunchPanelStateStoreTest', () => {

src/tests/unit/tests/popup/actions/popup-action-message-creator.test.ts

@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { IMock, It, Mock, MockBehavior, Times } from 'typemoq';
-
-import { OnDetailsViewOpenPayload, SetLaunchPanelState } from '../../../../../../background/actions/action-payloads';
-import { Messages } from '../../../../../../common/messages';
-import { TelemetryDataFactory } from '../../../../../../common/telemetry-data-factory';
+import { OnDetailsViewOpenPayload, SetLaunchPanelState } from '../../../../../background/actions/action-payloads';
+import { Messages } from '../../../../../common/messages';
+import { TelemetryDataFactory } from '../../../../../common/telemetry-data-factory';
 import {
     BaseTelemetryData,
     DetailsViewOpenTelemetryData,
@@ -12,13 +11,13 @@ import {
     POPUP_INITIALIZED,
     TelemetryEventSource,
     TUTORIAL_OPEN,
-} from '../../../../../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../../../../../common/types/details-view-pivot-type';
-import { VisualizationType } from '../../../../../../common/types/visualization-type';
-import { WindowUtils } from '../../../../../../common/window-utils';
-import { PopupActionMessageCreator } from '../../../../../../popup/scripts/actions/popup-action-message-creator';
-import { LaunchPanelType } from '../../../../../../popup/scripts/components/popup-view';
-import { EventStubFactory } from '../../../../common/event-stub-factory';
+} from '../../../../../common/telemetry-events';
+import { DetailsViewPivotType } from '../../../../../common/types/details-view-pivot-type';
+import { VisualizationType } from '../../../../../common/types/visualization-type';
+import { WindowUtils } from '../../../../../common/window-utils';
+import { PopupActionMessageCreator } from '../../../../../popup/actions/popup-action-message-creator';
+import { LaunchPanelType } from '../../../../../popup/components/popup-view';
+import { EventStubFactory } from '../../../common/event-stub-factory';
 
 describe('PopupActionMessageCreatorTest', () => {
     const eventStubFactory = new EventStubFactory();

src/tests/unit/tests/popup/components/ad-hoc-tools-panel.test.tsx

@@ -7,8 +7,8 @@ import * as React from 'react';
 import * as TestUtils from 'react-dom/test-utils';
 import { Mock, Times } from 'typemoq';
 
-import { AdHocToolsPanel, AdHocToolsPanelProps } from '../../../../../../popup/scripts/components/ad-hoc-tools-panel';
-import { DiagnosticViewToggleFactory } from '../../../../../../popup/scripts/components/diagnostic-view-toggle-factory';
+import { AdHocToolsPanel, AdHocToolsPanelProps } from '../../../../../popup/components/ad-hoc-tools-panel';
+import { DiagnosticViewToggleFactory } from '../../../../../popup/components/diagnostic-view-toggle-factory';
 
 describe('AdHocToolsPanelTest', () => {
     const diagnosticViewToggleFactoryMock = Mock.ofType(DiagnosticViewToggleFactory);

src/tests/unit/tests/popup/components/diagnostic-view-toggle-factory.test.tsx

@@ -3,23 +3,23 @@
 import * as React from 'react';
 import { Mock, MockBehavior } from 'typemoq';
 
-import { CommandStore } from '../../../../../../background/stores/global/command-store';
-import { FeatureFlagStore } from '../../../../../../background/stores/global/feature-flag-store';
-import { VisualizationStore } from '../../../../../../background/stores/visualization-store';
-import { TestMode } from '../../../../../../common/configs/test-mode';
+import { CommandStore } from '../../../../../background/stores/global/command-store';
+import { FeatureFlagStore } from '../../../../../background/stores/global/feature-flag-store';
+import { VisualizationStore } from '../../../../../background/stores/visualization-store';
+import { TestMode } from '../../../../../common/configs/test-mode';
 import {
     VisualizationConfiguration,
     VisualizationConfigurationFactory,
-} from '../../../../../../common/configs/visualization-configuration-factory';
-import { TelemetryEventSource } from '../../../../../../common/telemetry-events';
-import { VisualizationType } from '../../../../../../common/types/visualization-type';
-import { PopupActionMessageCreator } from '../../../../../../popup/scripts/actions/popup-action-message-creator';
-import { DiagnosticViewToggle } from '../../../../../../popup/scripts/components/diagnostic-view-toggle';
-import { DiagnosticViewToggleFactory } from '../../../../../../popup/scripts/components/diagnostic-view-toggle-factory';
-import { DiagnosticViewClickHandler } from '../../../../../../popup/scripts/handlers/diagnostic-view-toggle-click-handler';
-import { ContentLinkDeps } from '../../../../../../views/content/content-link';
-import { ShortcutCommandsTestData } from '../../../../common/sample-test-data';
-import { VisualizationStoreDataBuilder } from '../../../../common/visualization-store-data-builder';
+} from '../../../../../common/configs/visualization-configuration-factory';
+import { TelemetryEventSource } from '../../../../../common/telemetry-events';
+import { VisualizationType } from '../../../../../common/types/visualization-type';
+import { PopupActionMessageCreator } from '../../../../../popup/actions/popup-action-message-creator';
+import { DiagnosticViewToggle } from '../../../../../popup/components/diagnostic-view-toggle';
+import { DiagnosticViewToggleFactory } from '../../../../../popup/components/diagnostic-view-toggle-factory';
+import { DiagnosticViewClickHandler } from '../../../../../popup/handlers/diagnostic-view-toggle-click-handler';
+import { ContentLinkDeps } from '../../../../../views/content/content-link';
+import { ShortcutCommandsTestData } from '../../../common/sample-test-data';
+import { VisualizationStoreDataBuilder } from '../../../common/visualization-store-data-builder';
 
 describe('DiagnosticViewToggleFactoryTest', () => {
     const firstVisualizationTypeStub = -1;

src/tests/unit/tests/popup/components/diagnostic-view-toggle.test.tsx

@@ -5,25 +5,25 @@ import { Link } from 'office-ui-fabric-react/lib/Link';
 import * as React from 'react';
 import * as TestUtils from 'react-dom/test-utils';
 import { IMock, It, Mock, Times } from 'typemoq';
-import { VisualizationToggle } from '../../../../../../common/components/visualization-toggle';
+
+import { VisualizationToggle } from '../../../../../common/components/visualization-toggle';
 import {
     VisualizationConfiguration,
     VisualizationConfigurationFactory,
-} from '../../../../../../common/configs/visualization-configuration-factory';
-import { FeatureFlags } from '../../../../../../common/feature-flags';
-import { TelemetryEventSource } from '../../../../../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../../../../../common/types/details-view-pivot-type';
-import { IVisualizationStoreData } from '../../../../../../common/types/store-data/ivisualization-store-data';
-import { VisualizationType } from '../../../../../../common/types/visualization-type';
-import { PopupActionMessageCreator } from '../../../../../../popup/scripts/actions/popup-action-message-creator';
-import { DiagnosticViewToggle, DiagnosticViewToggleProps } from '../../../../../../popup/scripts/components/diagnostic-view-toggle';
-import { DiagnosticViewClickHandler } from '../../../../../../popup/scripts/handlers/diagnostic-view-toggle-click-handler';
-import { DictionaryStringTo } from '../../../../../../types/common-types';
-import { ContentLinkDeps } from '../../../../../../views/content/content-link';
-import { ContentProvider } from '../../../../../../views/content/content-page';
-import { EventStubFactory } from '../../../../common/event-stub-factory';
-import { ShortcutCommandsTestData } from '../../../../common/sample-test-data';
-import { VisualizationStoreDataBuilder } from '../../../../common/visualization-store-data-builder';
+} from '../../../../../common/configs/visualization-configuration-factory';
+import { TelemetryEventSource } from '../../../../../common/telemetry-events';
+import { DetailsViewPivotType } from '../../../../../common/types/details-view-pivot-type';
+import { IVisualizationStoreData } from '../../../../../common/types/store-data/ivisualization-store-data';
+import { VisualizationType } from '../../../../../common/types/visualization-type';
+import { PopupActionMessageCreator } from '../../../../../popup/actions/popup-action-message-creator';
+import { DiagnosticViewToggle, DiagnosticViewToggleProps } from '../../../../../popup/components/diagnostic-view-toggle';
+import { DiagnosticViewClickHandler } from '../../../../../popup/handlers/diagnostic-view-toggle-click-handler';
+import { DictionaryStringTo } from '../../../../../types/common-types';
+import { ContentLinkDeps } from '../../../../../views/content/content-link';
+import { ContentProvider } from '../../../../../views/content/content-page';
+import { EventStubFactory } from '../../../common/event-stub-factory';
+import { ShortcutCommandsTestData } from '../../../common/sample-test-data';
+import { VisualizationStoreDataBuilder } from '../../../common/visualization-store-data-builder';
 
 describe('DiagnosticViewToggleTest', () => {
     const visualizationConfigurationFactory = new VisualizationConfigurationFactory();

src/tests/unit/tests/popup/components/header-contextual-menu.test.tsx

@@ -5,15 +5,15 @@ import { ContextualMenu } from 'office-ui-fabric-react/lib/ContextualMenu';
 import * as React from 'react';
 import { It, Mock, Times } from 'typemoq';
 
-import { FeatureFlags } from '../../../../../../common/feature-flags';
-import { TelemetryEventSource } from '../../../../../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../../../../../common/types/details-view-pivot-type';
-import { VisualizationType } from '../../../../../../common/types/visualization-type';
-import { PopupActionMessageCreator } from '../../../../../../popup/scripts/actions/popup-action-message-creator';
-import { HeaderContextualMenu, HeaderContextualMenuProps } from '../../../../../../popup/scripts/components/header-contextual-menu';
-import { LaunchPanelHeader } from '../../../../../../popup/scripts/components/launch-panel-header';
-import { LaunchPanelHeaderClickHandler } from '../../../../../../popup/scripts/handlers/launch-panel-header-click-handler';
-import { EventStubFactory } from '../../../../common/event-stub-factory';
+import { FeatureFlags } from '../../../../../common/feature-flags';
+import { TelemetryEventSource } from '../../../../../common/telemetry-events';
+import { DetailsViewPivotType } from '../../../../../common/types/details-view-pivot-type';
+import { VisualizationType } from '../../../../../common/types/visualization-type';
+import { PopupActionMessageCreator } from '../../../../../popup/actions/popup-action-message-creator';
+import { HeaderContextualMenu, HeaderContextualMenuProps } from '../../../../../popup/components/header-contextual-menu';
+import { LaunchPanelHeader } from '../../../../../popup/components/launch-panel-header';
+import { LaunchPanelHeaderClickHandler } from '../../../../../popup/handlers/launch-panel-header-click-handler';
+import { EventStubFactory } from '../../../common/event-stub-factory';
 
 describe('HeaderContextualMenu', () => {
     it('render', () => {

src/tests/unit/tests/popup/components/header.test.tsx

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import { Header, HeaderProps } from '../../../../../../popup/scripts/components/header';
+import { Header, HeaderProps } from '../../../../../popup/components/header';
 
 describe('HeaderTest', () => {
     test('render', () => {

src/tests/unit/tests/popup/components/launch-pad-item-row.test.tsx

@@ -7,8 +7,8 @@ import * as React from 'react';
 import * as TestUtils from 'react-dom/test-utils';
 import { Mock, Times } from 'typemoq';
 
-import { LaunchPadItemRow, LaunchPadItemRowProps } from '../../../../../../popup/scripts/components/launch-pad-item-row';
-import { EventStubFactory } from '../../../../common/event-stub-factory';
+import { LaunchPadItemRow, LaunchPadItemRowProps } from '../../../../../popup/components/launch-pad-item-row';
+import { EventStubFactory } from '../../../common/event-stub-factory';
 
 describe('LaunchPadItemRow', () => {
     const descriptionClassName = 'launch-pad-item-description';

src/tests/unit/tests/popup/components/launch-pad.test.tsx

@@ -3,10 +3,10 @@
 import { shallow } from 'enzyme';
 import * as React from 'react';
 
-import { ExternalLink } from '../../../../../../common/components/external-link';
-import { toolName } from '../../../../../../content/strings/application';
-import { LaunchPad, LaunchPadDeps, LaunchPadProps, LaunchPadRowConfiguration } from '../../../../../../popup/scripts/components/launch-pad';
-import { LaunchPadItemRow } from '../../../../../../popup/scripts/components/launch-pad-item-row';
+import { ExternalLink } from '../../../../../common/components/external-link';
+import { toolName } from '../../../../../content/strings/application';
+import { LaunchPad, LaunchPadDeps, LaunchPadProps, LaunchPadRowConfiguration } from '../../../../../popup/components/launch-pad';
+import { LaunchPadItemRow } from '../../../../../popup/components/launch-pad-item-row';
 
 const AXE_CORE_VERSION = 'axe.core.version';
 

src/tests/unit/tests/popup/components/launch-panel-header.test.tsx

@@ -4,18 +4,13 @@ import { mount, shallow } from 'enzyme';
 import { IconButton } from 'office-ui-fabric-react/lib/Button';
 import * as React from 'react';
 import { It, Mock, Times } from 'typemoq';
-
-import { DropdownClickHandler } from '../../../../../../common/dropdown-click-handler';
-import { FeatureFlagStoreData } from '../../../../../../common/types/store-data/feature-flag-store-data';
-import { PopupActionMessageCreator } from '../../../../../../popup/scripts/actions/popup-action-message-creator';
-import {
-    LaunchPanelHeader,
-    LaunchPanelHeaderDeps,
-    LaunchPanelHeaderProps,
-} from '../../../../../../popup/scripts/components/launch-panel-header';
-import { LaunchPanelHeaderClickHandler } from '../../../../../../popup/scripts/handlers/launch-panel-header-click-handler';
-import { SupportLinkHandler } from '../../../../../../popup/support-link-handler';
-import { EventStubFactory } from '../../../../common/event-stub-factory';
+import { DropdownClickHandler } from '../../../../../common/dropdown-click-handler';
+import { FeatureFlagStoreData } from '../../../../../common/types/store-data/feature-flag-store-data';
+import { PopupActionMessageCreator } from '../../../../../popup/actions/popup-action-message-creator';
+import { LaunchPanelHeader, LaunchPanelHeaderDeps, LaunchPanelHeaderProps } from '../../../../../popup/components/launch-panel-header';
+import { LaunchPanelHeaderClickHandler } from '../../../../../popup/handlers/launch-panel-header-click-handler';
+import { SupportLinkHandler } from '../../../../../popup/support-link-handler';
+import { EventStubFactory } from '../../../common/event-stub-factory';
 
 describe('LaunchPanelHeaderTest', () => {
     let props: LaunchPanelHeaderProps;

src/tests/unit/tests/popup/components/popup-view-controller-handler.test.tsx

@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 import { It, Mock, Times } from 'typemoq';
 
-import { PopupActionMessageCreator } from '../../../../../../popup/scripts/actions/popup-action-message-creator';
-import { LaunchPanelType } from '../../../../../../popup/scripts/components/popup-view';
-import { PopupViewControllerHandler } from '../../../../../../popup/scripts/handlers/popup-view-controller-handler';
+import { PopupActionMessageCreator } from '../../../../../popup/actions/popup-action-message-creator';
+import { LaunchPanelType } from '../../../../../popup/components/popup-view';
+import { PopupViewControllerHandler } from '../../../../../popup/handlers/popup-view-controller-handler';
 
 describe('PopupViewControllerHandlerTest', () => {
     test('openAdhocToolsPanel', () => {

src/tests/unit/tests/popup/components/popup-view.test.tsx

@@ -4,31 +4,31 @@ import { shallow } from 'enzyme';
 import * as React from 'react';
 import { IMock, It, Mock, MockBehavior, Times } from 'typemoq';
 
-import { ChromeAdapter } from '../../../../../../background/browser-adapter';
-import { NewTabLink } from '../../../../../../common/components/new-tab-link';
-import { DropdownClickHandler } from '../../../../../../common/dropdown-click-handler';
-import { StoreActionMessageCreatorImpl } from '../../../../../../common/message-creators/store-action-message-creator-impl';
-import { BaseClientStoresHub } from '../../../../../../common/stores/base-client-stores-hub';
-import { CommandStoreData } from '../../../../../../common/types/store-data/command-store-data';
-import { ILaunchPanelStoreData } from '../../../../../../common/types/store-data/ilaunch-panel-store-data';
-import { UserConfigurationStoreData } from '../../../../../../common/types/store-data/user-configuration-store';
-import { PopupActionMessageCreator } from '../../../../../../popup/scripts/actions/popup-action-message-creator';
-import { LaunchPanelHeader } from '../../../../../../popup/scripts/components/launch-panel-header';
+import { ChromeAdapter } from '../../../../../background/browser-adapter';
+import { NewTabLink } from '../../../../../common/components/new-tab-link';
+import { DropdownClickHandler } from '../../../../../common/dropdown-click-handler';
+import { StoreActionMessageCreatorImpl } from '../../../../../common/message-creators/store-action-message-creator-impl';
+import { BaseClientStoresHub } from '../../../../../common/stores/base-client-stores-hub';
+import { CommandStoreData } from '../../../../../common/types/store-data/command-store-data';
+import { ILaunchPanelStoreData } from '../../../../../common/types/store-data/ilaunch-panel-store-data';
+import { UserConfigurationStoreData } from '../../../../../common/types/store-data/user-configuration-store';
+import { PopupActionMessageCreator } from '../../../../../popup/actions/popup-action-message-creator';
+import { LaunchPanelHeader } from '../../../../../popup/components/launch-panel-header';
 import {
     LaunchPanelType,
     PopupView,
     PopupViewControllerDeps,
     PopupViewControllerState,
     PopupViewProps,
-} from '../../../../../../popup/scripts/components/popup-view';
-import { DiagnosticViewClickHandler } from '../../../../../../popup/scripts/handlers/diagnostic-view-toggle-click-handler';
-import { PopupViewControllerHandler } from '../../../../../../popup/scripts/handlers/popup-view-controller-handler';
-import { LaunchPadRowConfigurationFactory } from '../../../../../../popup/scripts/launch-pad-row-configuration-factory';
-import { SupportLinkHandler } from '../../../../../../popup/support-link-handler';
-import { BaseDataBuilder } from '../../../../common/base-data-builder';
-import { ShortcutCommandsTestData } from '../../../../common/sample-test-data';
-import { IsSameObject } from '../../../../common/typemoq-helper';
-import { VisualizationStoreDataBuilder } from '../../../../common/visualization-store-data-builder';
+} from '../../../../../popup/components/popup-view';
+import { DiagnosticViewClickHandler } from '../../../../../popup/handlers/diagnostic-view-toggle-click-handler';
+import { PopupViewControllerHandler } from '../../../../../popup/handlers/popup-view-controller-handler';
+import { LaunchPadRowConfigurationFactory } from '../../../../../popup/launch-pad-row-configuration-factory';
+import { SupportLinkHandler } from '../../../../../popup/support-link-handler';
+import { BaseDataBuilder } from '../../../common/base-data-builder';
+import { ShortcutCommandsTestData } from '../../../common/sample-test-data';
+import { IsSameObject } from '../../../common/typemoq-helper';
+import { VisualizationStoreDataBuilder } from '../../../common/visualization-store-data-builder';
 
 describe('PopupView', () => {
     const browserAdapterMock = Mock.ofType(ChromeAdapter);

src/tests/unit/tests/popup/components/telemetry-permission-dialog.test.tsx

@@ -4,13 +4,9 @@ import * as Enzyme from 'enzyme';
 import { PrimaryButton } from 'office-ui-fabric-react/lib/Button';
 import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
 import * as React from 'react';
-
-import { UserConfigMessageCreator } from '../../../../../../common/message-creators/user-config-message-creator';
-import { FeatureFlagStoreData } from '../../../../../../common/types/store-data/feature-flag-store-data';
-import {
-    TelemetryPermissionDialog,
-    TelemetryPermissionDialogProps,
-} from '../../../../../../popup/scripts/components/telemetry-permission-dialog';
+import { UserConfigMessageCreator } from '../../../../../common/message-creators/user-config-message-creator';
+import { FeatureFlagStoreData } from '../../../../../common/types/store-data/feature-flag-store-data';
+import { TelemetryPermissionDialog, TelemetryPermissionDialogProps } from '../../../../../popup/components/telemetry-permission-dialog';
 
 describe('TelemetryPermissionDialogTest', () => {
     let userConfigMessageCreatorStub: UserConfigMessageCreator;

src/tests/unit/tests/popup/handlers/diagnostic-view-toggle-click-handler.test.ts

@@ -2,14 +2,14 @@
 // Licensed under the MIT License.
 import { It, Mock } from 'typemoq';
 
-import { VisualizationConfigurationFactory } from '../../../../../../common/configs/visualization-configuration-factory';
-import { VisualizationActionMessageCreator } from '../../../../../../common/message-creators/visualization-action-message-creator';
-import { TelemetryDataFactory } from '../../../../../../common/telemetry-data-factory';
-import { TelemetryEventSource, ToggleTelemetryData } from '../../../../../../common/telemetry-events';
-import { VisualizationType } from '../../../../../../common/types/visualization-type';
-import { DiagnosticViewClickHandler } from '../../../../../../popup/scripts/handlers/diagnostic-view-toggle-click-handler';
-import { EventStubFactory } from '../../../../common/event-stub-factory';
-import { VisualizationStoreDataBuilder } from '../../../../common/visualization-store-data-builder';
+import { VisualizationConfigurationFactory } from '../../../../../common/configs/visualization-configuration-factory';
+import { VisualizationActionMessageCreator } from '../../../../../common/message-creators/visualization-action-message-creator';
+import { TelemetryDataFactory } from '../../../../../common/telemetry-data-factory';
+import { TelemetryEventSource, ToggleTelemetryData } from '../../../../../common/telemetry-events';
+import { VisualizationType } from '../../../../../common/types/visualization-type';
+import { DiagnosticViewClickHandler } from '../../../../../popup/handlers/diagnostic-view-toggle-click-handler';
+import { EventStubFactory } from '../../../common/event-stub-factory';
+import { VisualizationStoreDataBuilder } from '../../../common/visualization-store-data-builder';
 
 describe('DiagnosticViewToggleClickHandlerTest', () => {
     const eventStubFactory = new EventStubFactory();

src/tests/unit/tests/popup/handlers/launch-panel-header-click-handler.test.ts

@@ -7,8 +7,8 @@ import {
     LaunchPanelHeaderDeps,
     LaunchPanelHeaderProps,
     LaunchPanelHeaderState,
-} from '../../../../../../popup/scripts/components/launch-panel-header';
-import { LaunchPanelHeaderClickHandler } from '../../../../../../popup/scripts/handlers/launch-panel-header-click-handler';
+} from '../../../../../popup/components/launch-panel-header';
+import { LaunchPanelHeaderClickHandler } from '../../../../../popup/handlers/launch-panel-header-click-handler';
 
 describe('FeedbackMenuClickHandlerTest', () => {
     let testObject: LaunchPanelHeaderClickHandler;

src/tests/unit/tests/popup/launch-pad-row-configuration-factory.test.ts

@@ -2,13 +2,13 @@
 // Licensed under the MIT License.
 import { Mock, Times } from 'typemoq';
 
-import { TelemetryEventSource } from '../../../../../common/telemetry-events';
-import { DetailsViewPivotType } from '../../../../../common/types/details-view-pivot-type';
-import { VisualizationType } from '../../../../../common/types/visualization-type';
-import { PopupActionMessageCreator } from '../../../../../popup/scripts/actions/popup-action-message-creator';
-import { LaunchPadRowConfiguration } from '../../../../../popup/scripts/components/launch-pad';
-import { PopupViewControllerHandler } from '../../../../../popup/scripts/handlers/popup-view-controller-handler';
-import { LaunchPadRowConfigurationFactory } from '../../../../../popup/scripts/launch-pad-row-configuration-factory';
+import { TelemetryEventSource } from '../../../../common/telemetry-events';
+import { DetailsViewPivotType } from '../../../../common/types/details-view-pivot-type';
+import { VisualizationType } from '../../../../common/types/visualization-type';
+import { PopupActionMessageCreator } from '../../../../popup/actions/popup-action-message-creator';
+import { LaunchPadRowConfiguration } from '../../../../popup/components/launch-pad';
+import { PopupViewControllerHandler } from '../../../../popup/handlers/popup-view-controller-handler';
+import { LaunchPadRowConfigurationFactory } from '../../../../popup/launch-pad-row-configuration-factory';
 
 describe('LaunchPadRowConfigurationFactoryTests', () => {
     test('createRowConfigs: verify string properties', () => {

src/tests/unit/tests/popup/main-renderer.test.tsx

@@ -4,18 +4,18 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { IMock, It, Mock } from 'typemoq';
 
-import { BrowserAdapter, ChromeAdapter } from '../../../../../background/browser-adapter';
-import { Theme } from '../../../../../common/components/theme';
-import { DropdownClickHandler } from '../../../../../common/dropdown-click-handler';
-import { title } from '../../../../../content/strings/application';
-import { DiagnosticViewToggleFactory } from '../../../../../popup/scripts/components/diagnostic-view-toggle-factory';
-import { PopupViewWithStoreSubscription } from '../../../../../popup/scripts/components/popup-view';
-import { DiagnosticViewClickHandler } from '../../../../../popup/scripts/handlers/diagnostic-view-toggle-click-handler';
-import { LaunchPanelHeaderClickHandler } from '../../../../../popup/scripts/handlers/launch-panel-header-click-handler';
-import { PopupViewControllerHandler } from '../../../../../popup/scripts/handlers/popup-view-controller-handler';
-import { LaunchPadRowConfigurationFactory } from '../../../../../popup/scripts/launch-pad-row-configuration-factory';
-import { MainRenderer, MainRendererDeps } from '../../../../../popup/scripts/main-renderer';
-import { SupportLinkHandler } from '../../../../../popup/support-link-handler';
+import { BrowserAdapter, ChromeAdapter } from '../../../../background/browser-adapter';
+import { Theme } from '../../../../common/components/theme';
+import { DropdownClickHandler } from '../../../../common/dropdown-click-handler';
+import { title } from '../../../../content/strings/application';
+import { DiagnosticViewToggleFactory } from '../../../../popup/components/diagnostic-view-toggle-factory';
+import { PopupViewWithStoreSubscription } from '../../../../popup/components/popup-view';
+import { DiagnosticViewClickHandler } from '../../../../popup/handlers/diagnostic-view-toggle-click-handler';
+import { LaunchPanelHeaderClickHandler } from '../../../../popup/handlers/launch-panel-header-click-handler';
+import { PopupViewControllerHandler } from '../../../../popup/handlers/popup-view-controller-handler';
+import { LaunchPadRowConfigurationFactory } from '../../../../popup/launch-pad-row-configuration-factory';
+import { MainRenderer, MainRendererDeps } from '../../../../popup/main-renderer';
+import { SupportLinkHandler } from '../../../../popup/support-link-handler';
 
 describe('MainRenderer', () => {
     const expectedTitle = title;

src/tests/unit/tests/popup/popup-initializer.test.ts

@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 import { It, Mock } from 'typemoq';
 
-import { ChromeAdapter } from '../../../../../background/browser-adapter';
-import { Logger } from '../../../../../common/logging/logger';
-import { PopupInitializer } from '../../../../../popup/scripts/popup-initializer';
-import { TargetTabFinder, TargetTabInfo } from '../../../../../popup/scripts/target-tab-finder';
+import { ChromeAdapter } from '../../../../background/browser-adapter';
+import { Logger } from '../../../../common/logging/logger';
+import { PopupInitializer } from '../../../../popup/popup-initializer';
+import { TargetTabFinder, TargetTabInfo } from '../../../../popup/target-tab-finder';
 
 describe('PopupInitializerTests', () => {
     test('initializePopup', async () => {

src/tests/unit/tests/popup/target-tab-finder.test.ts

@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 import { IMock, It, Mock } from 'typemoq';
 
-import { BrowserAdapter } from '../../../../../background/browser-adapter';
-import { Tab } from '../../../../../common/itab';
-import { UrlParser } from '../../../../../common/url-parser';
-import { UrlValidator } from '../../../../../common/url-validator';
-import { TargetTabFinder } from '../../../../../popup/scripts/target-tab-finder';
+import { BrowserAdapter } from '../../../../background/browser-adapter';
+import { Tab } from '../../../../common/itab';
+import { UrlParser } from '../../../../common/url-parser';
+import { UrlValidator } from '../../../../common/url-validator';
+import { TargetTabFinder } from '../../../../popup/target-tab-finder';
 
 describe('TargetTabFinderTest', () => {
     let testSubject: TargetTabFinder;

webpack.config.js

@@ -21,7 +21,7 @@ const commonPlugins = [
 
 const commonEntryFiles = {
     injected: [path.resolve(__dirname, 'src/injected/stylesheet-init.ts'), path.resolve(__dirname, 'src/injected/client-init.ts')],
-    popup: path.resolve(__dirname, 'src/popup/scripts/popup-init.ts'),
+    popup: path.resolve(__dirname, 'src/popup/popup-init.ts'),
     insights: [path.resolve(__dirname, 'src/views/insights/initializer.ts')],
     detailsView: [path.resolve(__dirname, 'src/DetailsView/details-view-initializer.ts')],
     devtools: [path.resolve(__dirname, 'src/Devtools/dev-tool-init.ts')],