diff --git a/.hgignore b/.hgignore
index a3f24b832..57380569b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -90,8 +90,8 @@ noinfo/prospecting_guide_tcarea.jpg
1623/1999-OB-01/1999-OB-01.html
1623/1999-OB-02/1999-OB-02.html
1623/200.htm
-1623/2004-01.html
-1623/2004-02.html
+1623/2004-01/index.html
+1623/2004-02/index.html
1623/2004-03.html
1623/2004-04.html
1623/2004-05.html
diff --git a/1623/others/l/76bivvyvw.html b/1623/others/l/76bivvyvw.html
index 3989a78c9..070c91169 100644
--- a/1623/others/l/76bivvyvw.html
+++ b/1623/others/l/76bivvyvw.html
@@ -22,7 +22,7 @@ checked, and goes nowhere; but no number has been allocated to it.</p>
<hr />
<!-- LINKS -->
<ul id="links">
-<li><a href="../../2004-03/2004-03.html">2004-03 description</a></li>
+<li><a href="../../2004-03/index.html">2004-03 description</a></li>
<li><a href="../../1996-X01/1996-X01.html">1996-X01 description</a></li>
<li><a href="../../index.html">Plateau description</a></li>
<li><a href="../../../index.htm">Back to Expedition Intro page</a>
diff --git a/noinfo/cave_data/1623-2004-01.html b/noinfo/cave_data/1623-2004-01.html
index 03d839418..723a44946 100644
--- a/noinfo/cave_data/1623-2004-01.html
+++ b/noinfo/cave_data/1623-2004-01.html
@@ -35,8 +35,8 @@
<depth>5m</depth>
<extent></extent>
<survex_file>caves/2004-01/2004-01.svx</survex_file>
-<description_file>1623/2004-01.html</description_file>
-<url>1623/2004-01.html</url>
+<description_file>1623/2004-01/index.html</description_file>
+<url>1623/2004-01/index.html</url>
</cave>
</body>
</html>
diff --git a/noinfo/cave_data/1623-2004-02.html b/noinfo/cave_data/1623-2004-02.html
index 44481aa93..7b4930fef 100644
--- a/noinfo/cave_data/1623-2004-02.html
+++ b/noinfo/cave_data/1623-2004-02.html
@@ -24,7 +24,7 @@
<explorers>CUCC 2004 (Olly, Jenny)</explorers>
<underground_description>Draughting hole with a chossy entrance. Just inside is a crap snow plug that collapsed a lot. The draught issues from a too-narrow rift roughly below the entrance. The top of the rift has a large rock wedged in. This can be rocked if pulled very hard. Perhaps it's worth removing to see if the rift is wide enough at the top? It's definitely wider beyond the rift.</underground_description>
<equipment></equipment>
-<references><a href="../../years/2004/logbook.html#t2004-08-05A">2004 log book</a></references>
+<references><a href="/years/2004/logbook.html#t2004-08-05A">2004 log book</a></references>
<survey></survey>
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line>
@@ -33,8 +33,8 @@
<depth></depth>
<extent></extent>
<survex_file></survex_file>
-<description_file>1623/2004-02.html</description_file>
-<url>1623/2004-02.html</url>
+<description_file>1623/2004-02/index.html</description_file>
+<url>1623/2004-02/index.html</url>
</cave>
</body>
</html>
diff --git a/noinfo/entrance_data/1623-2004-01.html b/noinfo/entrance_data/1623-2004-01.html
index 41779b404..a53794554 100644
--- a/noinfo/entrance_data/1623-2004-01.html
+++ b/noinfo/entrance_data/1623-2004-01.html
@@ -16,7 +16,7 @@
<location_description></location_description>
<approach>As for <a href="/1623/76/76.htm">76</a></approach>
<underground_description></underground_description>
-<photo></p> <table class="imgtable"><tr><td><a href="2004-01/ent.jpg"><img src="2004-01/ent_small.jpg" /></a></td><td><a href="2004-01/inside.jpg"><img src="2004-01/inside_small.jpg" /></a></td></tr><tr class="caption"><td>Entrance</td><td>Inside (note flat sleeping spot on right; comfortable, but cold!)</td></tr></table><p>Photos © Olly Betts 2005</photo>
+<photo></p> <table class="imgtable"><tr><td><a href="ent.jpg"><img src="ent_small.jpg" /></a></td><td><a href="inside.jpg"><img src="inside_small.jpg" /></a></td></tr><tr class="caption"><td>Entrance</td><td>Inside (note flat sleeping spot on right; comfortable, but cold!)</td></tr></table><p>Photos © Olly Betts 2005</photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
diff --git a/years/2005/surfacework.html b/years/2005/surfacework.html
index a693bcb61..76ef3de6a 100644
--- a/years/2005/surfacework.html
+++ b/years/2005/surfacework.html
@@ -34,15 +34,15 @@ and found eight more holes which promptly got forgotten about as well. At least
they explored most of these at the time but <a
href="../../1623/2003-X12/2003-X12.html">2003-X12</a> and <a
href="../../1623/2003-X17/2003-X17.html">2003-X17</a> are undescended.</li>
-<li><a href="../../1623/2004-10/2004-10.html">2004-10</a>: discovered by
+<li><a href="../../1623/2004-10.html">2004-10</a>: discovered by
Becka and Nial, lying just north of <a
href="../../1623/251/251.html">251</a> (In Your Face).</li>
-<li><a href="../../1623/2004-13/2004-13.html">2004-13</a>: near 161G and
+<li><a href="../../1623/2004-13.html">2004-13</a>: near 161G and
161H. Almost certainly goes into Iceland if it goes anywhere, but worth
checking out.</li>
-<li><a href="../../1623/2004-16/2004-16.html">2004-16</a>, <a
-href="../../1623/2004-17/2004-17.html">17</a>, <a
-href="../../1623/2004-18/2004-18.html">18</a>: Martin + Frank's holes north
+<li><a href="../../1623/2004-16.html">2004-16</a>, <a
+href="../../1623/2004-17.html">17</a>, <a
+href="../../1623/2004-18.html">18</a>: Martin + Frank's holes north
of 204C. Need checking out to see if they go anywhere; might yield a new 204
entrance!</li>
<li>2002-02 aka <a href="../../1623/234/234.html">234B</a>: has a voice and
@@ -59,7 +59,7 @@ require hammering and/or capping?</li>
Continuing passage at the other side of Mersonified pitch-head, trending
in direction of 204 (although not very deep); may require a bolt traverse to
access.</li>
-<li><a href="../../1623/2004-19/2004-19.html">2004-19</a> (Kindergarten):
+<li><a href="../../1623/2004-19.html">2004-19</a> (Kindergarten):
pitch in floor of main passage.</li>
<li><a href="../../1623/2002-07/2002-07.html">2002-07</a> (Quarries A-C):
squeeze down past snow plug at -34m, just 9m above Crowning Glory.</li>
@@ -69,7 +69,7 @@ squeeze down past snow plug at -34m, just 9m above Crowning Glory.</li>
<li><a href="../../1623/2000-08/2000-08.htm">2000-08</a>: Dig poised above
Merry Fucking Christmas. If I can work out a sensible and safe rig to get into
it, then I might have a go at it with a crowbar and a shovel.</li>
-<li><a href="../../1623/2004-21/2004-21.html">2004-21</a>: Dig out the
+<li><a href="../../1623/2004-21.html">2004-21</a>: Dig out the
mysterious passage going down to the right (which is sometimes snow-choked but
has never been descended). Danger of attack by flying saucers. (Needs tagging,
as well.)</li>
@@ -115,7 +115,7 @@ Also might be worthwhile getting more pics/GPS coordinates of 174, 175,
and 176 which aren't far away.
</li>
-<li><a href="../../1623/2004-03/2004-03.html">2004-03</a> is on
+<li><a href="../../1623/2004-03.html">2004-03</a> is on
the route from top camp and needs tagging, GPSing and
a close-up photo taking.</li>
diff --git a/years/2007/surf76.html b/years/2007/surf76.html
index 1d794fb2c..6d574e5e8 100644
--- a/years/2007/surf76.html
+++ b/years/2007/surf76.html
@@ -24,7 +24,7 @@ someone other than CUCC, and apparently only partially descended by CUCC.</li>
<li>Eislufthöhle area:</li>
<ul>
-<li>Check surveys of <a href="../../1623/2004-01.html">2004-01 (bivi
+<li>Check surveys of <a href="../../1623/2004-01/index.html">2004-01 (bivi
cave)</a> vs <a href="../../1623/99/99.html">99</a> - the legs seem
misaligned in one or the other.</li>