diff --git a/Templates/Empty/game/core/art/water/depthcolor_ramp.png b/Templates/Empty/game/art/water/depthcolor_ramp.png
similarity index 100%
rename from Templates/Empty/game/core/art/water/depthcolor_ramp.png
rename to Templates/Empty/game/art/water/depthcolor_ramp.png
diff --git a/Templates/Empty/game/core/art/water/foam.dds b/Templates/Empty/game/art/water/foam.dds
similarity index 100%
rename from Templates/Empty/game/core/art/water/foam.dds
rename to Templates/Empty/game/art/water/foam.dds
diff --git a/Templates/Empty/game/core/art/water/ripple.dds b/Templates/Empty/game/art/water/ripple.dds
similarity index 100%
rename from Templates/Empty/game/core/art/water/ripple.dds
rename to Templates/Empty/game/art/water/ripple.dds
diff --git a/Templates/Empty/game/core/art/water/foam.png b/Templates/Empty/game/core/art/water/foam.png
deleted file mode 100644
index d86c95716..000000000
Binary files a/Templates/Empty/game/core/art/water/foam.png and /dev/null differ
diff --git a/Templates/Empty/game/core/art/water/lava_depthcolor_ramp.png b/Templates/Empty/game/core/art/water/lava_depthcolor_ramp.png
deleted file mode 100644
index 8950e2064..000000000
Binary files a/Templates/Empty/game/core/art/water/lava_depthcolor_ramp.png and /dev/null differ
diff --git a/Templates/Empty/game/core/art/water/lava_foam.dds b/Templates/Empty/game/core/art/water/lava_foam.dds
deleted file mode 100644
index 78e4f3787..000000000
Binary files a/Templates/Empty/game/core/art/water/lava_foam.dds and /dev/null differ
diff --git a/Templates/Empty/game/core/art/water/river_depthcolor_ramp.png b/Templates/Empty/game/core/art/water/river_depthcolor_ramp.png
deleted file mode 100644
index df43b86a9..000000000
Binary files a/Templates/Empty/game/core/art/water/river_depthcolor_ramp.png and /dev/null differ
diff --git a/Templates/Empty/game/core/art/water/riversuds.dds b/Templates/Empty/game/core/art/water/riversuds.dds
deleted file mode 100644
index 11e093d85..000000000
Binary files a/Templates/Empty/game/core/art/water/riversuds.dds and /dev/null differ
diff --git a/Templates/Empty/game/core/art/water/riversuds.png b/Templates/Empty/game/core/art/water/riversuds.png
deleted file mode 100644
index ae6c75d4d..000000000
Binary files a/Templates/Empty/game/core/art/water/riversuds.png and /dev/null differ
diff --git a/Templates/Empty/game/core/art/water/wateredge512.dds b/Templates/Empty/game/core/art/water/wateredge512.dds
deleted file mode 100644
index 90131022d..000000000
Binary files a/Templates/Empty/game/core/art/water/wateredge512.dds and /dev/null differ
diff --git a/Templates/Empty/game/tools/riverEditor/riverEditorGui.cs b/Templates/Empty/game/tools/riverEditor/riverEditorGui.cs
index 162ad46ee..562838620 100644
--- a/Templates/Empty/game/tools/riverEditor/riverEditorGui.cs
+++ b/Templates/Empty/game/tools/riverEditor/riverEditorGui.cs
@@ -76,10 +76,10 @@ function RiverEditorGui::createRiver( %this )
 
       baseColor = "45 108 171 255";
       
-      rippleTex = "core/art/water/ripple.dds";
-      foamTex = "core/art/water/foam";
+      rippleTex = "art/water/ripple.dds";
+      foamTex = "art/water/foam";
       cubemap = "DefaultSkyCubemap";
-      depthGradientTex = "core/art/water/depthcolor_ramp";
+      depthGradientTex = "art/water/depthcolor_ramp";
    };
    
    return %river;
diff --git a/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
index 84b8f44bb..a2932525c 100644
--- a/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
+++ b/Templates/Empty/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
@@ -797,9 +797,9 @@ function ObjectBuilderGui::addWaterObjectFields(%this)
    %this.addField("waveSpeed[2]", "TypeFloat", "Wave Speed", "1");
    %this.addField("overallWaveMagnitude", "TypeFloat", "Overall Wave Magnitude", "1.0");
    
-   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "core/art/water/ripple" );
-   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "core/art/water/depthcolor_ramp" );
-   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "core/art/water/foam" );
+   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
+   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
+   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
    %this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
 }
 
