diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d7000aa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# Unneeded NL2 files
+*.nl2park_backup
+*.nl2pkg
+
+# Display shell files
+scenery/display_shell
+
+# Zip files
+*.zip
+
+# TODO file
+TODO.txt
+
+# Generated by MacOS
+.DS_Store
+
+# Generated by Windows
+Thumbs.db
diff --git a/LICENSE b/LICENSE
index 2afa00a..7f76aa3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 David Wolfe (Red-Thirten)
+Copyright (c) 2024 David Wolfe (Red-Thirten)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Reds-Speakers.nl2park b/Reds-Speakers.nl2park
index 7567be1..2ce9f98 100644
Binary files a/Reds-Speakers.nl2park and b/Reds-Speakers.nl2park differ
diff --git a/scenery/reds_speakers/JBL Speaker.nl2sco b/scenery/reds_speakers/JBL Speaker.nl2sco
index fcbbbc1..6d8647d 100644
--- a/scenery/reds_speakers/JBL Speaker.nl2sco	
+++ b/scenery/reds_speakers/JBL Speaker.nl2sco	
@@ -6,7 +6,7 @@
       <clip distance="70"/>
     </model>
     <description>A &quot;JBL&quot; style speaker, with recolorable mount, speaker rotation, and audio options.</description>
-    <preview>textures/previews/jbl_speaker.png</preview>
+    <preview>materials/previews/jbl_speaker.png</preview>
     <usercolor>
       <label>Mount Color</label>
       <index>0</index>
@@ -27,14 +27,14 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/normal_loop.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file</id>
       <description>An Audio File that plays on loop, assuming no other events are occuring (ie. A specified coaster is E-Stopped),</description>
       <label>Looped Audio (Leave empty for no sound):</label>
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/announcement.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_emergency</id>
       <description>An Audio File that should be played when the specified coaster is E-Stopped.</description>
       <label>E-Stop Audio (Leave empty for no sound):</label>
@@ -47,7 +47,7 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/trigger_example.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_trigger</id>
       <description>An Audio File that should be played when the specified coaster trigger is activated.</description>
       <label>Triggered Audio (Leave empty for no sound):</label>
@@ -74,7 +74,7 @@
     </scriptparameter>
     <scriptparameter>
       <type>double</type>
-      <defaultvalue>0.8</defaultvalue>
+      <defaultvalue>1</defaultvalue>
       <id>gain</id>
       <description>Gain of the Audio. Higher values result in louder audio.</description>
       <label>Audio Gain (0.0 to 1.0):</label>
@@ -86,14 +86,14 @@
       <description>Pitch (Speed) of the Audio File</description>
       <label>Audio Pitch (0.1 to 10.0):</label>
     </scriptparameter>
-    <materialpath name="aluminum">textures/case_metal_light.nl2mat</materialpath>
-    <materialpath name="black">textures/plastic_black.nl2mat</materialpath>
-    <materialpath name="case_metal">textures/case_metal.nl2mat</materialpath>
+    <materialpath name="aluminum">materials/case_metal_light.nl2mat</materialpath>
+    <materialpath name="black">materials/plastic_black.nl2mat</materialpath>
+    <materialpath name="case_metal">materials/case_metal.nl2mat</materialpath>
     <materialpath name="chrome">intern:data/materials/Chrome.nl2mat</materialpath>
-    <materialpath name="fabric">textures/fabric.nl2mat</materialpath>
-    <materialpath name="logo">textures/red_audio_logo.nl2mat</materialpath>
+    <materialpath name="fabric">materials/fabric.nl2mat</materialpath>
+    <materialpath name="logo">materials/red_audio_logo.nl2mat</materialpath>
     <materialpath name="mount">intern:data/materials/metal/Metal A User0.nl2mat</materialpath>
-    <materialpath name="red_plastic">textures/plastic_red.nl2mat</materialpath>
-    <materialpath name="white_plastic">textures/plastic_white.nl2mat</materialpath>
+    <materialpath name="red_plastic">materials/plastic_red.nl2mat</materialpath>
+    <materialpath name="white_plastic">materials/plastic_white.nl2mat</materialpath>
   </sceneobject>
 </root>
