moving cave and water terrain images to subfolder, had to merge with 15626, hope i merged correctly.

data/terrain-graphics.cfg

@@ -222,9 +222,9 @@
 
 #Single hex Cave lit by Beam of Light
 #33% 33% 33%
-{SHEX Uui         overlay 33  cave-beam3}
-{SHEX Uui         overlay 50  cave-beam2}
-{SHEX Uui         overlay 100 cave-beam1}
+{SHEX Uui         overlay 33  cave/beam3}
+{SHEX Uui         overlay 50  cave/beam2}
+{SHEX Uui         overlay 100 cave/beam1}
 
 {SHEX (Ss,Vs,Chs) overlay 10  reed3}
 {SHEX (Ss,Vs,Chs) overlay 20  reed1}
@@ -354,11 +354,11 @@
 {TERRAIN_BASE (Vhg,Veg) grassland-r1}
 {TERRAIN_BASE (Vha,Vea) snow}
 {TERRAIN_BASE Vd*       desert}
-{TERRAIN_BASE Vu*       cave-floor1}
+{TERRAIN_BASE Vu*       cave/floor1}
 {TERRAIN_BASE Vhh       hills-variation1}
 {TERRAIN_BASE Vhha      snow-hills}
 {TERRAIN_BASE Vht       savanna}
-{TERRAIN_BASE Vwm       coast}
+{TERRAIN_BASE Vwm       ater/coast}
 {TERRAIN_BASE Vs        swampwater}
 #{TERRAIN_BASE b mountains}
 
@@ -377,18 +377,18 @@
 #
 
 #10% 3% 13% 7% 67%
-{TERRAIN_BASE_PROB  (Uu*,Uf)          cave-floor4		       10}
-{TERRAIN_BASE_PROB  (Uu*,Uf)          cave-floor3		       3}
-{TERRAIN_BASE_PROB  (Uu*,Uf)          cave-floor2		       15}
-{TERRAIN_BASE_PROB  (Uu*,Uf)          cave-floor		       10}
-{TERRAIN_BASE       (Uu*,Uf)          cave-floor1}
+{TERRAIN_BASE_PROB  (Uu*,Uf)          cave/floor4		       10}
+{TERRAIN_BASE_PROB  (Uu*,Uf)          cave/floor3		       3}
+{TERRAIN_BASE_PROB  (Uu*,Uf)          cave/floor2		       15}
+{TERRAIN_BASE_PROB  (Uu*,Uf)          cave/floor		       10}
+{TERRAIN_BASE       (Uu*,Uf)          cave/floor1}
 
-{TERRAIN_BASE       Xu                cavewall}
+{TERRAIN_BASE       Xu                cave/wall-rough}
 
 #33% 33% 33%
-{TERRAIN_BASE_PROB  Uh                cave-hills-variation1    33}
-{TERRAIN_BASE_PROB  Uh                cave-hills-variation2    50}
-{TERRAIN_BASE       Uh                cave-hills-variation3}
+{TERRAIN_BASE_PROB  Uh                cave/hills-variation1    33}
+{TERRAIN_BASE_PROB  Uh                cave/hills-variation2    50}
+{TERRAIN_BASE       Uh                cave/hills-variation3}
 
 #33% 33% 33%
 {TERRAIN_BASE_PROB  Hh                hills-variation1         33}
@@ -496,18 +496,18 @@
 
 #set them to 33 for some irregulrity
 #33% 67%
-{TERRAIN_BASE_PROB  Wwf               ford2                    33}
-{TERRAIN_BASE       Wwf               ford}
+{TERRAIN_BASE_PROB  Wwf               water/ford2                    33}
+{TERRAIN_BASE       Wwf               water/ford}
 
 #30% 30% 40%
-{TERRAIN_BASE_PROB  (Wo,Bwo*)         ocean3                   30}
-{TERRAIN_BASE_PROB  (Wo,Bwo*)         ocean2                   43}
-{TERRAIN_BASE       (Wo,Bwo*)         ocean}
+{TERRAIN_BASE_PROB  (Wo,Bwo*)         water/ocean3                   30}
+{TERRAIN_BASE_PROB  (Wo,Bwo*)         water/ocean2                   43}
+{TERRAIN_BASE       (Wo,Bwo*)         water/ocean}
 
 #30% 30% 40%
-{TERRAIN_BASE_PROB  (Ww,Bww*)         coast3                   30}
-{TERRAIN_BASE_PROB  (Ww,Bww*)         coast2                   43}
-{TERRAIN_BASE       (Ww,Bww*)         coast}
+{TERRAIN_BASE_PROB  (Ww,Bww*)         water/coast3                   30}
+{TERRAIN_BASE_PROB  (Ww,Bww*)         water/coast2                   43}
+{TERRAIN_BASE       (Ww,Bww*)         water/coast}
 
 
 #{TERRAIN_BASE       ~                 fog}
