Flatten the 'core' directory.

packages/@aws-cdk/cdk/lib/app.ts

@@ -1,5 +1,5 @@
 import cxapi = require('@aws-cdk/cx-api');
-import { ConstructOrder, Root } from './core/construct';
+import { ConstructOrder, Root } from './construct';
 import { FileSystemStore, InMemoryStore, ISynthesisSession, SynthesisSession } from './synthesis';
 
 /**

packages/@aws-cdk/cdk/lib/aspect.ts

@@ -1,4 +1,4 @@
-import { IConstruct } from './core/construct';
+import { IConstruct } from './construct';
 
 /**
  * Represents an Aspect

packages/@aws-cdk/cdk/lib/core/tokens/cfn-concat.ts → packages/@aws-cdk/cdk/lib/cfn-concat.ts

@@ -19,4 +19,4 @@ export function cloudFormationConcat(left: any | undefined, right: any | undefin
   return { 'Fn::Join': ['', minimalCloudFormationJoin('', parts)] };
 }
 
-import { minimalCloudFormationJoin } from "../../cloudformation/instrinsics";
+import { minimalCloudFormationJoin } from "./cloudformation/instrinsics";

packages/@aws-cdk/cdk/lib/cloudformation/arn.ts

@@ -1,5 +1,5 @@
 import { Fn } from '../cloudformation/fn';
-import { unresolved } from '../core/tokens';
+import { unresolved } from '../unresolved';
 import { Stack } from './stack';
 
 /**

packages/@aws-cdk/cdk/lib/cloudformation/cfn-condition.ts

@@ -1,5 +1,5 @@
-import { Construct } from '../core/construct';
-import { ResolveContext } from '../core/tokens';
+import { Construct } from '../construct';
+import { ResolveContext } from '../token';
 import { CfnRefElement } from './cfn-element';
 
 export interface CfnConditionProps {

packages/@aws-cdk/cdk/lib/cloudformation/cfn-element.ts

@@ -1,5 +1,5 @@
-import { Construct, IConstruct, PATH_SEP } from "../core/construct";
-import { Token } from '../core/tokens';
+import { Construct, IConstruct, PATH_SEP } from "../construct";
+import { Token } from '../token';
 
 const LOGICAL_ID_MD = 'aws:cdk:logicalId';
 
@@ -43,7 +43,7 @@ export abstract class CfnElement extends Construct {
   constructor(scope: Construct, id: string) {
     super(scope, id);
 
-    this.node.addMetadata(LOGICAL_ID_MD, new (require("../core/tokens/token").Token)(() => this.logicalId), this.constructor);
+    this.node.addMetadata(LOGICAL_ID_MD, new (require("../token").Token)(() => this.logicalId), this.constructor);
 
     this._logicalId = this.node.stack.logicalIds.getLogicalId(this);
     this.logicalId = new Token(() => this._logicalId).toString();
@@ -154,4 +154,4 @@ export abstract class CfnRefElement extends CfnElement {
   }
 }
 
-import { findTokens } from "../core/tokens/resolve";
+import { findTokens } from "../resolve";

packages/@aws-cdk/cdk/lib/cloudformation/cfn-mapping.ts

@@ -1,4 +1,4 @@
-import { Construct } from '../core/construct';
+import { Construct } from '../construct';
 import { CfnRefElement } from './cfn-element';
 import { Fn } from './fn';
 

packages/@aws-cdk/cdk/lib/cloudformation/cfn-output.ts

@@ -1,4 +1,4 @@
-import { Construct } from '../core/construct';
+import { Construct } from '../construct';
 import { CfnElement } from './cfn-element';
 
 export interface CfnOutputProps {

packages/@aws-cdk/cdk/lib/cloudformation/cfn-parameter.ts

@@ -1,5 +1,5 @@
-import { Construct } from '../core/construct';
-import { Token } from '../core/tokens';
+import { Construct } from '../construct';
+import { Token } from '../token';
 import { CfnRefElement, Ref } from './cfn-element';
 
 export interface CfnParameterProps {

packages/@aws-cdk/cdk/lib/cloudformation/cfn-resource.ts

@@ -1,7 +1,7 @@
 import cxapi = require('@aws-cdk/cx-api');
-import { Construct, IConstruct } from '../core/construct';
-import { TagManager } from '../core/tag-manager';
-import { capitalizePropertyNames, ignoreEmpty, PostResolveToken } from '../core/util';
+import { Construct, IConstruct } from '../construct';
+import { TagManager } from '../tag-manager';
+import { capitalizePropertyNames, ignoreEmpty, PostResolveToken } from '../util';
 import { CfnCondition } from './cfn-condition';
 import { Reference } from './reference';
 import { CreationPolicy, DeletionPolicy, UpdatePolicy } from './resource-policy';

packages/@aws-cdk/cdk/lib/cloudformation/cfn-rule.ts

@@ -1,5 +1,5 @@
-import { Construct } from '../core/construct';
-import { capitalizePropertyNames } from '../core/util';
+import { Construct } from '../construct';
+import { capitalizePropertyNames } from '../util';
 import { ICfnConditionExpression } from './cfn-condition';
 import { CfnRefElement } from './cfn-element';
 

packages/@aws-cdk/cdk/lib/cloudformation/cloudformation-json.ts

@@ -1,6 +1,6 @@
-import { IConstruct } from "../core/construct";
-import { Token } from "../core/tokens";
-import { resolve } from "../core/tokens/resolve";
+import { IConstruct } from "../construct";
+import { resolve } from "../resolve";
+import { Token } from "../token";
 import { isIntrinsic } from "./instrinsics";
 
 /**

packages/@aws-cdk/cdk/lib/cloudformation/dynamic-reference.ts

@@ -1,5 +1,5 @@
-import { Construct } from "../core/construct";
-import { Token } from "../core/tokens";
+import { Construct } from "../construct";
+import { Token } from "../token";
 
 /**
  * Properties for a Dynamic Reference

packages/@aws-cdk/cdk/lib/cloudformation/fn.ts

@@ -1,5 +1,6 @@
-import { ResolveContext, Token, unresolved } from '../core/tokens';
-import { resolve } from '../core/tokens/resolve';
+import { resolve } from '../resolve';
+import { ResolveContext, Token } from '../token';
+import { unresolved } from '../unresolved';
 import { ICfnConditionExpression } from './cfn-condition';
 import { minimalCloudFormationJoin } from './instrinsics';
 

packages/@aws-cdk/cdk/lib/cloudformation/include.ts

@@ -1,4 +1,4 @@
-import { Construct } from '../core/construct';
+import { Construct } from '../construct';
 import { CfnElement } from './cfn-element';
 
 export interface IncludeProps {

packages/@aws-cdk/cdk/lib/cloudformation/instrinsics.ts

@@ -55,4 +55,4 @@ export function canEvaluateToList(x: any) {
   return isIntrinsic(x) && ['Ref', 'Fn::GetAtt', 'Fn::GetAZs', 'Fn::Split', 'Fn::FindInMap', 'Fn::ImportValue'].includes(Object.keys(x)[0]);
 }
 
-import { unresolved } from "../core/tokens/unresolved";
+import { unresolved } from "../unresolved";

packages/@aws-cdk/cdk/lib/cloudformation/pseudo.ts

@@ -1,5 +1,5 @@
-import { Construct } from '../core/construct';
-import { Token } from '../core/tokens';
+import { Construct } from '../construct';
+import { Token } from '../token';
 import { Reference } from './reference';
 
 /**

packages/@aws-cdk/cdk/lib/cloudformation/reference.ts

@@ -1,4 +1,4 @@
-import { ResolveContext, Token } from "../core/tokens";
+import { ResolveContext, Token } from "../token";
 
 /**
  * A Token that represents a CloudFormation reference to another resource
@@ -111,6 +111,6 @@ export class Reference extends Token {
 
 }
 
-import { Construct } from "../core/construct";
+import { Construct } from "../construct";
 import { CfnOutput } from "./cfn-output";
 import { Stack } from "./stack";

packages/@aws-cdk/cdk/lib/cloudformation/secret.ts

@@ -1,5 +1,5 @@
-import { Construct } from '../core/construct';
-import { Token } from '../core/tokens';
+import { Construct } from '../construct';
+import { Token } from '../token';
 import { CfnParameter } from './cfn-parameter';
 
 /**

packages/@aws-cdk/cdk/lib/cloudformation/stack.ts

@@ -1,6 +1,6 @@
 import cxapi = require('@aws-cdk/cx-api');
 import { App } from '../app';
-import { Construct, IConstruct, PATH_SEP } from '../core/construct';
+import { Construct, IConstruct, PATH_SEP } from '../construct';
 import { Environment } from '../environment';
 import { ISynthesisSession } from '../synthesis';
 import { CfnParameter } from './cfn-parameter';

packages/@aws-cdk/cdk/lib/core/construct.ts → packages/@aws-cdk/cdk/lib/construct.ts

@@ -1,10 +1,11 @@
 import cxapi = require('@aws-cdk/cx-api');
-import { IAspect } from '../aspect';
-import { CloudFormationJSON } from '../cloudformation/cloudformation-json';
-import { makeUniqueId } from '../uniqueid';
+import { IAspect } from './aspect';
+import { CloudFormationJSON } from './cloudformation/cloudformation-json';
 import { IDependable } from './dependency';
-import { Token, unresolved } from './tokens';
-import { resolve } from './tokens/resolve';
+import { resolve } from './resolve';
+import { Token } from './token';
+import { makeUniqueId } from './uniqueid';
+import { unresolved } from './unresolved';
 
 export const PATH_SEP = '/';
 
@@ -737,4 +738,4 @@ export interface Dependency {
 }
 
 // Import this _after_ everything else to help node work the classes out in the correct order...
-import { Stack } from '../cloudformation/stack';
+import { Stack } from './cloudformation/stack';

packages/@aws-cdk/cdk/lib/context.ts

@@ -1,5 +1,5 @@
 import cxapi = require('@aws-cdk/cx-api');
-import { Construct } from './core/construct';
+import { Construct } from './construct';
 
 type ContextProviderProps = {[key: string]: any};
 /**

packages/@aws-cdk/cdk/lib/index.ts

@@ -1,10 +1,11 @@
 export * from './aspect';
 export * from './tag-aspect';
 
-export * from './core/construct';
-export * from './core/tokens';
-export * from './core/tag-manager';
-export * from './core/dependency';
+export * from './construct';
+export * from './token';
+export * from './unresolved';
+export * from './tag-manager';
+export * from './dependency';
 
 export * from './cloudformation/cloudformation-json';
 export * from './cloudformation/reference';

packages/@aws-cdk/cdk/lib/core/tokens/resolve.ts → packages/@aws-cdk/cdk/lib/resolve.ts

@@ -1,4 +1,4 @@
-import { IConstruct } from '../construct';
+import { IConstruct } from './construct';
 import { containsListToken, TOKEN_MAP } from "./encoding";
 import { RESOLVE_OPTIONS } from "./options";
 import { isResolvedValuePostProcessor, RESOLVE_METHOD, ResolveContext, Token } from "./token";
@@ -153,4 +153,4 @@ export function findTokens(scope: IConstruct, fn: () => any): Token[] {
  */
 function isConstruct(x: any): boolean {
   return x._children !== undefined && x._metadata !== undefined;
-}
+}

