diff --git a/Makefile b/Makefile
index edd10287c4..19386649c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,4 @@
 PLOVR_JAR=bin/plovr-4b3caf2b7d84.jar
-GSLINT_EXCLUDES= \
-	src/api/bounds.js \
-	src/api/feature.js \
-	src/api/geom/collection.js \
-	src/api/geom/geometry.js \
-	src/api/geom/linestring.js \
-	src/api/geom/multilinestring.js \
-	src/api/geom/multipoint.js \
-	src/api/geom/point.js \
-	src/api/layer/osm.js \
-	src/api/layer/wms.js \
-	src/api/layer/xyz.js \
-	src/api/loc.js \
-	src/api/map.js \
-	src/api/popup.js \
-	src/api/projection.js \
-	src/ol/base.js \
-	src/ol/control/Attribution.js \
-	src/ol/control/Control.js \
-	src/ol/control/Navigation.js \
-	src/ol/control/Zoom.js \
-	src/ol/event/Drag.js \
-	src/ol/event/Events.js \
-	src/ol/event/ISequence.js \
-	src/ol/event/Scroll.js \
-	src/ol/Feature.js \
-	src/ol/geom/Collection.js \
-	src/ol/geom/Geometry.js \
-	src/ol/geom/IGeometry.js \
-	src/ol/geom/LineString.js \
-	src/ol/geom/MultiLineString.js \
-	src/ol/geom/MultiPoint.js \
-	src/ol/geom/Point.js \
-	src/ol/handler/Drag.js \
-	src/ol/layer/WMS.js \
-	src/ol/Popup.js \
-	src/ol/renderer/Composite.js \
-	src/ol/renderer/LayerRenderer.js \
-	src/ol/renderer/MapRenderer.js \
-	src/ol/renderer/TileLayerRenderer.js
 comma := ,
 empty :=
 space := $(empty) $(empty)
@@ -85,7 +45,7 @@ serve: $(PLOVR_JAR)
 
 .PHONY: lint
 lint:
-	gjslint --strict --limited_doc_files=$(subst $(space),$(comma),$(shell find externs -name \*.js)) $(filter-out $(GSLINT_EXCLUDES),$(shell find externs src -name \*.js)) skeleton.js
+	gjslint --strict --limited_doc_files=$(subst $(space),$(comma),$(shell find externs -name \*.js)) $(shell find externs src/ol -name \*.js) skeleton.js
 
 webgl-debug.js:
 	curl https://cvs.khronos.org/svn/repos/registry/trunk/public/webgl/sdk/debug/webgl-debug.js > $@