\ No newline at end of file
diff --git a/scenery/reds_speakers/LICENSE b/scenery/reds_speakers/LICENSE
index 2afa00a..7f76aa3 100644
--- a/scenery/reds_speakers/LICENSE
+++ b/scenery/reds_speakers/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 David Wolfe (Red-Thirten)
+Copyright (c) 2024 David Wolfe (Red-Thirten)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/scenery/reds_speakers/Long Speaker.nl2sco b/scenery/reds_speakers/Long Speaker.nl2sco
index b71945d..43e307a 100644
--- a/scenery/reds_speakers/Long Speaker.nl2sco	
+++ b/scenery/reds_speakers/Long Speaker.nl2sco	
@@ -6,7 +6,7 @@
       <clip distance="70"/>
     </model>
     <description>A long, recollorable, outdoor style speaker, with angle and audio options.</description>
-    <preview>textures/previews/long_speaker.png</preview>
+    <preview>materials/previews/long_speaker.png</preview>
     <usercolor>
       <label>Mount Color</label>
       <index>0</index>
@@ -37,14 +37,14 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/normal_loop.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file</id>
       <description>An Audio File that plays on loop, assuming no other events are occuring (ie. A specified coaster is E-Stopped),</description>
       <label>Looped Audio (Leave empty for no sound):</label>
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/announcement.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_emergency</id>
       <description>An Audio File that should be played when the specified coaster is E-Stopped.</description>
       <label>E-Stop Audio (Leave empty for no sound):</label>
@@ -57,7 +57,7 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/trigger_example.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_trigger</id>
       <description>An Audio File that should be played when the specified coaster trigger is activated.</description>
       <label>Triggered Audio (Leave empty for no sound):</label>
@@ -84,7 +84,7 @@
     </scriptparameter>
     <scriptparameter>
       <type>double</type>
-      <defaultvalue>0.8</defaultvalue>
+      <defaultvalue>1</defaultvalue>
       <id>gain</id>
       <description>Gain of the Audio. Higher values result in louder audio.</description>
       <label>Audio Gain (0.0 to 1.0):</label>
@@ -96,12 +96,12 @@
       <description>Pitch (Speed) of the Audio File</description>
       <label>Audio Pitch (0.1 to 10.0):</label>
     </scriptparameter>
-    <materialpath name="aluminum">textures/case_metal_light.nl2mat</materialpath>
-    <materialpath name="black">textures/plastic_black.nl2mat</materialpath>
+    <materialpath name="aluminum">materials/case_metal_light.nl2mat</materialpath>
+    <materialpath name="black">materials/plastic_black.nl2mat</materialpath>
     <materialpath name="chrome">intern:data/materials/Chrome.nl2mat</materialpath>
-    <materialpath name="logo">textures/red_audio_logo.nl2mat</materialpath>
+    <materialpath name="logo">materials/red_audio_logo.nl2mat</materialpath>
     <materialpath name="mount">intern:data/materials/metal/Metal A User0.nl2mat</materialpath>
-    <materialpath name="plastic">textures/plastic_user1.nl2mat</materialpath>
-    <materialpath name="speaker_grill">textures/metal_grill_user2.nl2mat</materialpath>
+    <materialpath name="plastic">materials/plastic_user1.nl2mat</materialpath>
+    <materialpath name="speaker_grill">materials/metal_grill_user2.nl2mat</materialpath>
   </sceneobject>
 </root>
\ No newline at end of file
diff --git a/scenery/reds_speakers/Loud Speaker.nl2sco b/scenery/reds_speakers/Loud Speaker.nl2sco
index 4b9579e..a58ad61 100644
--- a/scenery/reds_speakers/Loud Speaker.nl2sco	
+++ b/scenery/reds_speakers/Loud Speaker.nl2sco	
@@ -6,7 +6,7 @@
       <clip distance="40"/>
     </model>
     <description>A recolorable, old school loud speaker, with speaker rotation, and audio options.</description>
-    <preview>textures/previews/loud_speaker.png</preview>
+    <preview>materials/previews/loud_speaker.png</preview>
     <param basescalex="1.5"/>
     <param basescaley="1.5"/>
     <param basescalez="1.5"/>
@@ -35,14 +35,14 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/normal_loop.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file</id>
       <description>An Audio File that plays on loop, assuming no other events are occuring (ie. A specified coaster is E-Stopped),</description>
       <label>Looped Audio (Leave empty for no sound):</label>
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/announcement.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_emergency</id>
       <description>An Audio File that should be played when the specified coaster is E-Stopped.</description>
       <label>E-Stop Audio (Leave empty for no sound):</label>
@@ -55,7 +55,7 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/trigger_example.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_trigger</id>
       <description>An Audio File that should be played when the specified coaster trigger is activated.</description>
       <label>Triggered Audio (Leave empty for no sound):</label>