packages/@aws-cdk/cdk/lib/runtime.ts

@@ -1,4 +1,4 @@
-import { Construct } from './core/construct';
+import { Construct } from './construct';
 
 // ----------------------------------------------------------------------
 // PROPERTY MAPPERS
@@ -388,4 +388,4 @@ function isCloudFormationIntrinsic(x: any) {
 // Cannot be public because JSII gets confused about es5.d.ts
 class CfnSynthesisError extends Error {
   public readonly type = 'CfnSynthesisError';
-}
+}

packages/@aws-cdk/cdk/lib/tag-aspect.ts

@@ -1,6 +1,6 @@
 import { IAspect } from './aspect';
 import { CfnResource, ITaggable } from './cloudformation/cfn-resource';
-import { IConstruct } from './core/construct';
+import { IConstruct } from './construct';
 
 /**
  * Properties for a tag

packages/@aws-cdk/cdk/lib/core/tag-manager.ts → packages/@aws-cdk/cdk/lib/tag-manager.ts

@@ -1,5 +1,5 @@
-import { TagType } from '../cloudformation/cfn-resource';
-import { CfnTag } from '../cloudformation/tag';
+import { TagType } from './cloudformation/cfn-resource';
+import { CfnTag } from './cloudformation/tag';
 
 interface Tag {
   key: string;

packages/@aws-cdk/cdk/lib/core/tokens/token.ts → packages/@aws-cdk/cdk/lib/token.ts

@@ -1,4 +1,4 @@
-import { IConstruct } from "../construct";
+import { IConstruct } from "./construct";
 import { TOKEN_MAP } from "./encoding";
 
 /**
@@ -147,4 +147,4 @@ export interface IResolvedValuePostProcessor {
  */
 export function isResolvedValuePostProcessor(x: any): x is IResolvedValuePostProcessor {
   return x.postProcess !== undefined;
-}
+}