diff --git a/src/api/bounds.js b/src/attic/api/bounds.js
similarity index 100%
rename from src/api/bounds.js
rename to src/attic/api/bounds.js
diff --git a/src/api/feature.js b/src/attic/api/feature.js
similarity index 100%
rename from src/api/feature.js
rename to src/attic/api/feature.js
diff --git a/src/api/geom/collection.js b/src/attic/api/geom/collection.js
similarity index 100%
rename from src/api/geom/collection.js
rename to src/attic/api/geom/collection.js
diff --git a/src/api/geom/geometry.js b/src/attic/api/geom/geometry.js
similarity index 100%
rename from src/api/geom/geometry.js
rename to src/attic/api/geom/geometry.js
diff --git a/src/api/geom/linestring.js b/src/attic/api/geom/linestring.js
similarity index 100%
rename from src/api/geom/linestring.js
rename to src/attic/api/geom/linestring.js
diff --git a/src/api/geom/multilinestring.js b/src/attic/api/geom/multilinestring.js
similarity index 100%
rename from src/api/geom/multilinestring.js
rename to src/attic/api/geom/multilinestring.js
diff --git a/src/api/geom/multipoint.js b/src/attic/api/geom/multipoint.js
similarity index 100%
rename from src/api/geom/multipoint.js
rename to src/attic/api/geom/multipoint.js
diff --git a/src/api/geom/point.js b/src/attic/api/geom/point.js
similarity index 100%
rename from src/api/geom/point.js
rename to src/attic/api/geom/point.js
diff --git a/src/api/layer/osm.js b/src/attic/api/layer/osm.js
similarity index 100%
rename from src/api/layer/osm.js
rename to src/attic/api/layer/osm.js
diff --git a/src/api/layer/wms.js b/src/attic/api/layer/wms.js
similarity index 100%
rename from src/api/layer/wms.js
rename to src/attic/api/layer/wms.js
diff --git a/src/api/layer/xyz.js b/src/attic/api/layer/xyz.js
similarity index 100%
rename from src/api/layer/xyz.js
rename to src/attic/api/layer/xyz.js
diff --git a/src/api/loc.js b/src/attic/api/loc.js
similarity index 100%
rename from src/api/loc.js
rename to src/attic/api/loc.js
diff --git a/src/api/map.js b/src/attic/api/map.js
similarity index 100%
rename from src/api/map.js
rename to src/attic/api/map.js
diff --git a/src/api/popup.js b/src/attic/api/popup.js
similarity index 100%
rename from src/api/popup.js
rename to src/attic/api/popup.js
diff --git a/src/api/projection.js b/src/attic/api/projection.js
similarity index 100%
rename from src/api/projection.js
rename to src/attic/api/projection.js
diff --git a/src/ol/Feature.js b/src/attic/ol/Feature.js
similarity index 100%
rename from src/ol/Feature.js
rename to src/attic/ol/Feature.js
diff --git a/src/ol/Popup.js b/src/attic/ol/Popup.js
similarity index 100%
rename from src/ol/Popup.js
rename to src/attic/ol/Popup.js
diff --git a/src/ol/base.js b/src/attic/ol/base.js
similarity index 100%
rename from src/ol/base.js
rename to src/attic/ol/base.js
diff --git a/src/ol/event/Drag.js b/src/attic/ol/event/Drag.js
similarity index 100%
rename from src/ol/event/Drag.js
rename to src/attic/ol/event/Drag.js
diff --git a/src/ol/event/Events.js b/src/attic/ol/event/Events.js
similarity index 100%
rename from src/ol/event/Events.js
rename to src/attic/ol/event/Events.js
diff --git a/src/ol/event/ISequence.js b/src/attic/ol/event/ISequence.js
similarity index 100%
rename from src/ol/event/ISequence.js
rename to src/attic/ol/event/ISequence.js
diff --git a/src/ol/event/Scroll.js b/src/attic/ol/event/Scroll.js
similarity index 100%
rename from src/ol/event/Scroll.js
rename to src/attic/ol/event/Scroll.js
diff --git a/src/ol/geom/Collection.js b/src/attic/ol/geom/Collection.js
similarity index 100%
rename from src/ol/geom/Collection.js
rename to src/attic/ol/geom/Collection.js
diff --git a/src/ol/geom/Geometry.js b/src/attic/ol/geom/Geometry.js
similarity index 100%
rename from src/ol/geom/Geometry.js
rename to src/attic/ol/geom/Geometry.js
diff --git a/src/ol/geom/IGeometry.js b/src/attic/ol/geom/IGeometry.js
similarity index 100%
rename from src/ol/geom/IGeometry.js
rename to src/attic/ol/geom/IGeometry.js
diff --git a/src/ol/geom/LineString.js b/src/attic/ol/geom/LineString.js
similarity index 100%
rename from src/ol/geom/LineString.js
rename to src/attic/ol/geom/LineString.js
diff --git a/src/ol/geom/MultiLineString.js b/src/attic/ol/geom/MultiLineString.js
similarity index 100%
rename from src/ol/geom/MultiLineString.js
rename to src/attic/ol/geom/MultiLineString.js
diff --git a/src/ol/geom/MultiPoint.js b/src/attic/ol/geom/MultiPoint.js
similarity index 100%
rename from src/ol/geom/MultiPoint.js
rename to src/attic/ol/geom/MultiPoint.js
diff --git a/src/ol/geom/Point.js b/src/attic/ol/geom/Point.js
similarity index 100%
rename from src/ol/geom/Point.js
rename to src/attic/ol/geom/Point.js
diff --git a/src/ol/layer/WMS.js b/src/attic/ol/layer/WMS.js
similarity index 100%
rename from src/ol/layer/WMS.js
rename to src/attic/ol/layer/WMS.js
diff --git a/src/ol/renderer/Composite.js b/src/attic/ol/renderer/Composite.js
similarity index 100%
rename from src/ol/renderer/Composite.js
rename to src/attic/ol/renderer/Composite.js
diff --git a/src/ol/renderer/LayerRenderer.js b/src/attic/ol/renderer/LayerRenderer.js
similarity index 100%
rename from src/ol/renderer/LayerRenderer.js
rename to src/attic/ol/renderer/LayerRenderer.js
diff --git a/src/ol/renderer/MapRenderer.js b/src/attic/ol/renderer/MapRenderer.js
similarity index 100%
rename from src/ol/renderer/MapRenderer.js
rename to src/attic/ol/renderer/MapRenderer.js
diff --git a/src/ol/renderer/TileLayerRenderer.js b/src/attic/ol/renderer/TileLayerRenderer.js
similarity index 100%
rename from src/ol/renderer/TileLayerRenderer.js
rename to src/attic/ol/renderer/TileLayerRenderer.js