@@ -82,7 +82,7 @@
     </scriptparameter>
     <scriptparameter>
       <type>double</type>
-      <defaultvalue>0.8</defaultvalue>
+      <defaultvalue>1</defaultvalue>
       <id>gain</id>
       <description>Gain of the Audio. Higher values result in louder audio.</description>
       <label>Audio Gain (0.0 to 1.0):</label>
@@ -94,12 +94,12 @@
       <description>Pitch (Speed) of the Audio File</description>
       <label>Audio Pitch (0.1 to 10.0):</label>
     </scriptparameter>
-    <materialpath name="black">textures/plastic_black.nl2mat</materialpath>
+    <materialpath name="black">materials/plastic_black.nl2mat</materialpath>
     <materialpath name="bolt">intern:data/materials/Chrome.nl2mat</materialpath>
-    <materialpath name="front_logo">textures/red_audio_logo.nl2mat</materialpath>
+    <materialpath name="front_logo">materials/red_audio_logo.nl2mat</materialpath>
     <materialpath name="mount">intern:data/materials/metal/Metal A User0.nl2mat</materialpath>
-    <materialpath name="plastic">textures/plastic_user1.nl2mat</materialpath>
-    <materialpath name="rear_logo">textures/loud_speaker_rear_logo.nl2mat</materialpath>
-    <materialpath name="speaker_bump">textures/loud_speaker_bump.nl2mat</materialpath>
+    <materialpath name="plastic">materials/plastic_user1.nl2mat</materialpath>
+    <materialpath name="rear_logo">materials/loud_speaker_rear_logo.nl2mat</materialpath>
+    <materialpath name="speaker_bump">materials/loud_speaker_bump.nl2mat</materialpath>
   </sceneobject>
 </root>
\ No newline at end of file
diff --git a/scenery/reds_speakers/Outdoor Speaker.nl2sco b/scenery/reds_speakers/Outdoor Speaker.nl2sco
index 9543121..b14c575 100644
--- a/scenery/reds_speakers/Outdoor Speaker.nl2sco	
+++ b/scenery/reds_speakers/Outdoor Speaker.nl2sco	
@@ -5,7 +5,7 @@
       <clip distance="40"/>
     </model>
     <description>A recolorable outdoor speaker (typically used in planters), with audio options.</description>
-    <preview>textures/previews/outdoor_speaker.png</preview>
+    <preview>materials/previews/outdoor_speaker.png</preview>
     <param lockonterrain="true"/>
     <usercolor>
       <label>Speaker Color</label>
@@ -23,23 +23,16 @@
       <sharedvm>true</sharedvm>
       <resource id="LICENSE">LICENSE</resource>
     </script>
-    <scriptparameter>
-      <type>double</type>
-      <defaultvalue>0</defaultvalue>
-      <id>angle</id>
-      <description>This setting will only become visable in Play Mode. Angle in degrees from the default angle (can be negative as well).</description>
-      <label>Speaker Angle (Degrees):</label>
-    </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/normal_loop.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file</id>
       <description>An Audio File that plays on loop, assuming no other events are occuring (ie. A specified coaster is E-Stopped),</description>
       <label>Looped Audio (Leave empty for no sound):</label>
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/announcement.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_emergency</id>
       <description>An Audio File that should be played when the specified coaster is E-Stopped.</description>
       <label>E-Stop Audio (Leave empty for no sound):</label>
@@ -52,7 +45,7 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/trigger_example.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_trigger</id>
       <description>An Audio File that should be played when the specified coaster trigger is activated.</description>
       <label>Triggered Audio (Leave empty for no sound):</label>
@@ -79,7 +72,7 @@
     </scriptparameter>
     <scriptparameter>
       <type>double</type>
-      <defaultvalue>0.8</defaultvalue>
+      <defaultvalue>1</defaultvalue>
       <id>gain</id>
       <description>Gain of the Audio. Higher values result in louder audio.</description>
       <label>Audio Gain (0.0 to 1.0):</label>
@@ -91,9 +84,9 @@
       <description>Pitch (Speed) of the Audio File</description>
       <label>Audio Pitch (0.1 to 10.0):</label>
     </scriptparameter>
-    <materialpath name="fabric">textures/fabric.nl2mat</materialpath>
-    <materialpath name="outdoor_speaker_bump">textures/outdoor_speaker_bump.nl2mat</materialpath>
-    <materialpath name="plastic1">textures/plastic_user1.nl2mat</materialpath>
-    <materialpath name="plastic2">textures/plastic_user2.nl2mat</materialpath>
+    <materialpath name="fabric">materials/fabric.nl2mat</materialpath>
+    <materialpath name="outdoor_speaker_bump">materials/outdoor_speaker_bump.nl2mat</materialpath>
+    <materialpath name="plastic1">materials/plastic_user1.nl2mat</materialpath>
+    <materialpath name="plastic2">materials/plastic_user2.nl2mat</materialpath>
   </sceneobject>
 </root>