packages/@aws-cdk/cdk/lib/uniqueid.ts

@@ -36,7 +36,7 @@ export function makeUniqueId(components: string[]) {
   }
 
   // Lazy require in order to break a module dependency cycle
-  const unresolvedTokens = components.filter(c => require('./core/tokens').unresolved(c));
+  const unresolvedTokens = components.filter(c => require('./unresolved').unresolved(c));
   if (unresolvedTokens.length > 0) {
     throw new Error(`ID components may not include unresolved tokens: ${unresolvedTokens.join(',')}`);
   }

packages/@aws-cdk/cdk/lib/core/util.ts → packages/@aws-cdk/cdk/lib/util.ts

@@ -1,5 +1,5 @@
 import { IConstruct } from "./construct";
-import { IResolvedValuePostProcessor, ResolveContext, Token } from "./tokens";
+import { IResolvedValuePostProcessor, ResolveContext, Token } from "./token";
 
 /**
  * Given an object, converts all keys to PascalCase given they are currently in camel case.
@@ -61,4 +61,4 @@ export class PostResolveToken extends Token implements IResolvedValuePostProcess
   public postProcess(o: any, _context: ResolveContext): any {
     return this.processor(o);
   }
-}
+}

packages/@aws-cdk/cdk/test/test.aspect.ts

@@ -1,6 +1,6 @@
 import { Test } from 'nodeunit';
 import { IAspect } from '../lib/aspect';
-import { IConstruct, Root } from '../lib/core/construct';
+import { IConstruct, Root } from '../lib/construct';
 
 class MyConstruct extends Root {
   public static IsMyConstruct(x: any): x is MyConstruct {

packages/@aws-cdk/cdk/test/core/test.construct.ts → packages/@aws-cdk/cdk/test/test.construct.ts

@@ -1,6 +1,6 @@
 import cxapi = require('@aws-cdk/cx-api');
 import { Test } from 'nodeunit';
-import { ArnComponents, Construct, ConstructOrder, Root, Stack, Token } from '../../lib';
+import { ArnComponents, Construct, ConstructOrder, Root, Stack, Token } from '../lib';
 
 // tslint:disable:variable-name
 // tslint:disable:max-line-length

packages/@aws-cdk/cdk/test/core/test.tag-manager.ts → packages/@aws-cdk/cdk/test/test.tag-manager.ts

@@ -1,6 +1,6 @@
 import { Test } from 'nodeunit';
-import { TagType } from '../../lib/cloudformation/cfn-resource';
-import { TagManager } from '../../lib/core/tag-manager';
+import { TagType } from '../lib/cloudformation/cfn-resource';
+import { TagManager } from '../lib/tag-manager';
 
 export = {
   '#setTag() supports setting a tag regardless of Type'(test: Test) {

packages/@aws-cdk/cdk/test/core/test.tokens.ts → packages/@aws-cdk/cdk/test/test.tokens.ts

@@ -1,6 +1,6 @@
 import { Test } from 'nodeunit';
-import { Fn, Root, Token, unresolved } from '../../lib';
-import { evaluateCFN } from '../cloudformation/evaluate-cfn';
+import { Fn, Root, Token, unresolved } from '../lib';
+import { evaluateCFN } from './cloudformation/evaluate-cfn';
 
 export = {
   'resolve a plain old object should just return the object'(test: Test) {
@@ -435,4 +435,4 @@ function tokensThatResolveTo(value: string): Token[] {
  */
 function resolve(x: any) {
   return new Root().node.resolve(x);
-}
+}

packages/@aws-cdk/cdk/test/core/test.util.ts → packages/@aws-cdk/cdk/test/test.util.ts

@@ -1,6 +1,6 @@
 import { Test } from 'nodeunit';
-import { Root } from '../../lib';
-import { capitalizePropertyNames, ignoreEmpty } from '../../lib/core/util';
+import { Root } from '../lib';
+import { capitalizePropertyNames, ignoreEmpty } from '../lib/util';
 
 export = {
   'capitalizeResourceProperties capitalizes all keys of an object (recursively) from camelCase to PascalCase'(test: Test) {