diff --git a/src/core/build.ts b/src/cli/build.ts
similarity index 90%
rename from src/core/build.ts
rename to src/cli/build.ts
index 475b928..2c75d8b 100644
--- a/src/core/build.ts
+++ b/src/cli/build.ts
@@ -2,9 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
-import create_compilers from './create_compilers.js';
-import create_app from './create_app.js';
-import create_assets from './create_assets.js';
+import { create_compilers, create_app, create_assets } from 'sapper/core.js';
 
 export default function build({
 	src,
diff --git a/src/core/export.ts b/src/cli/export.ts
similarity index 96%
rename from src/core/export.ts
rename to src/cli/export.ts
index a285bdd..b67873b 100644
--- a/src/core/export.ts
+++ b/src/cli/export.ts
@@ -4,8 +4,7 @@ import express from 'express';
 import cheerio from 'cheerio';
 import fetch from 'node-fetch';
 import URL from 'url-parse';
-import create_assets from './create_assets.js';
-// import middleware from '../middleware/index.js';
+import { create_assets } from 'sapper/core.js';
 
 const { PORT = 3000, OUTPUT_DIR = 'dist' } = process.env;
 
diff --git a/src/cli/index.ts b/src/cli/index.ts
index 5a38926..2575a94 100755
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -1,4 +1,5 @@
-import { build, export as exporter } from 'sapper/core.js';
+import build from './build.js';
+import exporter from './export.js';
 import { dest, entry, isDev, src } from '../config';
 
 process.env.NODE_ENV = 'production';
diff --git a/src/core/index.ts b/src/core/index.ts
index b557348..66ed3cd 100644
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -1,8 +1,5 @@
 import { create_templates, render, stream } from './templates'; // TODO templates is an anomaly... fix post-#91
 
-export { default as build } from './build';
-export { default as export } from './export.js';
-
 export { default as create_app } from './create_app';
 export { default as create_assets } from './create_assets';
 export { default as create_compilers } from './create_compilers';