diff --git a/api.json b/api.json
index 7bd07e492e..a9795133a4 100644
--- a/api.json
+++ b/api.json
@@ -8,7 +8,7 @@
     "(function(){%output%})();"
   ],
 
-  "inputs": "src/ol.export.js",
+  "inputs": "exports/ol.js",
   "paths": [
     "src"
   ],
diff --git a/src/ol.export.js b/exports/ol.js
similarity index 88%
rename from src/ol.export.js
rename to exports/ol.js
index 48f5786f8f..73315a2b6c 100644
--- a/src/ol.export.js
+++ b/exports/ol.js
@@ -1,4 +1,34 @@
-goog.require("ol");
+goog.require('ol.base');
+goog.require('ol.bounds');
+goog.require('ol.control.Attribution');
+goog.require('ol.control.Navigation');
+goog.require('ol.control.Zoom');
+goog.require('ol.event.Events');
+goog.require('ol.event.Scroll');
+goog.require('ol.handler.Drag');
+goog.require("ol.map");
+goog.require("ol.loc");
+goog.require("ol.feature");
+goog.require("ol.projection");
+goog.require("ol.layer.xyz");
+goog.require("ol.layer.osm");
+goog.require("ol.layer.wms");
+goog.require("ol.popup");
+goog.require("ol.Tile");
+goog.require("ol.TileSet");
+goog.require("ol.TileCache");
+goog.require("ol.geom.geometry");
+goog.require("ol.geom.point");
+goog.require("ol.geom.multipoint");
+goog.require("ol.geom.linestring");
+goog.require("ol.geom.multilinestring");
+goog.require("ol.geom.collection");
+goog.require('ol.layer.XYZ');
+goog.require('ol.layer.OSM');
+goog.require('ol.layer.WMS');
+goog.require('ol.renderer.Composite');
+goog.require('ol.renderer.TileLayerRenderer');
+goog.require('ol.renderer.WebGL');
 
 // ol.map
 goog.exportSymbol('ol.map', ol.map );
diff --git a/main.json b/main.json
index 5e5a6efe1f..b996fd6bbf 100644
--- a/main.json
+++ b/main.json
@@ -2,8 +2,7 @@
   "id": "ol",
 
   "inputs": [
-    "src/ol.js",
-    "src/ol.export.js"
+    "exports/ol.js"
   ],
   "paths": [
     "src"
diff --git a/src/ol.js b/src/ol.js
deleted file mode 100644
index f85b363567..0000000000
--- a/src/ol.js
+++ /dev/null
@@ -1,33 +0,0 @@
-goog.provide("ol");
-
-goog.require('ol.base');
-goog.require('ol.bounds');
-goog.require('ol.control.Attribution');
-goog.require('ol.control.Navigation');
-goog.require('ol.control.Zoom');
-goog.require('ol.event.Drag');
-goog.require('ol.event.Events');
-goog.require('ol.event.Scroll');
-goog.require("ol.map");
-goog.require("ol.loc");
-goog.require("ol.feature");
-goog.require("ol.projection");
-goog.require("ol.layer.xyz");
-goog.require("ol.layer.osm");
-goog.require("ol.layer.wms");
-goog.require("ol.popup");
-goog.require("ol.Tile");
-goog.require("ol.TileSet");
-goog.require("ol.TileCache");
-goog.require("ol.geom.geometry");
-goog.require("ol.geom.point");
-goog.require("ol.geom.multipoint");
-goog.require("ol.geom.linestring");
-goog.require("ol.geom.multilinestring");
-goog.require("ol.geom.collection");
-goog.require('ol.layer.XYZ');
-goog.require('ol.layer.OSM');
-goog.require('ol.layer.WMS');
-goog.require('ol.renderer.Composite');
-goog.require('ol.renderer.TileLayerRenderer');
-goog.require('ol.renderer.WebGL');