\ No newline at end of file
diff --git a/scenery/reds_speakers/Small Speaker.nl2sco b/scenery/reds_speakers/Small Speaker.nl2sco
index 3c41f1a..9f2b712 100644
--- a/scenery/reds_speakers/Small Speaker.nl2sco	
+++ b/scenery/reds_speakers/Small Speaker.nl2sco	
@@ -6,7 +6,7 @@
       <clip distance="50"/>
     </model>
     <description>A small, recollorable, outdoor style speaker, with angle and audio options.</description>
-    <preview>textures/previews/small_speaker.png</preview>
+    <preview>materials/previews/small_speaker.png</preview>
     <usercolor>
       <label>Mount Color</label>
       <index>0</index>
@@ -37,14 +37,14 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/normal_loop.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file</id>
       <description>An Audio File that plays on loop, assuming no other events are occuring (ie. A specified coaster is E-Stopped),</description>
       <label>Looped Audio (Leave empty for no sound):</label>
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/announcement.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_emergency</id>
       <description>An Audio File that should be played when the specified coaster is E-Stopped.</description>
       <label>E-Stop Audio (Leave empty for no sound):</label>
@@ -57,7 +57,7 @@
     </scriptparameter>
     <scriptparameter>
       <type filetype="audio">resourcepath</type>
-      <defaultvalue>sounds/trigger_example.ogg</defaultvalue>
+      <defaultvalue></defaultvalue>
       <id>audio_file_trigger</id>
       <description>An Audio File that should be played when the specified coaster trigger is activated.</description>
       <label>Triggered Audio (Leave empty for no sound):</label>
@@ -84,7 +84,7 @@
     </scriptparameter>
     <scriptparameter>
       <type>double</type>
-      <defaultvalue>0.8</defaultvalue>
+      <defaultvalue>1</defaultvalue>
       <id>gain</id>
       <description>Gain of the Audio. Higher values result in louder audio.</description>
       <label>Audio Gain (0.0 to 1.0):</label>
@@ -96,13 +96,13 @@
       <description>Pitch (Speed) of the Audio File</description>
       <label>Audio Pitch (0.1 to 10.0):</label>
     </scriptparameter>
-    <materialpath name="aluminum">textures/case_metal_light.nl2mat</materialpath>
-    <materialpath name="black">textures/plastic_black.nl2mat</materialpath>
+    <materialpath name="aluminum">materials/case_metal_light.nl2mat</materialpath>
+    <materialpath name="black">materials/plastic_black.nl2mat</materialpath>
     <materialpath name="chrome">intern:data/materials/Chrome.nl2mat</materialpath>
-    <materialpath name="logo">textures/red_audio_logo.nl2mat</materialpath>
+    <materialpath name="logo">materials/red_audio_logo.nl2mat</materialpath>
     <materialpath name="mount">intern:data/materials/metal/Metal A User0.nl2mat</materialpath>
-    <materialpath name="plastic1">textures/plastic_user1.nl2mat</materialpath>
-    <materialpath name="plastic2">textures/plastic_user2.nl2mat</materialpath>
-    <materialpath name="speaker_grill">textures/metal_grill_user2.nl2mat</materialpath>
+    <materialpath name="plastic1">materials/plastic_user1.nl2mat</materialpath>
+    <materialpath name="plastic2">materials/plastic_user2.nl2mat</materialpath>
+    <materialpath name="speaker_grill">materials/metal_grill_user2.nl2mat</materialpath>
   </sceneobject>
 </root>
\ No newline at end of file
diff --git a/scenery/reds_speakers/textures/case_metal.nl2mat b/scenery/reds_speakers/materials/case_metal.nl2mat
similarity index 77%
rename from scenery/reds_speakers/textures/case_metal.nl2mat
rename to scenery/reds_speakers/materials/case_metal.nl2mat
index ae3dace..5e83154 100644
--- a/scenery/reds_speakers/textures/case_metal.nl2mat
+++ b/scenery/reds_speakers/materials/case_metal.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>Black textured metal.</description>
-    <preview>materials/metal_29_col.jpg</preview>
+    <preview>textures/metal_29_col.jpg</preview>
     <renderpass>
       <shadercore>Result = tex0;
 Specular = Add(0.2, tex0);</shadercore>
