diff --git a/1623/1623/2025-HW-03/i/2025-HW-03.jpg b/1623/2025-HW-03/i/2025-HW-03.jpg
similarity index 100%
rename from 1623/1623/2025-HW-03/i/2025-HW-03.jpg
rename to 1623/2025-HW-03/i/2025-HW-03.jpg
diff --git a/1623/1623/2025-HW-03/l/2025-HW-03.html b/1623/2025-HW-03/l/2025-HW-03.html
similarity index 100%
rename from 1623/1623/2025-HW-03/l/2025-HW-03.html
rename to 1623/2025-HW-03/l/2025-HW-03.html
diff --git a/1623/1623/2025-HW-03/t/2025-HW-03.jpg b/1623/2025-HW-03/t/2025-HW-03.jpg
similarity index 100%
rename from 1623/1623/2025-HW-03/t/2025-HW-03.jpg
rename to 1623/2025-HW-03/t/2025-HW-03.jpg
diff --git a/cave_data/1623-JTT-01.html b/cave_data/1623-JTT-01.html
index b99396f3f..b195c6ad8 100644
--- a/cave_data/1623-JTT-01.html
+++ b/cave_data/1623-JTT-01.html
@@ -30,10 +30,11 @@ the form documented at
 </entrance>
 
 <explorers>;received from Franz Lindenmayr (Nov. 12. 1999)</explorers>
-<survex_file>caves-1623/juttahoehle/jutta.svx</survex_file>
+<survex_file>caves-1623/40/old/juttahoehle/jutta.svx</survex_file>
 <underground_description><pre>;2000.03.08 W Created. Data moved out of 40/altsvx
 ;2013.05.13 W Not clear if this is in 40 or a different cave, and if so where it is.
 
+2025-10-31 Becka moved the survex file back into 40.
 
 ;data from the first explorer of Schneevulkanhalle
 ; Schwarzmooskogel-Eishöhle (1623/40)
diff --git a/cave_data/1626-E02.html b/cave_data/1626-310.html
similarity index 97%
rename from cave_data/1626-E02.html
rename to cave_data/1626-310.html
index 74ea7384d..748c36fdb 100644
--- a/cave_data/1626-E02.html
+++ b/cave_data/1626-310.html
@@ -26,7 +26,7 @@ the form documented at
 <unofficial_number></unofficial_number>
 
 <entrance>
-  <entranceslug>1626-E02</entranceslug>
+  <entranceslug>1626-310</entranceslug>
   <letter></letter>
 </entrance>
 
diff --git a/cave_data/1626-311.html b/cave_data/1626-311.html
index 99f242ed0..8f418774f 100644
--- a/cave_data/1626-311.html
+++ b/cave_data/1626-311.html
@@ -20,8 +20,8 @@ the form documented at
 
 <official_name>Roehre Höhle (E09)</official_name>
 <area>1626</area>
-<kataster_code>311</kataster_code>
-<kataster_number></kataster_number> 
+<kataster_code></kataster_code>
+<kataster_number>311</kataster_number> 
 <unofficial_number>E09</unofficial_number>
 
 <entrance>
@@ -30,7 +30,7 @@ the form documented at
 </entrance>
 
 <explorers>ARGE - it says so in the survex file</explorers>
-<survex_file>caves-1626/E09/e09.svx</survex_file>
+<survex_file>caves-1626/311/311.svx</survex_file>
 <underground_description></underground_description>
 <equipment></equipment>
 <references></references>
diff --git a/cave_data/1626-352.html b/cave_data/1626-352.html
index 42be78a9b..050dd07c2 100644
--- a/cave_data/1626-352.html
+++ b/cave_data/1626-352.html
@@ -19,7 +19,7 @@ the form documented at
 <non_public>False</non_public>
 <unexplored>False</unexplored>
 
-<official_name>Mausefalle</official_name>
+<official_name>Ich muss mal (Die Mausefalle)</official_name>
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>352</kataster_number> 
@@ -30,7 +30,7 @@ the form documented at
   <letter></letter>
 </entrance>
 
