diff --git a/dom/where-do-we-go_test.js b/dom/where-do-we-go_test.js
index bc34de50..ec28cca1 100644
--- a/dom/where-do-we-go_test.js
+++ b/dom/where-do-we-go_test.js
@@ -1,4 +1,4 @@
-import { places } from './subjects/where-do-we-go/data.js'
+import { places } from './subjects/where-do-we-go/where-do-we-go.data.js'
 
 export const tests = []
 
@@ -39,8 +39,8 @@ const dataNames = sortedPlaces.map(({ name }) =>
 
 tests.push(async ({ page, eq }) => {
   const { width, height } = await page.evaluate(() => ({
-    width: document.documentElement.clientWidth,
-    height: document.documentElement.clientHeight,
+    width: window.innerWidth,
+    height: window.innerHeight,
   }))
 
   const sections = await page.$$eval('section', sections =>
@@ -82,7 +82,7 @@ tests.push(async ({ page, eq }) => {
       window.scrollBy(0, window.innerHeight + 200)
     })
 
-    await page.waitFor(150)
+    await page.waitForTimeout(150)
 
     const location = await page.$eval('.location', location => [
       ...location.textContent.split('\n'),
@@ -109,7 +109,7 @@ tests.push(async ({ page, eq, getDirection }) => {
     window.scrollBy(0, window.innerHeight)
   })
 
-  await page.waitFor(100)
+  await page.waitForTimeout(100)
 
   const direction = (await getDirection()).includes('S')
     ? 'S'
@@ -125,7 +125,7 @@ tests.push(async ({ page, eq, getDirection }) => {
     window.scrollBy(0, -100)
   })
 
-  await page.waitFor(100)
+  await page.waitForTimeout(100)
 
   const direction = (await getDirection()).includes('N')
     ? 'N'
diff --git a/subjects/where-do-we-go/README.md b/subjects/where-do-we-go/README.md
index 4d7123fd..079e856f 100644
--- a/subjects/where-do-we-go/README.md
+++ b/subjects/where-do-we-go/README.md
@@ -7,7 +7,7 @@ Tired of staying home for too long, you decide to develop a page to index ideas
 Write the function `explore` which creates a page displaying the list of `places` provided in the data file below:
 
 - sort the `places` from the Northest to the Southest
-- display a fullscreen-size `<section>` for each place ; use the pics hosted in the `./images` folder to set the `background` attribute with the corresponding image URL. The URL has to be formatted like so: `./images/name-of-the-place.jpg` ; you can see [here](https://github.com/01-edu/public/tree/master/subjects/where-do-we-go/images) the list of images that the folder contains
+- display a fullscreen-size `<section>` for each place ; use the pics hosted in the `./where-do-we-go_images` folder (find the download link below) to set the `background` attribute with the corresponding image URL. The URL has to be formatted like so: `./where-do-we-go_images/name-of-the-place.jpg`
 - display a location indicator as a `<a>` tag in the middle of the screen which:
   - has the class `location`
   - displays as text strings separated by `\n`, the `name` and the `coordinates` of the current place featured in the image
@@ -22,16 +22,18 @@ Write the function `explore` which creates a page displaying the list of `places
 - [`window`](https://developer.mozilla.org/en-US/docs/Web/API/Window): [`innerHeight`](https://developer.mozilla.org/en-US/docs/Web/API/Window/innerHeight), [`scrollY`](https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollY), [`pageYOffset`](https://developer.mozilla.org/en-US/docs/Web/API/Window/pageYOffset)
 - Take a look at the [DMS coordinates system](https://en.wikipedia.org/wiki/Decimal_degrees)
 
-### Provided files
+### Files
 
-You have at your disposal the following files that you can download to test locally:
+You only need to create & submit the JS file `where-do-we-go.js` ; we're providing you the following files to download (click right and save link) & test locally:
 
-- the HTML file [index.html](/public/subjects/where-do-we-go/index.html) to open in the browser, which includes:
+- the HTML file [where-do-we-go.html](/public/subjects/where-do-we-go/where-do-we-go.html) to open in the browser, which includes:
 
   - the JS script which will allow to run your code
   - some CSS pre-styled classes: feel free to use those as they are, or modify them
 
-- the data file [data.js](/public/subjects/where-do-we-go/data.js) from which you can import `places`
+- the data file [where-do-we-go.data.js](/public/subjects/where-do-we-go/where-do-we-go.data.js) from which you can import `places`
+
+- the images to use, in this [compressed folder](https://assets.01-edu.org/where-do-we-go_images.zip)
 
 ### Expected result
 
diff --git a/subjects/where-do-we-go/data.js b/subjects/where-do-we-go/where-do-we-go.data.js
similarity index 100%
rename from subjects/where-do-we-go/data.js
rename to subjects/where-do-we-go/where-do-we-go.data.js
diff --git a/subjects/where-do-we-go/index.html b/subjects/where-do-we-go/where-do-we-go.html
similarity index 100%
rename from subjects/where-do-we-go/index.html
rename to subjects/where-do-we-go/where-do-we-go.html
diff --git a/subjects/where-do-we-go/images/almeria.jpg b/subjects/where-do-we-go/where-do-we-go_images/almeria.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/almeria.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/almeria.jpg
diff --git a/subjects/where-do-we-go/images/arlit.jpg b/subjects/where-do-we-go/where-do-we-go_images/arlit.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/arlit.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/arlit.jpg
diff --git a/subjects/where-do-we-go/images/atlanta.jpg b/subjects/where-do-we-go/where-do-we-go_images/atlanta.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/atlanta.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/atlanta.jpg
diff --git a/subjects/where-do-we-go/images/black-rock-desert.jpg b/subjects/where-do-we-go/where-do-we-go_images/black-rock-desert.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/black-rock-desert.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/black-rock-desert.jpg
diff --git a/subjects/where-do-we-go/images/cordoba.jpg b/subjects/where-do-we-go/where-do-we-go_images/cordoba.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/cordoba.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/cordoba.jpg
diff --git a/subjects/where-do-we-go/images/georgetown.jpg b/subjects/where-do-we-go/where-do-we-go_images/georgetown.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/georgetown.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/georgetown.jpg
diff --git a/subjects/where-do-we-go/images/killeen.jpg b/subjects/where-do-we-go/where-do-we-go_images/killeen.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/killeen.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/killeen.jpg
diff --git a/subjects/where-do-we-go/images/lisse.jpg b/subjects/where-do-we-go/where-do-we-go_images/lisse.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/lisse.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/lisse.jpg
diff --git a/subjects/where-do-we-go/images/los-caracoles-pass.jpg b/subjects/where-do-we-go/where-do-we-go_images/los-caracoles-pass.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/los-caracoles-pass.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/los-caracoles-pass.jpg
diff --git a/subjects/where-do-we-go/images/marrakesh.jpg b/subjects/where-do-we-go/where-do-we-go_images/marrakesh.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/marrakesh.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/marrakesh.jpg
diff --git a/subjects/where-do-we-go/images/moab.jpg b/subjects/where-do-we-go/where-do-we-go_images/moab.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/moab.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/moab.jpg
diff --git a/subjects/where-do-we-go/images/mount-fuji.jpg b/subjects/where-do-we-go/where-do-we-go_images/mount-fuji.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/mount-fuji.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/mount-fuji.jpg
diff --git a/subjects/where-do-we-go/images/namib-desert.jpg b/subjects/where-do-we-go/where-do-we-go_images/namib-desert.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/namib-desert.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/namib-desert.jpg
diff --git a/subjects/where-do-we-go/images/newark.jpg b/subjects/where-do-we-go/where-do-we-go_images/newark.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/newark.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/newark.jpg
diff --git a/subjects/where-do-we-go/images/nishinoshima-island.jpg b/subjects/where-do-we-go/where-do-we-go_images/nishinoshima-island.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/nishinoshima-island.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/nishinoshima-island.jpg
diff --git a/subjects/where-do-we-go/images/qinhuangdao.jpg b/subjects/where-do-we-go/where-do-we-go_images/qinhuangdao.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/qinhuangdao.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/qinhuangdao.jpg
diff --git a/subjects/where-do-we-go/images/rio-de-janeiro.jpg b/subjects/where-do-we-go/where-do-we-go_images/rio-de-janeiro.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/rio-de-janeiro.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/rio-de-janeiro.jpg
diff --git a/subjects/where-do-we-go/images/shadegan-lagoon.jpg b/subjects/where-do-we-go/where-do-we-go_images/shadegan-lagoon.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/shadegan-lagoon.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/shadegan-lagoon.jpg
diff --git a/subjects/where-do-we-go/images/skafta-river.jpg b/subjects/where-do-we-go/where-do-we-go_images/skafta-river.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/skafta-river.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/skafta-river.jpg
diff --git a/subjects/where-do-we-go/images/tucson.jpg b/subjects/where-do-we-go/where-do-we-go_images/tucson.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/tucson.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/tucson.jpg
diff --git a/subjects/where-do-we-go/images/yuanyang-county.jpg b/subjects/where-do-we-go/where-do-we-go_images/yuanyang-county.jpg
similarity index 100%
rename from subjects/where-do-we-go/images/yuanyang-county.jpg
rename to subjects/where-do-we-go/where-do-we-go_images/yuanyang-county.jpg