@@ -10,11 +10,11 @@ Specular = Add(0.2, tex0);</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/metal_29_col.jpg</map>
+        <map>textures/metal_29_col.jpg</map>
         <tcgen mode="base"/>
       </texunit>
       <texunit>
-        <map>materials/metal_29_nrm.jpg</map>
+        <map>textures/metal_29_nrm.jpg</map>
         <bump mode="normalgloss"/>
         <tcgen mode="base"/>
       </texunit>
diff --git a/scenery/reds_speakers/textures/case_metal_light.nl2mat b/scenery/reds_speakers/materials/case_metal_light.nl2mat
similarity index 78%
rename from scenery/reds_speakers/textures/case_metal_light.nl2mat
rename to scenery/reds_speakers/materials/case_metal_light.nl2mat
index 1ad8aeb..177b494 100644
--- a/scenery/reds_speakers/textures/case_metal_light.nl2mat
+++ b/scenery/reds_speakers/materials/case_metal_light.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>Black textured metal (light).</description>
-    <preview>materials/metal_29_col.jpg</preview>
+    <preview>textures/metal_29_col.jpg</preview>
     <renderpass>
       <shadercore>Result = Add(0.1, tex0);
 Specular = Add(0.2, tex0);</shadercore>
@@ -10,11 +10,11 @@ Specular = Add(0.2, tex0);</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/metal_29_col.jpg</map>
+        <map>textures/metal_29_col.jpg</map>
         <tcgen mode="base"/>
       </texunit>
       <texunit>
-        <map>materials/metal_29_nrm.jpg</map>
+        <map>textures/metal_29_nrm.jpg</map>
         <bump mode="normalgloss"/>
         <tcgen mode="base"/>
       </texunit>
diff --git a/scenery/reds_speakers/textures/fabric.nl2mat b/scenery/reds_speakers/materials/fabric.nl2mat
similarity index 77%
rename from scenery/reds_speakers/textures/fabric.nl2mat
rename to scenery/reds_speakers/materials/fabric.nl2mat
index d77972a..276668c 100644
--- a/scenery/reds_speakers/textures/fabric.nl2mat
+++ b/scenery/reds_speakers/materials/fabric.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>Speaker fabric.</description>
-    <preview>materials/fabric_29_col.jpg</preview>
+    <preview>textures/fabric_29_col.jpg</preview>
     <renderpass>
       <shadercore>Result = tex0;
 Specular = Add(0.03, tex0);
@@ -11,11 +11,11 @@ Roughness = 0.75;</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/fabric_29_col.jpg</map>
+        <map>textures/fabric_29_col.jpg</map>
         <tcgen mode="base"/>
       </texunit>
       <texunit>
-        <map>materials/fabric_29_nrm.jpg</map>
+        <map>textures/fabric_29_nrm.jpg</map>
         <bump mode="normalgloss"/>
         <tcgen mode="base"/>
       </texunit>
diff --git a/scenery/reds_speakers/textures/loud_speaker_bump.nl2mat b/scenery/reds_speakers/materials/loud_speaker_bump.nl2mat
similarity index 83%
rename from scenery/reds_speakers/textures/loud_speaker_bump.nl2mat
rename to scenery/reds_speakers/materials/loud_speaker_bump.nl2mat
index 9fd3f67..ef3c481 100644
--- a/scenery/reds_speakers/textures/loud_speaker_bump.nl2mat
+++ b/scenery/reds_speakers/materials/loud_speaker_bump.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>Matte plastic that is recolorable using the User 1 custom defined color, with a custom bump map.</description>
-    <preview>materials/horn_speaker_bump.jpg</preview>
+    <preview>textures/horn_speaker_bump.jpg</preview>
     <renderpass>
       <shadercore>Result = Mul(Entity1, 0.7);
 Specular = 0;
@@ -11,7 +11,7 @@ Roughness = 1;</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/horn_speaker_bump.jpg</map>
+        <map>textures/horn_speaker_bump.jpg</map>
         <bump mode="heightgloss" heightscale="10"/>
         <tcgen mode="base"/>
       </texunit>
