fix(imports): Avoid "import { thing } from 'core'"

app/scripts/modules/core/src/artifact/ArtifactReferenceService.ts

@@ -1,6 +1,6 @@
 import { IStage } from 'core/domain';
 import { get, noop } from 'lodash';
-import { Registry } from 'core';
+import { Registry } from 'core/registry';
 
 export class ArtifactReferenceService {
   public static removeReferenceFromStages(reference: string, stages: IStage[]) {

app/scripts/modules/core/src/artifact/ExpectedArtifactSelectorViewController.ts

@@ -1,4 +1,5 @@
-import { IExpectedArtifact, IArtifactAccount, IArtifactSource, IArtifactKindConfig } from 'core';
+import { IExpectedArtifact, IArtifactSource, IArtifactKindConfig } from 'core/domain';
+import { IArtifactAccount } from 'core/account';
 import { ExpectedArtifactService } from './expectedArtifact.service';
 
 export interface IExpectedArtifactSelectorViewControllerDelegate {

app/scripts/modules/core/src/artifact/ExpectedArtifactSelectorViewControllerAngularDelegate.ts

@@ -1,5 +1,6 @@
 import { IScope } from 'angular';
-import { IArtifactAccount, IArtifactKindConfig } from 'core';
+import { IArtifactAccount } from 'core/account';
+import { IArtifactKindConfig } from 'core/domain';
 
 export abstract class ExpectedArtifactSelectorViewControllerAngularDelegate<ArtifactSource> {
   protected sources: ArtifactSource[] = [];

app/scripts/modules/core/src/artifact/NgAppEngineDeployArtifactDelegate.ts

@@ -1,15 +1,10 @@
 import { IScope } from 'angular';
-import {
-  ExpectedArtifactService,
-  Registry,
-  IExpectedArtifact,
-  IArtifactAccount,
-  IArtifactKindConfig,
-  IArtifactSource,
-  IExpectedArtifactSelectorViewControllerDelegate,
-  IStage,
-  IPipeline,
-} from 'core';
+
+import { IExpectedArtifact, IArtifactKindConfig, IArtifactSource, IStage, IPipeline } from 'core/domain';
+import { Registry } from 'core/registry';
+import { ExpectedArtifactService, IExpectedArtifactSelectorViewControllerDelegate } from 'core/artifact';
+import { IArtifactAccount } from 'core/account';
+
 import { ExpectedArtifactSelectorViewControllerAngularDelegate } from './ExpectedArtifactSelectorViewControllerAngularDelegate';
 
 export class NgAppEngineDeployArtifactDelegate

app/scripts/modules/core/src/artifact/NgAppengineConfigArtifactDelegate.ts

@@ -1,15 +1,11 @@
 import { IScope } from 'angular';
 import { get } from 'lodash';
-import {
-  ExpectedArtifactService,
-  Registry,
-  IExpectedArtifact,
-  IArtifactAccount,
-  IArtifactSource,
-  IExpectedArtifactSelectorViewControllerDelegate,
-  IStage,
-  IPipeline,
-} from 'core';
+
+import { Registry } from 'core/registry';
+import { IExpectedArtifact, IArtifactSource, IStage, IPipeline } from 'core/domain';
+import { ExpectedArtifactService, IExpectedArtifactSelectorViewControllerDelegate } from 'core/artifact';
+import { IArtifactAccount } from 'core/account';
+
 import { ExpectedArtifactSelectorViewControllerAngularDelegate } from './ExpectedArtifactSelectorViewControllerAngularDelegate';
 
 export class NgAppengineConfigArtifactDelegate

app/scripts/modules/core/src/artifact/NgBakeManifestArtifactDelegate.ts

@@ -1,14 +1,10 @@
 import { IScope } from 'angular';
-import {
-  ExpectedArtifactService,
-  Registry,
-  IExpectedArtifact,
-  IArtifactAccount,
-  IArtifactSource,
-  IExpectedArtifactSelectorViewControllerDelegate,
-  IStage,
-  IPipeline,
-} from 'core';
+
+import { IExpectedArtifact, IArtifactSource, IStage, IPipeline } from 'core/domain';
+import { ExpectedArtifactService, IExpectedArtifactSelectorViewControllerDelegate } from 'core/artifact';
+import { Registry } from 'core/registry';
+import { IArtifactAccount } from 'core/account';
+
 import { ExpectedArtifactSelectorViewControllerAngularDelegate } from './ExpectedArtifactSelectorViewControllerAngularDelegate';
 
 export class NgBakeManifestArtifactDelegate

app/scripts/modules/core/src/artifact/NgGCEImageArtifactDelegate.ts

@@ -1,15 +1,10 @@
 import { IScope } from 'angular';
-import {
-  ExpectedArtifactService,
-  Registry,
-  IExpectedArtifact,
-  IArtifactAccount,
-  IArtifactKindConfig,
-  IArtifactSource,
-  IExpectedArtifactSelectorViewControllerDelegate,
-  IStage,
-  IPipeline,
-} from 'core';
+
+import { IArtifactKindConfig, IExpectedArtifact, IArtifactSource, IStage, IPipeline } from 'core/domain';
+import { ExpectedArtifactService, IExpectedArtifactSelectorViewControllerDelegate } from 'core/artifact';
+import { Registry } from 'core/registry';
+import { IArtifactAccount } from 'core/account';
+
 import { ExpectedArtifactSelectorViewControllerAngularDelegate } from './ExpectedArtifactSelectorViewControllerAngularDelegate';
 import { ArtifactTypePatterns } from './ArtifactTypes';
 

app/scripts/modules/core/src/artifact/NgManifestArtifactDelegate.ts

@@ -1,15 +1,10 @@
 import { IScope } from 'angular';
-import {
-  ExpectedArtifactService,
-  Registry,
-  IExpectedArtifact,
-  IArtifactAccount,
-  IArtifactKindConfig,
-  IArtifactSource,
-  IExpectedArtifactSelectorViewControllerDelegate,
-  IStage,
-  IPipeline,
-} from 'core';
+
+import { IArtifactKindConfig, IExpectedArtifact, IArtifactSource, IStage, IPipeline } from 'core/domain';
+import { ExpectedArtifactService, IExpectedArtifactSelectorViewControllerDelegate } from 'core/artifact';
+import { Registry } from 'core/registry';
+import { IArtifactAccount } from 'core/account';
+
 import { ExpectedArtifactSelectorViewControllerAngularDelegate } from './ExpectedArtifactSelectorViewControllerAngularDelegate';
 import { ArtifactTypePatterns } from './ArtifactTypes';
 

app/scripts/modules/core/src/artifact/expectedArtifact.service.spec.ts

@@ -1,7 +1,7 @@
 import { noop } from 'lodash';
 import { ExpectedArtifactService } from './expectedArtifact.service';
 import { IArtifact } from 'core/domain';
-import { Registry } from 'core';
+import { Registry } from 'core/registry';
 
 describe('ExpectedArtifactService', () => {
   describe('getKind()', () => {

app/scripts/modules/core/src/artifact/expectedArtifact.service.ts

@@ -1,6 +1,7 @@
-import { PipelineConfigService } from 'core/pipeline/config/services/PipelineConfigService';
-import { Registry, IPipeline, IStage, IExpectedArtifact, IExecutionContext, IArtifact, IArtifactSource } from 'core';
-import { UUIDGenerator } from 'core/utils/uuid.service';
+import { PipelineConfigService } from 'core/pipeline';
+import { Registry } from 'core/registry';
+import { IPipeline, IStage, IExpectedArtifact, IExecutionContext, IArtifact, IArtifactSource } from 'core/domain';
+import { UUIDGenerator } from 'core/utils';
 
 export class ExpectedArtifactService {
   public static getExpectedArtifactsAvailableToStage(stage: IStage, pipeline: IPipeline): IExpectedArtifact[] {

app/scripts/modules/core/src/artifact/react/ArtifactAccountSelector.tsx

@@ -1,7 +1,9 @@
 import { module } from 'angular';
 import * as React from 'react';
 import { react2angular } from 'react2angular';
-import { IArtifactAccount, TetheredSelect } from 'core';
+
+import { IArtifactAccount } from 'core/account';
+import { TetheredSelect } from 'core/presentation';
 
 export interface IArtifactAccountSelectorProps {
   accounts: IArtifactAccount[];

app/scripts/modules/core/src/artifact/react/ArtifactIcon.tsx

@@ -1,7 +1,9 @@
 import * as React from 'react';
+
+import { IArtifact, IArtifactKindConfig, IExpectedArtifact } from 'core/domain';
+
 import { ArtifactIconService } from '../ArtifactIconService';
 import { ExpectedArtifactService } from '../expectedArtifact.service';
-import { IArtifact, IArtifactKindConfig, IExpectedArtifact } from 'core';
 
 export interface IArtifactIconProps {
   expectedArtifact?: IExpectedArtifact;

app/scripts/modules/core/src/artifact/react/ExecutionArtifactTab.tsx

@@ -1,6 +1,9 @@
 import * as React from 'react';
 import { get, has } from 'lodash';
-import { IExpectedArtifact, IExecution, IExecutionDetailsSectionProps, ExecutionDetailsSection } from 'core';
+
+import { IExpectedArtifact, IExecution } from 'core/domain';
+import { IExecutionDetailsSectionProps, ExecutionDetailsSection } from 'core/pipeline';
+
 import { ArtifactIconList } from './ArtifactIconList';
 
 import '../artifactTab.less';

app/scripts/modules/core/src/artifact/react/ExpectedArtifactEditor.tsx

@@ -2,8 +2,11 @@ import { module } from 'angular';
 import * as React from 'react';
 import { react2angular } from 'react2angular';
 import { cloneDeep } from 'lodash';
-import { IExpectedArtifact, IArtifactAccount, IArtifactKindConfig, IArtifact } from 'core';
-import { StageConfigField } from 'core/pipeline/config/stages/core/stageConfigField/StageConfigField';
+
+import { IExpectedArtifact, IArtifactKindConfig, IArtifact } from 'core/domain';
+import { IArtifactAccount } from 'core/account';
+import { StageConfigField } from 'core/pipeline';
+
 import { ExpectedArtifactService } from '../expectedArtifact.service';
 import {
   ExpectedArtifactKindSelector,

app/scripts/modules/core/src/artifact/react/ExpectedArtifactKindSelector.tsx

@@ -1,7 +1,10 @@
 import { module } from 'angular';
 import * as React from 'react';
 import { react2angular } from 'react2angular';
-import { TetheredSelect, IArtifactKindConfig } from 'core';
+
+import { IArtifactKindConfig } from 'core/domain';
+import { TetheredSelect } from 'core/presentation';
+
 import { ArtifactIcon } from './ArtifactIcon';
 
 export interface IExpectedArtifactKindSelectorProps {

app/scripts/modules/core/src/artifact/react/ExpectedArtifactSelector.spec.tsx

@@ -1,6 +1,9 @@
 import * as React from 'react';
 import { mount } from 'enzyme';
-import { ExpectedArtifactService, IExpectedArtifact } from 'core';
+
+import { ExpectedArtifactService } from 'core/artifact';
+import { IExpectedArtifact } from 'core/domain';
+
 import { ExpectedArtifactSelector } from './ExpectedArtifactSelector';
 
 const artifact = (kind: string, type: string): IExpectedArtifact => {

app/scripts/modules/core/src/artifact/react/ExpectedArtifactSelector.tsx

@@ -1,7 +1,10 @@
 import { module } from 'angular';
 import * as React from 'react';
 import { react2angular } from 'react2angular';
-import { TetheredSelect, IExpectedArtifact, IArtifact } from 'core';
+
+import { TetheredSelect } from 'core/presentation';
+import { IExpectedArtifact, IArtifact } from 'core/domain';
+
 import { ArtifactIcon } from './ArtifactIcon';
 import { ExpectedArtifactService } from '../expectedArtifact.service';
 import { ARTIFACT_ACCOUNT_SELECTOR_COMPONENT_REACT } from './ArtifactAccountSelector';

app/scripts/modules/core/src/artifact/react/ExpectedArtifactSourceSelector.tsx

@@ -1,7 +1,10 @@
 import { module } from 'angular';
 import * as React from 'react';
 import { react2angular } from 'react2angular';
-import { UUIDGenerator, TetheredSelect, IExpectedArtifact } from 'core';
+
+import { UUIDGenerator } from 'core/utils';
+import { TetheredSelect } from 'core/presentation';
+import { IExpectedArtifact } from 'core/domain';
 
 export interface IExpectedArtifactSourceOption {
   source: {

app/scripts/modules/core/src/cluster/cluster.service.ts

@@ -1,15 +1,16 @@
 import { IPromise, IQService, module } from 'angular';
 import { flatten, forOwn, get, groupBy, has, head, keys, values } from 'lodash';
 
-import { API } from 'core/api/ApiService';
-import { Application } from 'core/application/application.model';
+import { ArtifactReferenceService } from 'core/artifact';
+import { API } from 'core/api';
+import { Application } from 'core/application';
 import { NameUtils } from 'core/naming';
 import { FilterModelService } from 'core/filterModel';
 import { IArtifactExtractor, ICluster, IClusterSummary, IExecution, IExecutionStage, IServerGroup } from 'core/domain';
 import { ClusterState } from 'core/state';
-import { ProviderServiceDelegate } from 'core/cloudProvider/providerService.delegate';
+import { ProviderServiceDelegate } from 'core/cloudProvider';
+
 import { taskMatcher } from './task.matcher';
-import { ArtifactReferenceService } from 'core';
 
 export class ClusterService {
   public static ON_DEMAND_THRESHOLD = 350;

app/scripts/modules/core/src/domain/IArtifactEditorProps.ts

@@ -1,4 +1,5 @@
-import { IArtifact, IArtifactAccount } from 'core';
+import { IArtifact } from 'core/domain';
+import { IArtifactAccount } from 'core/account';
 
 export interface IArtifactEditorProps {
   account: IArtifactAccount;

app/scripts/modules/core/src/domain/IArtifactExtractor.ts

@@ -1,4 +1,4 @@
-import { ICluster } from 'core';
+import { ICluster } from 'core/domain';
 
 export interface IArtifactExtractor {
   extractArtifacts: (cluster: ICluster) => string[];

app/scripts/modules/core/src/domain/IStageTypeConfig.ts

@@ -3,9 +3,7 @@ import { IExecutionDetailsSectionProps } from 'core/pipeline/config/stages/core'
 import { IExecutionContext, IExecutionStageLabelComponentProps, IExecutionStageSummary } from './IExecutionStage';
 import { IStageOrTriggerTypeConfig } from './IStageOrTriggerTypeConfig';
 
-export type IExecutionDetailsSection = (
-  | React.ComponentClass<IExecutionDetailsSectionProps>
-  | React.SFC<IExecutionDetailsSectionProps>) & { title: string };
+export type IExecutionDetailsSection = React.ComponentType<IExecutionDetailsSectionProps> & { title: string };
 
 export interface IStageTypeConfig extends IStageOrTriggerTypeConfig {
   accountExtractor?: (stage: IStage) => string;

app/scripts/modules/core/src/entityTag/AddEntityTagLinks.tsx

@@ -1,4 +1,5 @@
-import { Application, IOwnerOption } from 'core';
+import { Application } from 'core/application';
+import { IOwnerOption } from 'core/entityTag';
 
 export interface IAddEntityTagLinksProps {
   application: Application;

app/scripts/modules/core/src/entityTag/addEntityTagLinks.component.ts

@@ -1,6 +1,8 @@
 import { IController, IComponentOptions, module } from 'angular';
 
-import { Application, IEntityTag } from 'core';
+import { IEntityTag } from 'core/domain';
+import { Application } from 'core/application';
+
 import { EntityTagEditor, IEntityTagEditorProps, IOwnerOption } from './EntityTagEditor';
 import './entityTags.help';
 

app/scripts/modules/core/src/entityTag/notifications/EphemeralPopover.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 
-import { HoverablePopover, IEntityTags } from 'core';
+import { HoverablePopover } from 'core/presentation';
+import { IEntityTags } from 'core/domain';
 
 import * as moment from 'moment';
 

app/scripts/modules/core/src/orchestratedItem/orchestratedItem.transformer.ts

@@ -2,7 +2,7 @@ import { duration } from 'moment';
 import { $log } from 'ngimport';
 
 import { IOrchestratedItem, IOrchestratedItemVariable, ITask, ITaskStep } from 'core/domain';
-import { ReactInjector } from 'core';
+import { ReactInjector } from 'core/reactShims';
 
 export class OrchestratedItemTransformer {
   public static addRunningTime(item: any): void {

app/scripts/modules/core/src/overrideRegistry/Overridable.tsx

@@ -1,11 +1,11 @@
-import { Spinner } from 'core';
 import * as React from 'react';
 import { Subject, Observable } from 'rxjs';
+import { get } from 'lodash';
 
 import { CloudProviderRegistry } from 'core/cloudProvider';
 import { ReactInjector, AngularJSAdapter } from 'core/reactShims';
 import { AccountService, IAccountDetails } from 'core/account/AccountService';
-import { get } from 'lodash';
+import { Spinner } from 'core/widgets';
 
 export interface IOverridableProps {
   accountId?: string;

app/scripts/modules/core/src/pipeline/config/stages/applySourceServerGroupCapacity/ApplySourceServerGroupCapacityDetails.tsx

@@ -1,7 +1,7 @@
-import { StageFailureMessage } from 'core';
 import * as React from 'react';
 import { find, get } from 'lodash';
 
+import { StageFailureMessage } from 'core/pipeline';
 import { IStage } from 'core/domain';
 import { IExecutionDetailsSectionProps } from 'core/pipeline/config/stages/core';
 import { ExecutionDetailsSection } from '../core/ExecutionDetailsSection';

app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestConfig.controller.ts

@@ -1,12 +1,11 @@
 import { IController, IScope } from 'angular';
 
+import { AccountService, IArtifactAccount } from 'core/account';
 import {
-  AccountService,
   ExpectedArtifactSelectorViewController,
   NgBakeManifestArtifactDelegate,
-  IArtifactAccount,
   IArtifactAccountPair,
-} from 'core';
+} from 'core/artifact';
 import { UUIDGenerator } from 'core/utils';
 
 export class BakeManifestConfigCtrl implements IController {

app/scripts/modules/core/src/pipeline/config/stages/bakeManifest/bakeManifestStage.ts

@@ -1,16 +1,11 @@
 import { module } from 'angular';
 import { get } from 'lodash';
 
-import {
-  ArtifactReferenceService,
-  ExecutionArtifactTab,
-  ExecutionDetailsTasks,
-  ExpectedArtifactService,
-  IArtifact,
-  IStage,
-  Registry,
-  SETTINGS,
-} from 'core';
+import { ArtifactReferenceService, ExecutionArtifactTab, ExpectedArtifactService } from 'core/artifact';
+import { ExecutionDetailsTasks } from 'core/pipeline';
+import { IArtifact, IStage } from 'core/domain';
+import { Registry } from 'core/registry';
+import { SETTINGS } from 'core/config';
 
 import { BakeManifestConfigCtrl } from './bakeManifestConfig.controller';