@@ -902,9 +902,9 @@
 {TERRAIN_ADJACENT          -180    Hd               (!,Hd,Qxu)                           desert-hills}
 {TERRAIN_ADJACENT          -190    (Hh,Vhh)         (!,Hh,Vhh,W*,B*,Vwm,Vs,Ss)           hills}
 {TERRAIN_ADJACENT_CUSTOM   -191    (Hh,Vhh)         (W*,B*,Vwm,Vs,Ss)                    hills transition2}
-{TERRAIN_ADJACENT          -200    Uh               (!,Uh)                               cave-hills}
+{TERRAIN_ADJACENT          -200    Uh               (!,Uh)                               cave/hills}
 
-{TERRAIN_ADJACENT          -210    (U*,Vu*)         (!,U*,Vu*)                           cave-floor}
+{TERRAIN_ADJACENT          -210    (U*,Vu*)         (!,U*,Vu*)                           cave/floor}
 {TERRAIN_ADJACENT          -220    Ql               (!,Ql,Qxu,Xu)                        lava}
 {TERRAIN_ADJACENT          -230    (Fa,Aa,Vha,Vea)  (W*,B*,Vwm,Vs,Ss)                    snow-to-water}
 {TERRAIN_ADJACENT          -240    (Fa,Aa,Vha,Vea)  (!,Fa,Aa,Vha,Vea,Qxu)                snow}
@@ -940,12 +940,12 @@
 {TERRAIN_ADJACENT_CUSTOM   -510    Ai               (W*,B*,Vwm,Vs,Ss)  ice-to-water    submerged_part}
 {TERRAIN_ADJACENT          -503    Ai               (!,Ai,Qxu)                           ice}
 
-{TERRAIN_ADJACENT          -520    (Ww,Vwm,Bww*)    (!,Ww,Vwm,Bww*,Mm)                   coast}
-{TERRAIN_ADJACENT          -530    Wwf              (!,Wwf)                              ford}
-{TERRAIN_ADJACENT          -540    (Wo,Bwo*)        (!,Wo,Bwo*)                          ocean}
+{TERRAIN_ADJACENT          -520    (Ww,Vwm,Bww*)    (!,Ww,Vwm,Bww*,Mm)                   water/coast}
+{TERRAIN_ADJACENT          -530    Wwf              (!,Wwf)                              water/ford}
+{TERRAIN_ADJACENT          -540    (Wo,Bwo*)        (!,Wo,Bwo*)                          water/ocean}
 {TERRAIN_ADJACENT_CUSTOM   -550    Chw              (Ch,Chr)             sunken-ruin     transition2}
 {TERRAIN_ADJACENT_CUSTOM   -550    Chs              (Ch,Chr)             swampwater      transition2}
-{TERRAIN_ADJACENT          -560    Chw              (!,Chw,Chr)                          coast}
+{TERRAIN_ADJACENT          -560    Chw              (!,Chw,Chr)                          water/coast}
 {TERRAIN_ADJACENT          -570    (!,Chr,Chw)      Chr                                  grassland}
 
 {TERRAIN_BASE_DEFAULT void}

data/terrain.cfg

@@ -573,7 +573,7 @@ char=]
 [/terrain]
 
 [terrain]
-symbol_image=cave-hills-variation1
+symbol_image=cave/hills-variation1
 id=rocky_cave
 name= _ "Rockbound Cave"
 string=Uh
@@ -583,7 +583,7 @@ mvt_alias=-,Uu, Hh
 [/terrain]
 
 [terrain]
-symbol_image=cave-floor1
+symbol_image=cave/floor1
 id=cave
 name= _ "Cave"
 string=Uu
@@ -591,7 +591,7 @@ char=u
 [/terrain]
 
 [terrain]
-symbol_image=cave-beam-tile
+symbol_image=cave/beam-tile
 id=cave_beam
 name= _ "Cave Lit"
 string=Uui
@@ -779,7 +779,7 @@ gives_income=true
 #
 
 [terrain]
-symbol_image=ocean
+symbol_image=water/ocean
 id=deep_water
 name= _ "Deep Water"
 string=Wo
@@ -789,7 +789,7 @@ unit_height_adjust=-3
 [/terrain]
 
 [terrain]
-symbol_image=coast
+symbol_image=water/coast
 id=shallow_water
 name= _ "Shallow Water"
 char=c
@@ -800,7 +800,7 @@ unit_height_adjust=-4
 
 
 [terrain]
-symbol_image=ford
+symbol_image=water/ford
 id=ford
 name= _ "River Ford"
 string=Wwf
@@ -824,7 +824,7 @@ aliasof=Xu
 [/terrain]
 
 [terrain]
-symbol_image=cavewall
+symbol_image=cave/wall-rough
 id=cavewall
 name= _ "Cave Wall"
 string=Xu