diff --git a/scenery/reds_speakers/textures/loud_speaker_rear_logo.nl2mat b/scenery/reds_speakers/materials/loud_speaker_rear_logo.nl2mat
similarity index 84%
rename from scenery/reds_speakers/textures/loud_speaker_rear_logo.nl2mat
rename to scenery/reds_speakers/materials/loud_speaker_rear_logo.nl2mat
index e4d5e90..839e24a 100644
--- a/scenery/reds_speakers/textures/loud_speaker_rear_logo.nl2mat
+++ b/scenery/reds_speakers/materials/loud_speaker_rear_logo.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>Speaker logo with metallic effect.</description>
-    <preview>materials/horn_speaker_color.jpg</preview>
+    <preview>textures/horn_speaker_color.jpg</preview>
     <renderpass>
       <transparency mode="opaque"/>
       <custommaterial>
@@ -14,7 +14,7 @@
       <reflection fresnelconst="0.3" fresnelvar="0.7"/>
       <rgbgen mode="lighting"/>
       <texunit>
-        <map>materials/horn_speaker_color.jpg</map>
+        <map>textures/horn_speaker_color.jpg</map>
         <tcgen mode="base"/>
       </texunit>
     </renderpass>
diff --git a/scenery/reds_speakers/textures/metal_grill_user2.nl2mat b/scenery/reds_speakers/materials/metal_grill_user2.nl2mat
similarity index 79%
rename from scenery/reds_speakers/textures/metal_grill_user2.nl2mat
rename to scenery/reds_speakers/materials/metal_grill_user2.nl2mat
index bf8be71..cdd9708 100644
--- a/scenery/reds_speakers/textures/metal_grill_user2.nl2mat
+++ b/scenery/reds_speakers/materials/metal_grill_user2.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>User 1 recolorable metal grill, with normal map.</description>
-    <preview>materials/metal_grill_ao.jpg</preview>
+    <preview>textures/metal_grill_ao.jpg</preview>
     <renderpass>
       <shadercore>tmp0 = Mul(entity2, tex0);
 Result = Mul(tmp0, tex1);
@@ -11,20 +11,20 @@ Metallic = tex3;</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/metal_grill_color.jpg</map>
+        <map>textures/metal_grill_color.jpg</map>
         <tcgen mode="base"/>
       </texunit>
       <texunit>
-        <map>materials/metal_grill_ao.jpg</map>
+        <map>textures/metal_grill_ao.jpg</map>
         <tcgen mode="base"/>
       </texunit>
       <texunit>
-        <map>materials/metal_grill_normal.jpg</map>
+        <map>textures/metal_grill_normal.jpg</map>
         <bump mode="normalgloss"/>
         <tcgen mode="base"/>
       </texunit>
       <texunit>
-        <map>materials/metal_grill_metallic.jpg</map>
+        <map>textures/metal_grill_metallic.jpg</map>
         <tcgen mode="base"/>
       </texunit>
     </renderpass>
diff --git a/scenery/reds_speakers/textures/outdoor_speaker_bump.nl2mat b/scenery/reds_speakers/materials/outdoor_speaker_bump.nl2mat
similarity index 74%
rename from scenery/reds_speakers/textures/outdoor_speaker_bump.nl2mat
rename to scenery/reds_speakers/materials/outdoor_speaker_bump.nl2mat
index 692b595..5eef0e7 100644
--- a/scenery/reds_speakers/textures/outdoor_speaker_bump.nl2mat
+++ b/scenery/reds_speakers/materials/outdoor_speaker_bump.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>Matte plastic that is recolorable using the User 1 custom defined color, with a custom bump map.</description>
-    <preview>materials/outdoor_speaker_bump.jpg</preview>
+    <preview>textures/outdoor_speaker_bump.jpg</preview>
     <renderpass>
       <shadercore>Result = Mul(Entity1, 0.7);
 Specular = 0;
@@ -11,8 +11,8 @@ Roughness = 1;</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/outdoor_speaker_bump.jpg</map>
-        <bump mode="heightgloss" heightscale="10"/>
+        <map>textures/outdoor_speaker_normal.jpg</map>
+        <bump mode="normalgloss"/>
         <tcgen mode="base"/>
       </texunit>
     </renderpass>
