diff --git a/packages/@aws-cdk/cdk/lib/app.ts b/packages/@aws-cdk/cdk/lib/app.ts
index fb9a73b53bc62..ea7a2057a2ef7 100644
--- a/packages/@aws-cdk/cdk/lib/app.ts
+++ b/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';
 
 /**
diff --git a/packages/@aws-cdk/cdk/lib/aspect.ts b/packages/@aws-cdk/cdk/lib/aspect.ts
index ca6b38798e811..c6382e132cfdf 100644
--- a/packages/@aws-cdk/cdk/lib/aspect.ts
+++ b/packages/@aws-cdk/cdk/lib/aspect.ts
@@ -1,4 +1,4 @@
-import { IConstruct } from './core/construct';
+import { IConstruct } from './construct';
 
 /**
  * Represents an Aspect
diff --git a/packages/@aws-cdk/cdk/lib/core/tokens/cfn-concat.ts b/packages/@aws-cdk/cdk/lib/cfn-concat.ts
similarity index 91%
rename from packages/@aws-cdk/cdk/lib/core/tokens/cfn-concat.ts
rename to packages/@aws-cdk/cdk/lib/cfn-concat.ts
index f454521bce255..157ca1f4d6348 100644
--- a/packages/@aws-cdk/cdk/lib/core/tokens/cfn-concat.ts
+++ b/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";
\ No newline at end of file
+import { minimalCloudFormationJoin } from "./cloudformation/instrinsics";
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/arn.ts b/packages/@aws-cdk/cdk/lib/cloudformation/arn.ts
index 7bffa08d2da3f..92c88a12f9989 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/arn.ts
+++ b/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';
 
 /**
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-condition.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-condition.ts
index 91fe0a2471003..2e6cc3e4e8037 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-condition.ts
+++ b/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 {
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-element.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-element.ts
index aaabdef5ed08b..8a818b99a91ef 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-element.ts
+++ b/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";
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-mapping.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-mapping.ts
index 01db04b26f71f..7d7a6cf68c9cf 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-mapping.ts
+++ b/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';
 
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-output.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-output.ts
index 9848879a70aba..08edf82c89c14 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-output.ts
+++ b/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 {
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-parameter.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-parameter.ts
index d64b99f789c29..38ba93163582d 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-parameter.ts
+++ b/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 {
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-resource.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-resource.ts
index fb11d9e4edf51..c4f8e45af0114 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-resource.ts
+++ b/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';
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-rule.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-rule.ts
index 2cb3fd533916d..907f57a2abce9 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-rule.ts
+++ b/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';
 
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cloudformation-json.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cloudformation-json.ts
index 62d5333397f49..711d3be2181f1 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/cloudformation-json.ts
+++ b/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";
 
 /**
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/dynamic-reference.ts b/packages/@aws-cdk/cdk/lib/cloudformation/dynamic-reference.ts
index f3bccf0a78a41..bbc5b8573ff28 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/dynamic-reference.ts
+++ b/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
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/fn.ts b/packages/@aws-cdk/cdk/lib/cloudformation/fn.ts
index 2b4112f492ffa..877491dd2a351 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/fn.ts
+++ b/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';
 
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/include.ts b/packages/@aws-cdk/cdk/lib/cloudformation/include.ts
index e493121209801..a2fe0346f4675 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/include.ts
+++ b/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 {
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/instrinsics.ts b/packages/@aws-cdk/cdk/lib/cloudformation/instrinsics.ts
index 58356f3061a58..5adf61fcc7a01 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/instrinsics.ts
+++ b/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";
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/pseudo.ts b/packages/@aws-cdk/cdk/lib/cloudformation/pseudo.ts
index 5f647405aba92..5d3166c9b7a6b 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/pseudo.ts
+++ b/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';
 
 /**
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/reference.ts b/packages/@aws-cdk/cdk/lib/cloudformation/reference.ts
index 3edc4f846483a..73db649ae087c 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/reference.ts
+++ b/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";
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/secret.ts b/packages/@aws-cdk/cdk/lib/cloudformation/secret.ts
index 923bceb6765e2..12fde7821f181 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/secret.ts
+++ b/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';
 
 /**
diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/stack.ts b/packages/@aws-cdk/cdk/lib/cloudformation/stack.ts
index 3819526f9f51d..b7bee1fd0ae60 100644
--- a/packages/@aws-cdk/cdk/lib/cloudformation/stack.ts
+++ b/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';
diff --git a/packages/@aws-cdk/cdk/lib/core/construct.ts b/packages/@aws-cdk/cdk/lib/construct.ts
similarity index 98%
rename from packages/@aws-cdk/cdk/lib/core/construct.ts
rename to packages/@aws-cdk/cdk/lib/construct.ts
index 3ceff32240639..b8585087d6443 100644
--- a/packages/@aws-cdk/cdk/lib/core/construct.ts
+++ b/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';
diff --git a/packages/@aws-cdk/cdk/lib/context.ts b/packages/@aws-cdk/cdk/lib/context.ts
index c31ae244f9cc2..9ced8ea2a6bda 100644
--- a/packages/@aws-cdk/cdk/lib/context.ts
+++ b/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};
 /**
diff --git a/packages/@aws-cdk/cdk/lib/core/tokens/index.ts b/packages/@aws-cdk/cdk/lib/core/tokens/index.ts
deleted file mode 100644
index af82e0f1c238c..0000000000000
--- a/packages/@aws-cdk/cdk/lib/core/tokens/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This exports the modules that should be publicly available (not all of them)
-
-export * from './token';
-export * from './unresolved';
\ No newline at end of file
diff --git a/packages/@aws-cdk/cdk/lib/core/dependency.ts b/packages/@aws-cdk/cdk/lib/dependency.ts
similarity index 100%
rename from packages/@aws-cdk/cdk/lib/core/dependency.ts
rename to packages/@aws-cdk/cdk/lib/dependency.ts
diff --git a/packages/@aws-cdk/cdk/lib/core/tokens/encoding.ts b/packages/@aws-cdk/cdk/lib/encoding.ts
similarity index 100%
rename from packages/@aws-cdk/cdk/lib/core/tokens/encoding.ts
rename to packages/@aws-cdk/cdk/lib/encoding.ts
diff --git a/packages/@aws-cdk/cdk/lib/index.ts b/packages/@aws-cdk/cdk/lib/index.ts
index 11dde15913437..8eae746e92331 100644
--- a/packages/@aws-cdk/cdk/lib/index.ts
+++ b/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';
diff --git a/packages/@aws-cdk/cdk/lib/core/tokens/options.ts b/packages/@aws-cdk/cdk/lib/options.ts
similarity index 100%
rename from packages/@aws-cdk/cdk/lib/core/tokens/options.ts
rename to packages/@aws-cdk/cdk/lib/options.ts
diff --git a/packages/@aws-cdk/cdk/lib/core/tokens/resolve.ts b/packages/@aws-cdk/cdk/lib/resolve.ts
similarity index 98%
rename from packages/@aws-cdk/cdk/lib/core/tokens/resolve.ts
rename to packages/@aws-cdk/cdk/lib/resolve.ts
index af19bb0cc9489..a8a4582274a7e 100644
--- a/packages/@aws-cdk/cdk/lib/core/tokens/resolve.ts
+++ b/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;
-}
\ No newline at end of file
+}
diff --git a/packages/@aws-cdk/cdk/lib/runtime.ts b/packages/@aws-cdk/cdk/lib/runtime.ts
index 00d55a2cdcfbe..56e2aec98595b 100644
--- a/packages/@aws-cdk/cdk/lib/runtime.ts
+++ b/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';
-}
\ No newline at end of file
+}
diff --git a/packages/@aws-cdk/cdk/lib/tag-aspect.ts b/packages/@aws-cdk/cdk/lib/tag-aspect.ts
index 48882888577dc..a78b5df515936 100644
--- a/packages/@aws-cdk/cdk/lib/tag-aspect.ts
+++ b/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
diff --git a/packages/@aws-cdk/cdk/lib/core/tag-manager.ts b/packages/@aws-cdk/cdk/lib/tag-manager.ts
similarity index 98%
rename from packages/@aws-cdk/cdk/lib/core/tag-manager.ts
rename to packages/@aws-cdk/cdk/lib/tag-manager.ts
index a0c6a91f9a327..832cb21aa763a 100644
--- a/packages/@aws-cdk/cdk/lib/core/tag-manager.ts
+++ b/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;
diff --git a/packages/@aws-cdk/cdk/lib/core/tokens/token.ts b/packages/@aws-cdk/cdk/lib/token.ts
similarity index 99%
rename from packages/@aws-cdk/cdk/lib/core/tokens/token.ts
rename to packages/@aws-cdk/cdk/lib/token.ts
index a99ef11a194b8..232bd92f1ec97 100644
--- a/packages/@aws-cdk/cdk/lib/core/tokens/token.ts
+++ b/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;
-}
\ No newline at end of file
+}
diff --git a/packages/@aws-cdk/cdk/lib/uniqueid.ts b/packages/@aws-cdk/cdk/lib/uniqueid.ts
index 987455c81c397..13942f4817b8b 100644
--- a/packages/@aws-cdk/cdk/lib/uniqueid.ts
+++ b/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(',')}`);
   }
diff --git a/packages/@aws-cdk/cdk/lib/core/tokens/unresolved.ts b/packages/@aws-cdk/cdk/lib/unresolved.ts
similarity index 100%
rename from packages/@aws-cdk/cdk/lib/core/tokens/unresolved.ts
rename to packages/@aws-cdk/cdk/lib/unresolved.ts
diff --git a/packages/@aws-cdk/cdk/lib/core/util.ts b/packages/@aws-cdk/cdk/lib/util.ts
similarity index 98%
rename from packages/@aws-cdk/cdk/lib/core/util.ts
rename to packages/@aws-cdk/cdk/lib/util.ts
index 9f13df13aad78..941b14d8c1e8a 100644
--- a/packages/@aws-cdk/cdk/lib/core/util.ts
+++ b/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);
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@aws-cdk/cdk/test/test.aspect.ts b/packages/@aws-cdk/cdk/test/test.aspect.ts
index d3aa7fe8c302b..9566213de8968 100644
--- a/packages/@aws-cdk/cdk/test/test.aspect.ts
+++ b/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 {
diff --git a/packages/@aws-cdk/cdk/test/core/test.construct.ts b/packages/@aws-cdk/cdk/test/test.construct.ts
similarity index 99%
rename from packages/@aws-cdk/cdk/test/core/test.construct.ts
rename to packages/@aws-cdk/cdk/test/test.construct.ts
index a711efa001360..1a03a5d26165f 100644
--- a/packages/@aws-cdk/cdk/test/core/test.construct.ts
+++ b/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
diff --git a/packages/@aws-cdk/cdk/test/core/test.tag-manager.ts b/packages/@aws-cdk/cdk/test/test.tag-manager.ts
similarity index 96%
rename from packages/@aws-cdk/cdk/test/core/test.tag-manager.ts
rename to packages/@aws-cdk/cdk/test/test.tag-manager.ts
index c4e1b59ce8e12..1f092c9f08b80 100644
--- a/packages/@aws-cdk/cdk/test/core/test.tag-manager.ts
+++ b/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) {
diff --git a/packages/@aws-cdk/cdk/test/core/test.tokens.ts b/packages/@aws-cdk/cdk/test/test.tokens.ts
similarity index 98%
rename from packages/@aws-cdk/cdk/test/core/test.tokens.ts
rename to packages/@aws-cdk/cdk/test/test.tokens.ts
index 17bb584166bba..437e36f7f2bfc 100644
--- a/packages/@aws-cdk/cdk/test/core/test.tokens.ts
+++ b/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);
-}
\ No newline at end of file
+}
diff --git a/packages/@aws-cdk/cdk/test/core/test.util.ts b/packages/@aws-cdk/cdk/test/test.util.ts
similarity index 96%
rename from packages/@aws-cdk/cdk/test/core/test.util.ts
rename to packages/@aws-cdk/cdk/test/test.util.ts
index 22cb7416e96a0..98e9b24f5b775 100644
--- a/packages/@aws-cdk/cdk/test/core/test.util.ts
+++ b/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) {