diff --git a/src/ol/ellipsoid.js b/src/ol/ellipsoid/ellipsoid.js
similarity index 100%
rename from src/ol/ellipsoid.js
rename to src/ol/ellipsoid/ellipsoid.js
diff --git a/src/ol/projection.exports b/src/ol/projection/projection.exports
similarity index 100%
rename from src/ol/projection.exports
rename to src/ol/projection/projection.exports
diff --git a/src/ol/projection.js b/src/ol/projection/projection.js
similarity index 100%
rename from src/ol/projection.js
rename to src/ol/projection/projection.js
diff --git a/src/ol/sphere.js b/src/ol/sphere/sphere.js
similarity index 100%
rename from src/ol/sphere.js
rename to src/ol/sphere/sphere.js
diff --git a/test/spec/ol/ellipsoid.test.js b/test/spec/ol/ellipsoid/ellipsoid.test.js
similarity index 100%
rename from test/spec/ol/ellipsoid.test.js
rename to test/spec/ol/ellipsoid/ellipsoid.test.js
diff --git a/test/spec/ol/projection.epsg3857.test.js b/test/spec/ol/projection/projection.epsg3857.test.js
similarity index 100%
rename from test/spec/ol/projection.epsg3857.test.js
rename to test/spec/ol/projection/projection.epsg3857.test.js
diff --git a/test/spec/ol/projection.test.js b/test/spec/ol/projection/projection.test.js
similarity index 100%
rename from test/spec/ol/projection.test.js
rename to test/spec/ol/projection/projection.test.js
diff --git a/test/spec/ol/sphere.test.js b/test/spec/ol/sphere/sphere.test.js
similarity index 100%
rename from test/spec/ol/sphere.test.js
rename to test/spec/ol/sphere/sphere.test.js
diff --git a/test/spec/ol/lrucache.test.js b/test/spec/ol/structs/lrucache.test.js
similarity index 100%
rename from test/spec/ol/lrucache.test.js
rename to test/spec/ol/structs/lrucache.test.js
diff --git a/test/spec/ol/tilegrid.test.js b/test/spec/ol/tilegrid/tilegrid.test.js
similarity index 100%
rename from test/spec/ol/tilegrid.test.js
rename to test/spec/ol/tilegrid/tilegrid.test.js
diff --git a/test/spec/ol/xyztilegrid.test.js b/test/spec/ol/tilegrid/xyztilegrid.test.js
similarity index 100%
rename from test/spec/ol/xyztilegrid.test.js
rename to test/spec/ol/tilegrid/xyztilegrid.test.js