diff --git a/scenery/reds_speakers/textures/plastic_black.nl2mat b/scenery/reds_speakers/materials/plastic_black.nl2mat
similarity index 100%
rename from scenery/reds_speakers/textures/plastic_black.nl2mat
rename to scenery/reds_speakers/materials/plastic_black.nl2mat
diff --git a/scenery/reds_speakers/textures/plastic_red.nl2mat b/scenery/reds_speakers/materials/plastic_red.nl2mat
similarity index 100%
rename from scenery/reds_speakers/textures/plastic_red.nl2mat
rename to scenery/reds_speakers/materials/plastic_red.nl2mat
diff --git a/scenery/reds_speakers/textures/plastic_user1.nl2mat b/scenery/reds_speakers/materials/plastic_user1.nl2mat
similarity index 91%
rename from scenery/reds_speakers/textures/plastic_user1.nl2mat
rename to scenery/reds_speakers/materials/plastic_user1.nl2mat
index 6d926ec..b19208b 100644
--- a/scenery/reds_speakers/textures/plastic_user1.nl2mat
+++ b/scenery/reds_speakers/materials/plastic_user1.nl2mat
@@ -10,7 +10,7 @@ Roughness = 1;</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/plastic_normal.jpg</map>
+        <map>textures/plastic_normal.jpg</map>
         <bump mode="normalgloss"/>
         <tcgen mode="base"/>
       </texunit>
diff --git a/scenery/reds_speakers/textures/plastic_user2.nl2mat b/scenery/reds_speakers/materials/plastic_user2.nl2mat
similarity index 91%
rename from scenery/reds_speakers/textures/plastic_user2.nl2mat
rename to scenery/reds_speakers/materials/plastic_user2.nl2mat
index 29b9c23..5075232 100644
--- a/scenery/reds_speakers/textures/plastic_user2.nl2mat
+++ b/scenery/reds_speakers/materials/plastic_user2.nl2mat
@@ -10,7 +10,7 @@ Roughness = 1;</shadercore>
       <linearshading/>
       <rgbgen mode="bumplighting"/>
       <texunit>
-        <map>materials/plastic_normal.jpg</map>
+        <map>textures/plastic_normal.jpg</map>
         <bump mode="normalgloss"/>
         <tcgen mode="base"/>
       </texunit>
diff --git a/scenery/reds_speakers/textures/plastic_white.nl2mat b/scenery/reds_speakers/materials/plastic_white.nl2mat
similarity index 100%
rename from scenery/reds_speakers/textures/plastic_white.nl2mat
rename to scenery/reds_speakers/materials/plastic_white.nl2mat
diff --git a/scenery/reds_speakers/textures/previews/jbl_speaker.png b/scenery/reds_speakers/materials/previews/jbl_speaker.png
similarity index 100%
rename from scenery/reds_speakers/textures/previews/jbl_speaker.png
rename to scenery/reds_speakers/materials/previews/jbl_speaker.png
diff --git a/scenery/reds_speakers/textures/previews/long_speaker.png b/scenery/reds_speakers/materials/previews/long_speaker.png
similarity index 100%
rename from scenery/reds_speakers/textures/previews/long_speaker.png
rename to scenery/reds_speakers/materials/previews/long_speaker.png
diff --git a/scenery/reds_speakers/textures/previews/loud_speaker.png b/scenery/reds_speakers/materials/previews/loud_speaker.png
similarity index 100%
rename from scenery/reds_speakers/textures/previews/loud_speaker.png
rename to scenery/reds_speakers/materials/previews/loud_speaker.png
diff --git a/scenery/reds_speakers/textures/previews/outdoor_speaker.png b/scenery/reds_speakers/materials/previews/outdoor_speaker.png
similarity index 100%
rename from scenery/reds_speakers/textures/previews/outdoor_speaker.png
rename to scenery/reds_speakers/materials/previews/outdoor_speaker.png
diff --git a/scenery/reds_speakers/textures/previews/overview.jpg b/scenery/reds_speakers/materials/previews/overview.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/previews/overview.jpg
rename to scenery/reds_speakers/materials/previews/overview.jpg
diff --git a/scenery/reds_speakers/textures/previews/small_speaker.png b/scenery/reds_speakers/materials/previews/small_speaker.png
similarity index 100%
rename from scenery/reds_speakers/textures/previews/small_speaker.png
rename to scenery/reds_speakers/materials/previews/small_speaker.png
diff --git a/scenery/reds_speakers/textures/red_audio_logo.nl2mat b/scenery/reds_speakers/materials/red_audio_logo.nl2mat
similarity index 88%
rename from scenery/reds_speakers/textures/red_audio_logo.nl2mat
rename to scenery/reds_speakers/materials/red_audio_logo.nl2mat
index 1d4ec3a..a9602c7 100644
--- a/scenery/reds_speakers/textures/red_audio_logo.nl2mat
+++ b/scenery/reds_speakers/materials/red_audio_logo.nl2mat
@@ -2,7 +2,7 @@
 <root>
   <material>
     <description>Speaker logo with metallic effect.</description>
