diff --git a/old/examples/wms-capabilities.html b/examples/wms-capabilities.html
similarity index 100%
rename from old/examples/wms-capabilities.html
rename to examples/wms-capabilities.html
diff --git a/old/examples/wms-capabilities.js b/examples/wms-capabilities.js
similarity index 100%
rename from old/examples/wms-capabilities.js
rename to examples/wms-capabilities.js
diff --git a/old/src/ol/parser/ogc/exceptionreportparser.js b/src/ol/parser/ogc/exceptionreportparser.js
similarity index 100%
rename from old/src/ol/parser/ogc/exceptionreportparser.js
rename to src/ol/parser/ogc/exceptionreportparser.js
diff --git a/old/src/ol/parser/ogc/versionedparser.js b/src/ol/parser/ogc/versionedparser.js
similarity index 100%
rename from old/src/ol/parser/ogc/versionedparser.js
rename to src/ol/parser/ogc/versionedparser.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser.exports b/src/ol/parser/ogc/wmscapabilitiesparser.exports
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser.exports
rename to src/ol/parser/ogc/wmscapabilitiesparser.exports
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser.js b/src/ol/parser/ogc/wmscapabilitiesparser.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser.js
rename to src/ol/parser/ogc/wmscapabilitiesparser.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser_v1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser_v1.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js
diff --git a/old/src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js
similarity index 100%
rename from old/src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js
diff --git a/old/src/ol/parser/parser.js b/src/ol/parser/parser.js
similarity index 100%
rename from old/src/ol/parser/parser.js
rename to src/ol/parser/parser.js
diff --git a/old/src/ol/parser/xmlparser.js b/src/ol/parser/xmlparser.js
similarity index 100%
rename from old/src/ol/parser/xmlparser.js
rename to src/ol/parser/xmlparser.js
diff --git a/old/test/spec/ol/parser/ogc/exceptionreport.test.js b/test/spec/ol/parser/ogc/exceptionreport.test.js
similarity index 100%
rename from old/test/spec/ol/parser/ogc/exceptionreport.test.js
rename to test/spec/ol/parser/ogc/exceptionreport.test.js
diff --git a/old/test/spec/ol/parser/ogc/versioned.test.js b/test/spec/ol/parser/ogc/versioned.test.js
similarity index 100%
rename from old/test/spec/ol/parser/ogc/versioned.test.js
rename to test/spec/ol/parser/ogc/versioned.test.js
diff --git a/old/test/spec/ol/parser/ogc/wmscapabilities.test.js b/test/spec/ol/parser/ogc/wmscapabilities.test.js
similarity index 100%
rename from old/test/spec/ol/parser/ogc/wmscapabilities.test.js
rename to test/spec/ol/parser/ogc/wmscapabilities.test.js
diff --git a/old/test/spec/ol/parser/ogc/wmscapabilities_v1_0_0.test.js b/test/spec/ol/parser/ogc/wmscapabilities_v1_0_0.test.js
similarity index 100%
rename from old/test/spec/ol/parser/ogc/wmscapabilities_v1_0_0.test.js
rename to test/spec/ol/parser/ogc/wmscapabilities_v1_0_0.test.js
diff --git a/old/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js b/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js
similarity index 100%
rename from old/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js
rename to test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js
diff --git a/old/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js b/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js
similarity index 100%
rename from old/test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js
rename to test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js
diff --git a/old/test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js b/test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js
similarity index 100%
rename from old/test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js
rename to test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_0_0.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_0_0.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_0_0.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_0_0.xml
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/exceptionsample.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/exceptionsample.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/exceptionsample.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/exceptionsample.xml
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/fallback.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/fallback.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/fallback.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/fallback.xml
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/wmsc.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/wmsc.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/wmsc.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/wmsc.xml
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/exceptionsample.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/exceptionsample.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/exceptionsample.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/exceptionsample.xml
diff --git a/old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml b/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml
similarity index 100%
rename from old/test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml
rename to test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml