diff --git a/.DS_Store b/.DS_Store
index 3aec923..bf17ed4 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/data/NAPPeilmerken.geojson b/data/datasets/NAPPeilmerken.geojson
similarity index 100%
rename from data/NAPPeilmerken.geojson
rename to data/datasets/NAPPeilmerken.geojson
diff --git a/data/NAPPeilmerken.yml b/data/datasets/NAPPeilmerken.yml
similarity index 100%
rename from data/NAPPeilmerken.yml
rename to data/datasets/NAPPeilmerken.yml
diff --git a/data/buurten.geojson b/data/datasets/buurten.geojson
similarity index 100%
rename from data/buurten.geojson
rename to data/datasets/buurten.geojson
diff --git a/data/buurten.yml b/data/datasets/buurten.yml
similarity index 100%
rename from data/buurten.yml
rename to data/datasets/buurten.yml
diff --git a/data/energielabels.geojson b/data/datasets/energielabels.geojson
similarity index 100%
rename from data/energielabels.geojson
rename to data/datasets/energielabels.geojson
diff --git a/data/energielabels.yml b/data/datasets/energielabels.yml
similarity index 100%
rename from data/energielabels.yml
rename to data/datasets/energielabels.yml
diff --git a/data/gemeenteGrens.geojson b/data/datasets/gemeenteGrens.geojson
similarity index 100%
rename from data/gemeenteGrens.geojson
rename to data/datasets/gemeenteGrens.geojson
diff --git a/data/gemeentegrens.yml b/data/datasets/gemeentegrens.yml
similarity index 100%
rename from data/gemeentegrens.yml
rename to data/datasets/gemeentegrens.yml
diff --git a/data/kamersgewijzeVerhuur.geojson b/data/datasets/kamersgewijzeVerhuur.geojson
similarity index 100%
rename from data/kamersgewijzeVerhuur.geojson
rename to data/datasets/kamersgewijzeVerhuur.geojson
diff --git a/data/kamersgewijzeVerhuur.yml b/data/datasets/kamersgewijzeVerhuur.yml
similarity index 100%
rename from data/kamersgewijzeVerhuur.yml
rename to data/datasets/kamersgewijzeVerhuur.yml
diff --git a/data/zonnepanelen.geojson b/data/datasets/zonnepanelen.geojson
similarity index 100%
rename from data/zonnepanelen.geojson
rename to data/datasets/zonnepanelen.geojson
diff --git a/data/zonnepanelen.yml b/data/datasets/zonnepanelen.yml
similarity index 100%
rename from data/zonnepanelen.yml
rename to data/datasets/zonnepanelen.yml
diff --git a/processen/addNumbers.json b/data/processes/addNumbers.json
similarity index 100%
rename from processen/addNumbers.json
rename to data/processes/addNumbers.json
diff --git a/processen/addNumbers/add.sh b/data/processes/addNumbers/add.sh
similarity index 100%
rename from processen/addNumbers/add.sh
rename to data/processes/addNumbers/add.sh
diff --git a/processen/addNumbers/launch.js b/data/processes/addNumbers/launch.js
similarity index 100%
rename from processen/addNumbers/launch.js
rename to data/processes/addNumbers/launch.js
diff --git a/processen/countFeatures.json b/data/processes/countFeatures.json
similarity index 100%
rename from processen/countFeatures.json
rename to data/processes/countFeatures.json
diff --git a/processen/countFeatures/count.js b/data/processes/countFeatures/count.js
similarity index 100%
rename from processen/countFeatures/count.js
rename to data/processes/countFeatures/count.js
diff --git a/processen/countFeatures/launch.js b/data/processes/countFeatures/launch.js
similarity index 100%
rename from processen/countFeatures/launch.js
rename to data/processes/countFeatures/launch.js
diff --git a/processen/echoService.json b/data/processes/echoService.json
similarity index 100%
rename from processen/echoService.json
rename to data/processes/echoService.json
diff --git a/processen/echoService/docker-compose.yml b/data/processes/echoService/docker-compose.yml
similarity index 100%
rename from processen/echoService/docker-compose.yml
rename to data/processes/echoService/docker-compose.yml
diff --git a/processen/echoService/launch.js b/data/processes/echoService/launch.js
similarity index 100%
rename from processen/echoService/launch.js
rename to data/processes/echoService/launch.js
diff --git a/package.json b/package.json
index 70b34d2..58bcba3 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,4 @@
 {
-  "name": "step19",
-  "description": "",
-  "version": "1.0.0",
-  "main": "index.js",
-  "author": "",
-  "license": "ISC",
   "type": "module",
   "dependencies": {
     "@turf/turf": "^7.0.0",
@@ -12,15 +6,12 @@
     "cors": "^2.8.5",
     "debug": "^4.3.5",
     "docker-cli-js": "^2.10.0",
-    "docker-compose": "^0.24.8",
-    "express": "^4.20.0",
-    "jsonpath-plus": "^9.0.0",
+    "express": "^4.21.0",
     "morgan": "^1.10.0",
     "proj4": "^2.11.0",
     "pug": "^3.0.3",
     "semver": "^7.6.3",
     "serve-favicon": "^2.5.0",
-    "swagger-ui-express": "^5.0.1",
     "url-join": "^5.0.0",
     "yaml": "^2.5.0"
   }
diff --git a/src/index.js b/src/index.js
index 9866142..756f330 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,9 +8,9 @@ if (__dirname === undefined) console.log("need node 20.16 or higher");
 
 // Load data (TODO: async)
 try {
-  var dataPath = join(process.env.DATA_PATH || __dirname, "../data");
+  var dataPath = join(process.env.DATA_PATH || __dirname, "../data/datasets");
   readData(dataPath);
-  var processenPath = join(process.env.DATA_PATH || __dirname, "../processen");
+  var processenPath = join(process.env.DATA_PATH || __dirname, "../data/processes");
   readProcesses(processenPath);
 } catch (err) {
   console.log(err);