-<explorers></explorers>
+<explorers>not-CUCC-Expo, 2009, Hinterland</explorers>
 <survex_file>caves-1626/352/352.svx</survex_file>
 <underground_description>ARGE or VfHO cave.<br />any '; Messteam' and '; Zeichner' lines:<br><pre>
 
@@ -42,7 +42,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is (probably) an ARGE or VfHO cave where we only have the survex file and no other information.<br />If there is a 'Messteam' or 'Zeichner' listed, then it is probably ARGE.</notes>
+<notes>We only have the survex file. This is (probably) an ARGE or VfHO cave where we only have the survex file and no other information.<br />If there is a 'Messteam' or 'Zeichner' listed, then it is probably ARGE.</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-E16.html b/cave_data/1626-E16.html
deleted file mode 100644
index 98cb70ed7..000000000
--- a/cave_data/1626-E16.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
-<!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
-make sure you update the database by doing a full data import. If you edit it using the online form
-though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
-the form documented at 
-<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
-<br>
-
-<cave>
-<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
-<caveslug>1626-E16</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name>Ich muss mal (Die Mausefalle)</official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-<area>1626</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
-
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>E16</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
-
-<entrance>
-  <entranceslug>1626-E16</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <!-- DEBUG  1626-E16+1626-E16 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
-</entrance>
-
-<explorers>not-CUCC-Expo, 2009, Hinterland</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file>caves-1626/E16/e16.svx</survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes>We only have the survex file.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
-<extent></extent>
-
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1626/E16/E16.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
-</cave>
-</body>
-</html>
diff --git a/entrance_data/1626-E02.html b/entrance_data/1626-310.html
similarity index 97%
rename from entrance_data/1626-E02.html
rename to entrance_data/1626-310.html
index 04f0301b3..b123bf113 100644
--- a/entrance_data/1626-E02.html
+++ b/entrance_data/1626-310.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1626-E02</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1626-310</slug> <!-- one entrance and one slug per entrance_data file -->
 <name>E02</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
diff --git a/entrance_data/1626-352.html b/entrance_data/1626-352.html
index 372768d41..f53829385 100644
--- a/entrance_data/1626-352.html
+++ b/entrance_data/1626-352.html
@@ -23,7 +23,8 @@ though, you do not need to do a data import as it happens automatically -->
 <name>352</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<location_description></location_description>
+<location_description>Totes Gebirge, Österreich - Loser/Augst-Eck Plateau
+<br>GPS-Punkt E16</location_description>
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
@@ -49,7 +50,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
 <tag_station></tag_station>
-<other_station>1626.p352</other_station>
+<other_station>1626.352.1</other_station>
 <other_description></other_description>
 <bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
diff --git a/entrance_data/1626-E16.html b/entrance_data/1626-E16.html
deleted file mode 100644
index 572e8afe2..000000000
--- a/entrance_data/1626-E16.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 27, 2023, 1:05 p.m. UTC using the form documented at handbook/survey/ententry.html -->
-<!-- If you edit this file by hand, and manually upload it to the server using git,
-make sure you update the database by doing a full data import. If you edit it using the online form
-though, you do not need to do a data import as it happens automatically -->
-
-    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
-    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
-    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<b>This file is generated by troggle</b> on July 27, 2023, 1:05 p.m. UTC using the form documented at 
-<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
-<br>
-<entrance>
-<non_public>False</non_public>
- <!-- <slug> ignored, not needed. Now using filename -->
- <!-- <slug> ignored, not needed. Now using filename -->
-<name></name>
-<entrance_description></entrance_description>
-<explorers></explorers>
-<map_description></map_description>
-<location_description>Totes Gebirge, Österreich - Loser/Augst-Eck Plateau
-<br>GPS-Punkt E16</location_description>
-<lastvisit>2009.08.03</lastvisit>
-<approach></approach>
-<underground_description></underground_description>
-<photo></photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking>?</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability></findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings></bearings>
-<url></url>
-</entrance>
-</body>
-</html>