-    <preview>materials/logo.png</preview>
+    <preview>textures/logo.png</preview>
     <renderpass>
       <transparency mode="opaque"/>
       <custommaterial>
@@ -14,7 +14,7 @@
       <reflection fresnelconst="0.3" fresnelvar="0.7"/>
       <rgbgen mode="lighting"/>
       <texunit>
-        <map>materials/logo.png</map>
+        <map>textures/logo.png</map>
         <tcgen mode="base"/>
       </texunit>
     </renderpass>
diff --git a/scenery/reds_speakers/textures/materials/fabric_29_col.jpg b/scenery/reds_speakers/materials/textures/fabric_29_col.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/fabric_29_col.jpg
rename to scenery/reds_speakers/materials/textures/fabric_29_col.jpg
diff --git a/scenery/reds_speakers/textures/materials/fabric_29_nrm.jpg b/scenery/reds_speakers/materials/textures/fabric_29_nrm.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/fabric_29_nrm.jpg
rename to scenery/reds_speakers/materials/textures/fabric_29_nrm.jpg
diff --git a/scenery/reds_speakers/textures/materials/horn_speaker_bump.jpg b/scenery/reds_speakers/materials/textures/horn_speaker_bump.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/horn_speaker_bump.jpg
rename to scenery/reds_speakers/materials/textures/horn_speaker_bump.jpg
diff --git a/scenery/reds_speakers/textures/materials/horn_speaker_color.jpg b/scenery/reds_speakers/materials/textures/horn_speaker_color.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/horn_speaker_color.jpg
rename to scenery/reds_speakers/materials/textures/horn_speaker_color.jpg
diff --git a/scenery/reds_speakers/textures/materials/logo.png b/scenery/reds_speakers/materials/textures/logo.png
similarity index 100%
rename from scenery/reds_speakers/textures/materials/logo.png
rename to scenery/reds_speakers/materials/textures/logo.png
diff --git a/scenery/reds_speakers/textures/materials/metal_29_col.jpg b/scenery/reds_speakers/materials/textures/metal_29_col.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/metal_29_col.jpg
rename to scenery/reds_speakers/materials/textures/metal_29_col.jpg
diff --git a/scenery/reds_speakers/textures/materials/metal_29_nrm.jpg b/scenery/reds_speakers/materials/textures/metal_29_nrm.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/metal_29_nrm.jpg
rename to scenery/reds_speakers/materials/textures/metal_29_nrm.jpg
diff --git a/scenery/reds_speakers/textures/materials/metal_grill_ao.jpg b/scenery/reds_speakers/materials/textures/metal_grill_ao.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/metal_grill_ao.jpg
rename to scenery/reds_speakers/materials/textures/metal_grill_ao.jpg
diff --git a/scenery/reds_speakers/textures/materials/metal_grill_color.jpg b/scenery/reds_speakers/materials/textures/metal_grill_color.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/metal_grill_color.jpg
rename to scenery/reds_speakers/materials/textures/metal_grill_color.jpg
diff --git a/scenery/reds_speakers/textures/materials/metal_grill_metallic.jpg b/scenery/reds_speakers/materials/textures/metal_grill_metallic.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/metal_grill_metallic.jpg
rename to scenery/reds_speakers/materials/textures/metal_grill_metallic.jpg
diff --git a/scenery/reds_speakers/textures/materials/metal_grill_normal.jpg b/scenery/reds_speakers/materials/textures/metal_grill_normal.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/metal_grill_normal.jpg
rename to scenery/reds_speakers/materials/textures/metal_grill_normal.jpg
diff --git a/scenery/reds_speakers/textures/materials/outdoor_speaker_bump.jpg b/scenery/reds_speakers/materials/textures/outdoor_speaker_bump.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/outdoor_speaker_bump.jpg
rename to scenery/reds_speakers/materials/textures/outdoor_speaker_bump.jpg
diff --git a/scenery/reds_speakers/materials/textures/outdoor_speaker_normal.jpg b/scenery/reds_speakers/materials/textures/outdoor_speaker_normal.jpg
new file mode 100644
index 0000000..f54eda1
Binary files /dev/null and b/scenery/reds_speakers/materials/textures/outdoor_speaker_normal.jpg differ
diff --git a/scenery/reds_speakers/textures/materials/plastic_normal.jpg b/scenery/reds_speakers/materials/textures/plastic_normal.jpg
similarity index 100%
rename from scenery/reds_speakers/textures/materials/plastic_normal.jpg
rename to scenery/reds_speakers/materials/textures/plastic_normal.jpg