diff --git a/src/ol3/base/array.js b/src/ol3/array.js
similarity index 100%
rename from src/ol3/base/array.js
rename to src/ol3/array.js
diff --git a/src/ol3/base/array_test.js b/src/ol3/array_test.js
similarity index 100%
rename from src/ol3/base/array_test.js
rename to src/ol3/array_test.js
diff --git a/src/ol3/base/attribution.js b/src/ol3/attribution.js
similarity index 100%
rename from src/ol3/base/attribution.js
rename to src/ol3/attribution.js
diff --git a/src/ol3/tile/bingmaps.js b/src/ol3/bingmaps.js
similarity index 100%
rename from src/ol3/tile/bingmaps.js
rename to src/ol3/bingmaps.js
diff --git a/src/ol3/base/collection.js b/src/ol3/collection.js
similarity index 100%
rename from src/ol3/base/collection.js
rename to src/ol3/collection.js
diff --git a/src/ol3/base/collection_test.js b/src/ol3/collection_test.js
similarity index 100%
rename from src/ol3/base/collection_test.js
rename to src/ol3/collection_test.js
diff --git a/src/ol3/base/color.js b/src/ol3/color.js
similarity index 100%
rename from src/ol3/base/color.js
rename to src/ol3/color.js
diff --git a/src/ol3/base/coordinate.js b/src/ol3/coordinate.js
similarity index 100%
rename from src/ol3/base/coordinate.js
rename to src/ol3/coordinate.js
diff --git a/src/ol3/base/coordinateformat.js b/src/ol3/coordinateformat.js
similarity index 100%
rename from src/ol3/base/coordinateformat.js
rename to src/ol3/coordinateformat.js
diff --git a/src/ol3/base/coveragearea.js b/src/ol3/coveragearea.js
similarity index 100%
rename from src/ol3/base/coveragearea.js
rename to src/ol3/coveragearea.js
diff --git a/src/ol3/base/createmap.js b/src/ol3/createmap.js
similarity index 100%
rename from src/ol3/base/createmap.js
rename to src/ol3/createmap.js
diff --git a/src/ol3/base/extent.js b/src/ol3/extent.js
similarity index 100%
rename from src/ol3/base/extent.js
rename to src/ol3/extent.js
diff --git a/src/ol3/base/extent_test.js b/src/ol3/extent_test.js
similarity index 100%
rename from src/ol3/base/extent_test.js
rename to src/ol3/extent_test.js
diff --git a/src/ol3/base/layer.js b/src/ol3/layer.js
similarity index 100%
rename from src/ol3/base/layer.js
rename to src/ol3/layer.js
diff --git a/src/ol3/base/layerrenderer.js b/src/ol3/layerrenderer.js
similarity index 100%
rename from src/ol3/base/layerrenderer.js
rename to src/ol3/layerrenderer.js
diff --git a/src/ol3/base/map.js b/src/ol3/map.js
similarity index 100%
rename from src/ol3/base/map.js
rename to src/ol3/map.js
diff --git a/src/ol3/base/mapbrowserevent.js b/src/ol3/mapbrowserevent.js
similarity index 100%
rename from src/ol3/base/mapbrowserevent.js
rename to src/ol3/mapbrowserevent.js
diff --git a/src/ol3/base/mapevent.js b/src/ol3/mapevent.js
similarity index 100%
rename from src/ol3/base/mapevent.js
rename to src/ol3/mapevent.js
diff --git a/src/ol3/tile/mapquest.js b/src/ol3/mapquest.js
similarity index 100%
rename from src/ol3/tile/mapquest.js
rename to src/ol3/mapquest.js
diff --git a/src/ol3/base/maprenderer.js b/src/ol3/maprenderer.js
similarity index 100%
rename from src/ol3/base/maprenderer.js
rename to src/ol3/maprenderer.js
diff --git a/src/ol3/base/object.js b/src/ol3/object.js
similarity index 100%
rename from src/ol3/base/object.js
rename to src/ol3/object.js
diff --git a/src/ol3/base/object_test.js b/src/ol3/object_test.js
similarity index 100%
rename from src/ol3/base/object_test.js
rename to src/ol3/object_test.js
diff --git a/src/ol3/base/ol.js b/src/ol3/ol.js
similarity index 100%
rename from src/ol3/base/ol.js
rename to src/ol3/ol.js
diff --git a/src/ol3/tile/openstreetmap.js b/src/ol3/openstreetmap.js
similarity index 100%
rename from src/ol3/tile/openstreetmap.js
rename to src/ol3/openstreetmap.js
diff --git a/src/ol3/base/pixel.js b/src/ol3/pixel.js
similarity index 100%
rename from src/ol3/base/pixel.js
rename to src/ol3/pixel.js
diff --git a/src/ol3/base/pixelbounds.js b/src/ol3/pixelbounds.js
similarity index 100%
rename from src/ol3/base/pixelbounds.js
rename to src/ol3/pixelbounds.js
diff --git a/src/ol3/base/projection.js b/src/ol3/projection.js
similarity index 100%
rename from src/ol3/base/projection.js
rename to src/ol3/projection.js
diff --git a/src/ol3/base/projection_test.js b/src/ol3/projection_test.js
similarity index 100%
rename from src/ol3/base/projection_test.js
rename to src/ol3/projection_test.js
diff --git a/src/ol3/base/rectangle.js b/src/ol3/rectangle.js
similarity index 100%
rename from src/ol3/base/rectangle.js
rename to src/ol3/rectangle.js
diff --git a/src/ol3/base/rectangle_test.js b/src/ol3/rectangle_test.js
similarity index 100%
rename from src/ol3/base/rectangle_test.js
rename to src/ol3/rectangle_test.js
diff --git a/src/ol3/base/size.js b/src/ol3/size.js
similarity index 100%
rename from src/ol3/base/size.js
rename to src/ol3/size.js
diff --git a/src/ol3/tile/stamen.js b/src/ol3/stamen.js
similarity index 100%
rename from src/ol3/tile/stamen.js
rename to src/ol3/stamen.js
diff --git a/src/ol3/base/store.js b/src/ol3/store.js
similarity index 100%
rename from src/ol3/base/store.js
rename to src/ol3/store.js
diff --git a/src/ol3/tile/tile.js b/src/ol3/tile.js
similarity index 100%
rename from src/ol3/tile/tile.js
rename to src/ol3/tile.js
diff --git a/src/ol3/tile/tilebounds.js b/src/ol3/tilebounds.js
similarity index 100%
rename from src/ol3/tile/tilebounds.js
rename to src/ol3/tilebounds.js
diff --git a/src/ol3/tile/tilebounds_test.js b/src/ol3/tilebounds_test.js
similarity index 100%
rename from src/ol3/tile/tilebounds_test.js
rename to src/ol3/tilebounds_test.js
diff --git a/src/ol3/tile/tilecoord.js b/src/ol3/tilecoord.js
similarity index 100%
rename from src/ol3/tile/tilecoord.js
rename to src/ol3/tilecoord.js
diff --git a/src/ol3/tile/tilecoord_test.js b/src/ol3/tilecoord_test.js
similarity index 100%
rename from src/ol3/tile/tilecoord_test.js
rename to src/ol3/tilecoord_test.js
diff --git a/src/ol3/tile/tilecoveragearea.js b/src/ol3/tilecoveragearea.js
similarity index 100%
rename from src/ol3/tile/tilecoveragearea.js
rename to src/ol3/tilecoveragearea.js
diff --git a/src/ol3/tile/tilegrid.js b/src/ol3/tilegrid.js
similarity index 100%
rename from src/ol3/tile/tilegrid.js
rename to src/ol3/tilegrid.js
diff --git a/src/ol3/tile/tilegrid_test.js b/src/ol3/tilegrid_test.js
similarity index 100%
rename from src/ol3/tile/tilegrid_test.js
rename to src/ol3/tilegrid_test.js
diff --git a/src/ol3/tile/tilejson.js b/src/ol3/tilejson.js
similarity index 100%
rename from src/ol3/tile/tilejson.js
rename to src/ol3/tilejson.js
diff --git a/src/ol3/tile/tilelayer.js b/src/ol3/tilelayer.js
similarity index 100%
rename from src/ol3/tile/tilelayer.js
rename to src/ol3/tilelayer.js
diff --git a/src/ol3/tile/tilestore.js b/src/ol3/tilestore.js
similarity index 100%
rename from src/ol3/tile/tilestore.js
rename to src/ol3/tilestore.js
diff --git a/src/ol3/tile/tileurlfunction.js b/src/ol3/tileurlfunction.js
similarity index 100%
rename from src/ol3/tile/tileurlfunction.js
rename to src/ol3/tileurlfunction.js
diff --git a/src/ol3/tile/tileurlfunction_test.js b/src/ol3/tileurlfunction_test.js
similarity index 100%
rename from src/ol3/tile/tileurlfunction_test.js
rename to src/ol3/tileurlfunction_test.js
diff --git a/src/ol3/base/transformfunction.js b/src/ol3/transformfunction.js
similarity index 100%
rename from src/ol3/base/transformfunction.js
rename to src/ol3/transformfunction.js
diff --git a/src/ol3/tile/xyz.js b/src/ol3/xyz.js
similarity index 100%
rename from src/ol3/tile/xyz.js
rename to src/ol3/xyz.js
diff --git a/src/ol3/tile/xyz_test.js b/src/ol3/xyz_test.js
similarity index 100%
rename from src/ol3/tile/xyz_test.js
rename to src/ol3/xyz_test.js