diff --git a/Templates/Full/game/core/art/water/depthcolor_ramp.png b/Templates/Full/game/art/water/depthcolor_ramp.png
similarity index 100%
rename from Templates/Full/game/core/art/water/depthcolor_ramp.png
rename to Templates/Full/game/art/water/depthcolor_ramp.png
diff --git a/Templates/Full/game/core/art/water/foam.dds b/Templates/Full/game/art/water/foam.dds
similarity index 100%
rename from Templates/Full/game/core/art/water/foam.dds
rename to Templates/Full/game/art/water/foam.dds
diff --git a/Templates/Full/game/core/art/water/ripple.dds b/Templates/Full/game/art/water/ripple.dds
similarity index 100%
rename from Templates/Full/game/core/art/water/ripple.dds
rename to Templates/Full/game/art/water/ripple.dds
diff --git a/Templates/Full/game/core/art/water/foam.png b/Templates/Full/game/core/art/water/foam.png
deleted file mode 100644
index d86c95716..000000000
Binary files a/Templates/Full/game/core/art/water/foam.png and /dev/null differ
diff --git a/Templates/Full/game/core/art/water/lava_depthcolor_ramp.png b/Templates/Full/game/core/art/water/lava_depthcolor_ramp.png
deleted file mode 100644
index 8950e2064..000000000
Binary files a/Templates/Full/game/core/art/water/lava_depthcolor_ramp.png and /dev/null differ
diff --git a/Templates/Full/game/core/art/water/lava_foam.dds b/Templates/Full/game/core/art/water/lava_foam.dds
deleted file mode 100644
index 78e4f3787..000000000
Binary files a/Templates/Full/game/core/art/water/lava_foam.dds and /dev/null differ
diff --git a/Templates/Full/game/core/art/water/river_depthcolor_ramp.png b/Templates/Full/game/core/art/water/river_depthcolor_ramp.png
deleted file mode 100644
index df43b86a9..000000000
Binary files a/Templates/Full/game/core/art/water/river_depthcolor_ramp.png and /dev/null differ
diff --git a/Templates/Full/game/core/art/water/riversuds.dds b/Templates/Full/game/core/art/water/riversuds.dds
deleted file mode 100644
index 11e093d85..000000000
Binary files a/Templates/Full/game/core/art/water/riversuds.dds and /dev/null differ
diff --git a/Templates/Full/game/core/art/water/riversuds.png b/Templates/Full/game/core/art/water/riversuds.png
deleted file mode 100644
index ae6c75d4d..000000000
Binary files a/Templates/Full/game/core/art/water/riversuds.png and /dev/null differ
diff --git a/Templates/Full/game/core/art/water/wateredge512.dds b/Templates/Full/game/core/art/water/wateredge512.dds
deleted file mode 100644
index 90131022d..000000000
Binary files a/Templates/Full/game/core/art/water/wateredge512.dds and /dev/null differ
diff --git a/Templates/Full/game/tools/riverEditor/riverEditorGui.cs b/Templates/Full/game/tools/riverEditor/riverEditorGui.cs
index 162ad46ee..562838620 100644
--- a/Templates/Full/game/tools/riverEditor/riverEditorGui.cs
+++ b/Templates/Full/game/tools/riverEditor/riverEditorGui.cs
@@ -76,10 +76,10 @@ function RiverEditorGui::createRiver( %this )
 
       baseColor = "45 108 171 255";
       
-      rippleTex = "core/art/water/ripple.dds";
-      foamTex = "core/art/water/foam";
+      rippleTex = "art/water/ripple.dds";
+      foamTex = "art/water/foam";
       cubemap = "DefaultSkyCubemap";
-      depthGradientTex = "core/art/water/depthcolor_ramp";
+      depthGradientTex = "art/water/depthcolor_ramp";
    };
    
    return %river;
diff --git a/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui b/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
index 84b8f44bb..a2932525c 100644
--- a/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
+++ b/Templates/Full/game/tools/worldEditor/gui/objectBuilderGui.ed.gui
@@ -797,9 +797,9 @@ function ObjectBuilderGui::addWaterObjectFields(%this)
    %this.addField("waveSpeed[2]", "TypeFloat", "Wave Speed", "1");
    %this.addField("overallWaveMagnitude", "TypeFloat", "Overall Wave Magnitude", "1.0");
    
-   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "core/art/water/ripple" );
-   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "core/art/water/depthcolor_ramp" );
-   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "core/art/water/foam" );
+   %this.addField("rippleTex", "TypeImageFilename", "Ripple Texture", "art/water/ripple" );
+   %this.addField("depthGradientTex", "TypeImageFilename", "Depth Gradient Texture", "art/water/depthcolor_ramp" );
+   %this.addField("foamTex", "TypeImageFilename", "Foam Texture", "art/water/foam" );
    %this.addField("cubemap", "TypeRealString", "Cubemap", "DefaultSkyCubemap" );
 }