diff --git a/content/_index.md b/content/_index.md
index 00f9285..87d6333 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -8,26 +8,26 @@ georgespics:
     osm: https://www.openstreetmap.org/#map=14/45.1612/5.9444
     date: 2021-06-27
     pics:
-    - path: 2021-06-pra1.jpg
-    - path: 2021-06-pra2.jpg
-    - path: 2021-06-pra3.jpg
-    - path: 2021-06-pra4.jpg
+    - path: 2021-06-pra/pra1.jpg
+    - path: 2021-06-pra/pra2.jpg
+    - path: 2021-06-pra/pra3.jpg
+    - path: 2021-06-pra/pra4.jpg
   - name: Pen-Bé, Bretagne
     osm: https://www.openstreetmap.org/#map=14/47.4205/-2.4575
     date: 2021-07-05
     pics:
-    - path: 2021-07-penbe1.jpg
-    - path: 2021-07-penbe2.jpg
+    - path: 2021-07-penbe/penbe1.jpg
+    - path: 2021-07-penbe/penbe2.jpg
   - name: Mourèze, Hérault
     osm: https://www.openstreetmap.org/#map=15/43.6191/3.3517
     date: 2021-07-27
     pics:
-    - path: 2021-07-moureze1.jpg
+    - path: 2021-07-moureze/moureze1.jpg
   - name: Dent de Crolles, Alpes
     osm: https://www.openstreetmap.org/#map=15/45.3105/5.8559
     date: 2021-11-13
     pics:
-    - path: 2021-11-crolles1.jpg
-    - path: 2021-11-crolles2.jpg
-    - path: 2021-11-crolles3.jpg
+    - path: 2021-11-crolles/crolles1.jpg
+    - path: 2021-11-crolles/crolles2.jpg
+    - path: 2021-11-crolles/crolles3.jpg
 ---
diff --git a/pictures/Makefile b/pictures/Makefile
index 9ad278b..03d83eb 100644
--- a/pictures/Makefile
+++ b/pictures/Makefile
@@ -1,4 +1,4 @@
-FULLPICS = $(wildcard full/*.jpg)
+FULLPICS = $(shell find full -name '*.jpg')
 THUMBS = $(patsubst full/%.jpg,thumb/%.jpg,$(FULLPICS))
 
 THUMB_DIM = 400
@@ -7,10 +7,8 @@ CONVERT_OPTIONS = -quality 75 -strip -interlace Plane +repage
 
 all: $(THUMBS)
 
-thumb:
-	mkdir -p thumb
-
-thumb/%.jpg: full/%.jpg thumb
+thumb/%.jpg: full/%.jpg
+	mkdir -p "$$(dirname "$@")"
 	convert "$<" \
 		-resize '$(THUMB_DIM)x$(THUMB_DIM)^' \
 		-gravity "$$(./gravityof.sh "$<")" \
diff --git a/pictures/full/2021-06-pra1.jpg b/pictures/full/2021-06-pra/pra1.jpg
similarity index 100%
rename from pictures/full/2021-06-pra1.jpg
rename to pictures/full/2021-06-pra/pra1.jpg
diff --git a/pictures/full/2021-06-pra2.jpg b/pictures/full/2021-06-pra/pra2.jpg
similarity index 100%
rename from pictures/full/2021-06-pra2.jpg
rename to pictures/full/2021-06-pra/pra2.jpg
diff --git a/pictures/full/2021-06-pra3.jpg b/pictures/full/2021-06-pra/pra3.jpg
similarity index 100%
rename from pictures/full/2021-06-pra3.jpg
rename to pictures/full/2021-06-pra/pra3.jpg
diff --git a/pictures/full/2021-06-pra4.jpg b/pictures/full/2021-06-pra/pra4.jpg
similarity index 100%
rename from pictures/full/2021-06-pra4.jpg
rename to pictures/full/2021-06-pra/pra4.jpg
diff --git a/pictures/full/2021-07-moureze1.jpg b/pictures/full/2021-07-moureze/moureze1.jpg
similarity index 100%
rename from pictures/full/2021-07-moureze1.jpg
rename to pictures/full/2021-07-moureze/moureze1.jpg
diff --git a/pictures/full/2021-07-penbe1.jpg b/pictures/full/2021-07-penbe/penbe1.jpg
similarity index 100%
rename from pictures/full/2021-07-penbe1.jpg
rename to pictures/full/2021-07-penbe/penbe1.jpg
diff --git a/pictures/full/2021-07-penbe2.jpg b/pictures/full/2021-07-penbe/penbe2.jpg
similarity index 100%
rename from pictures/full/2021-07-penbe2.jpg
rename to pictures/full/2021-07-penbe/penbe2.jpg
diff --git a/pictures/full/2021-11-crolles1.jpg b/pictures/full/2021-11-crolles/crolles1.jpg
similarity index 100%
rename from pictures/full/2021-11-crolles1.jpg
rename to pictures/full/2021-11-crolles/crolles1.jpg
diff --git a/pictures/full/2021-11-crolles2.jpg b/pictures/full/2021-11-crolles/crolles2.jpg
similarity index 100%
rename from pictures/full/2021-11-crolles2.jpg
rename to pictures/full/2021-11-crolles/crolles2.jpg
diff --git a/pictures/full/2021-11-crolles3.jpg b/pictures/full/2021-11-crolles/crolles3.jpg
similarity index 100%
rename from pictures/full/2021-11-crolles3.jpg
rename to pictures/full/2021-11-crolles/crolles3.jpg
diff --git a/pictures/gravity/2021-07-penbe1.gravity b/pictures/gravity/penbe1.gravity
similarity index 100%
rename from pictures/gravity/2021-07-penbe1.gravity
rename to pictures/gravity/penbe1.gravity