diff --git a/areas.htm b/areas.htm
index 9a7fd2834..174131000 100644
--- a/areas.htm
+++ b/areas.htm
@@ -29,7 +29,7 @@ area 1626.</p>
 </div>
 
 <p>Access to the area is relatively easy at its southern edge, as the <a
-href="tollrd.htm">Loser Panoramastra&szlig;e</a> (a toll road) climbs the
+href="handbook/tollrd.html">Loser Panoramastra&szlig;e</a> (a toll road) climbs the
 southern slopes of Loser to reach a large parking area and self-service
 restaurant at 1600m just below Augst See. 
 <ul>
@@ -41,7 +41,9 @@ southern slopes of Vd. Schwarzmooskogel, and also north to a col overlooking
 the extensive pathless central plateau. Both the further reaches of the central
 plateau and the areas around the Sch&ouml;nberg, Gries Kogel and Augst-Eck
 ridges are remote - being large pathless areas of rough karren with little or
-no water supplies except for snowmelt. The Stone-Bridge bivi site between the Hinter Schwarmooskogel and Neid Augst-Eck makes it practical to expore this area.</p>
+no water supplies except for snowmelt. The Stone-Bridge bivi site between the Hinter Schwarmooskogel and 
+Neid Augst-Eck makes it practical to 
+expore this area.</p>
 
 
 <p>Within this area (1623), by far the majority of caves are above
@@ -100,8 +102,8 @@ ids, not their names. But Mozilla doesn't understand this. -->
 <area shape="poly" coords="234,511,224,535,188,548,181,559,152,559,139,574,139,595,116,613,113,626,0,626,0,624,4,612,12,602,26,597,26,595,38,592,45,581,68,566,75,568,102,550,141,468,170,475,183,491,186,502,215,508,237,494" href="egglgrub.html" alt="7. Sommersitz and Egglgrube area" />
 <area shape="poly" coords="0,456,12,440,17,478,51,523,78,541,102,550,75,568,68,566,45,581,38,592,26,595,26,593,21,593,8,601,0,613" href="loser.html" alt="8. Loser and around Augst-see" />
 <area shape="poly" coords="0,456,12,440,30,393,46,366,101,346,149,317,155,253,138,236,143,165,90,200,62,240,48,239,12,284,0,287" href="gschwand.html" alt="9. Gschwandt Alm and area east of Blaa-Alm" />
-<area shape="poly" coords="113,626,116,613,139,595,139,574,152,559,181,559,188,548,224,535,234,511,254,508,263,529,346,505,432,439,464,373,461,356,467,350,478,344,506,353,486,382,440,488,331,611,300,626" href="aaussee.html" alt="10. North of Altausser See and up valley to Hochklapf" />
-<area shape="poly" coords="0,613,8,601,21,593,26,593,26,597,12,602,4,612,0,624" href="tollrd.htm" alt="Loser Panoramastrasse toll road" />
+<area shape="poly" coords="113,626,116,613,139,595,139,574,152,559,181,559,188,548,224,535,234,511,254,508,263,529,346,505,432,439,464,373,461,356,467,350,478,344,506,353,486,382,440,488,331,611,300,626" href="aausee.html" alt="10. North of Altausser See and up valley to Hochklapf" />
+<area shape="poly" coords="0,613,8,601,21,593,26,593,26,597,12,602,4,612,0,624" href="handbook/tollrd.html" alt="Loser Panoramastrasse toll road" />
 </map>
 </div>
 
@@ -112,17 +114,6 @@ ids, not their names. But Mozilla doesn't understand this. -->
 Loser plateau looking SW" />
 <p class="caption">Plateau visualisation from Aven - looking towards Br&auml;uning Nase and Loser</p></div>
 
-
-
 <hr />
-
-<ul id="links">
-<li>Back to <a href="infodx.htm">Expedition Index</a> page</li>
-<li><b>Cave description indices:</b>
-<ul>
-	<li>Caves in CUCC's area <a href="indxal.htm">1623</a></li>
-	<li>Adjacent area <a href="1626/index.html">1626</a></li>
-</ul></li>
-</ul>
 </body>
 </html>
diff --git a/cave_data/1623-1989-01.html b/cave_data/1623-1989-01.html
index f7f0728e5..80e1dbea9 100644
--- a/cave_data/1623-1989-01.html
+++ b/cave_data/1623-1989-01.html
@@ -34,7 +34,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>1989-01.html</url>
+<url>1623/1989-01</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-1990-15.html b/cave_data/1623-1990-15.html
index ef0bc7d98..a2b96ea09 100644
--- a/cave_data/1623-1990-15.html
+++ b/cave_data/1623-1990-15.html
@@ -34,7 +34,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>1990-15.html</url>
+<url>1623/1990-15</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-232.html b/cave_data/1623-232.html
index 1eb231c10..aae58288f 100644
--- a/cave_data/1623-232.html
+++ b/cave_data/1623-232.html
@@ -33,7 +33,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>232.html</url>
+<url>1623/232</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-233.html b/cave_data/1623-233.html
index cd437cc61..0836452c0 100644
--- a/cave_data/1623-233.html
+++ b/cave_data/1623-233.html
@@ -33,7 +33,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>233.html</url>
+<url>1623/233</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-252.html b/cave_data/1623-252.html
index ae7e283fb..42dfa0cf6 100644
--- a/cave_data/1623-252.html
+++ b/cave_data/1623-252.html
@@ -33,7 +33,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>252.html</url>
+<url>1623/252</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-BS1-15.html b/cave_data/1623-BS1-15.html
index e26a88265..bc87409f2 100644
--- a/cave_data/1623-BS1-15.html
+++ b/cave_data/1623-BS1-15.html
@@ -33,7 +33,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>bs1-15.html</url>
+<url>1623/bs1-15</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-BS18.html b/cave_data/1623-BS18.html
index ba169ce79..5970ab1bb 100644
--- a/cave_data/1623-BS18.html
+++ b/cave_data/1623-BS18.html
@@ -33,7 +33,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>bs18.html</url>
+<url>1623/bs18</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-BS20-nn.html b/cave_data/1623-BS20-nn.html
index a6ed8d1b7..cecff0564 100644
--- a/cave_data/1623-BS20-nn.html
+++ b/cave_data/1623-BS20-nn.html
@@ -33,7 +33,7 @@
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>bs20-nn.html</url>
+<url>1623/bs20-nn</url>
 </cave>
 </body>
 </html>