From 8dbd920af968219b0b8299443430e18a9cd8f3cb Mon Sep 17 00:00:00 2001
From: Bertram <bertram@cegetel.net>
Date: Mon, 3 Aug 2009 21:17:05 +0200
Subject: Rearranged the sfx files to handle the long term contributions more
 nicely...

---
 effects.xml                                    |   4 +-
 items.xml                                      |  20 ++---
 monsters.xml                                   | 114 ++++++++++++-------------
 sfx/bat-dying1.ogg                             | Bin 6476 -> 0 bytes
 sfx/bat-hit1.ogg                               | Bin 6328 -> 0 bytes
 sfx/bow_shoot_1.ogg                            | Bin 8984 -> 0 bytes
 sfx/fire-goblin-hit1.ogg                       | Bin 6103 -> 0 bytes
 sfx/fire-goblin-hit2.ogg                       | Bin 6599 -> 0 bytes
 sfx/fire-goblin-miss1.ogg                      | Bin 5531 -> 0 bytes
 sfx/fist-swish.ogg                             | Bin 6723 -> 0 bytes
 sfx/flower-hit1.ogg                            | Bin 7651 -> 0 bytes
 sfx/flower-hit2.ogg                            | Bin 7714 -> 0 bytes
 sfx/flower-miss1.ogg                           | Bin 8017 -> 0 bytes
 sfx/fluffy-hit1.ogg                            | Bin 6541 -> 0 bytes
 sfx/fluffy-hit2.ogg                            | Bin 6719 -> 0 bytes
 sfx/fluffy-hit3.ogg                            | Bin 6942 -> 0 bytes
 sfx/fluffy-hurt1.ogg                           | Bin 6328 -> 0 bytes
 sfx/fluffy-miss1.ogg                           | Bin 7083 -> 0 bytes
 sfx/knife-hit1.ogg                             | Bin 6389 -> 0 bytes
 sfx/knife-miss1.ogg                            | Bin 6438 -> 0 bytes
 sfx/levelup.ogg                                | Bin 8950 -> 0 bytes
 sfx/loghead-hurt1.ogg                          | Bin 12204 -> 0 bytes
 sfx/loghead-hurt2.ogg                          | Bin 11737 -> 0 bytes
 sfx/loghead-hurt3.ogg                          | Bin 12304 -> 0 bytes
 sfx/loghead-hurt4.ogg                          | Bin 12951 -> 0 bytes
 sfx/loghead-hurt5.ogg                          | Bin 14277 -> 0 bytes
 sfx/maggot-dying1.ogg                          | Bin 17448 -> 0 bytes
 sfx/maggot-hit1.ogg                            | Bin 19610 -> 0 bytes
 sfx/maggot-hit2.ogg                            | Bin 15514 -> 0 bytes
 sfx/maggot-miss1.ogg                           | Bin 14317 -> 0 bytes
 sfx/monsters/bat/bat-dying1.ogg                | Bin 0 -> 6476 bytes
 sfx/monsters/bat/bat-hit1.ogg                  | Bin 0 -> 6328 bytes
 sfx/monsters/fire-goblin/fire-goblin-hit1.ogg  | Bin 0 -> 6103 bytes
 sfx/monsters/fire-goblin/fire-goblin-hit2.ogg  | Bin 0 -> 6599 bytes
 sfx/monsters/fire-goblin/fire-goblin-miss1.ogg | Bin 0 -> 5531 bytes
 sfx/monsters/flower/flower-hit1.ogg            | Bin 0 -> 7651 bytes
 sfx/monsters/flower/flower-hit2.ogg            | Bin 0 -> 7714 bytes
 sfx/monsters/flower/flower-miss1.ogg           | Bin 0 -> 8017 bytes
 sfx/monsters/fluffy/fluffy-hit1.ogg            | Bin 0 -> 6541 bytes
 sfx/monsters/fluffy/fluffy-hit2.ogg            | Bin 0 -> 6719 bytes
 sfx/monsters/fluffy/fluffy-hit3.ogg            | Bin 0 -> 6942 bytes
 sfx/monsters/fluffy/fluffy-hurt1.ogg           | Bin 0 -> 6328 bytes
 sfx/monsters/fluffy/fluffy-miss1.ogg           | Bin 0 -> 7083 bytes
 sfx/monsters/loghead/loghead-hurt1.ogg         | Bin 0 -> 12204 bytes
 sfx/monsters/loghead/loghead-hurt2.ogg         | Bin 0 -> 11737 bytes
 sfx/monsters/loghead/loghead-hurt3.ogg         | Bin 0 -> 12304 bytes
 sfx/monsters/loghead/loghead-hurt4.ogg         | Bin 0 -> 12951 bytes
 sfx/monsters/loghead/loghead-hurt5.ogg         | Bin 0 -> 14277 bytes
 sfx/monsters/maggot/maggot-dying1.ogg          | Bin 0 -> 17448 bytes
 sfx/monsters/maggot/maggot-hit1.ogg            | Bin 0 -> 19610 bytes
 sfx/monsters/maggot/maggot-hit2.ogg            | Bin 0 -> 15514 bytes
 sfx/monsters/maggot/maggot-miss1.ogg           | Bin 0 -> 14317 bytes
 sfx/monsters/pinkie/pinkie-hit1.ogg            | Bin 0 -> 10428 bytes
 sfx/monsters/pinkie/pinkie-miss1.ogg           | Bin 0 -> 7426 bytes
 sfx/monsters/scorpion/scorpion-hit1.ogg        | Bin 0 -> 6626 bytes
 sfx/monsters/scorpion/scorpion-hit2.ogg        | Bin 0 -> 6486 bytes
 sfx/monsters/scorpion/scorpion-hit3.ogg        | Bin 0 -> 6638 bytes
 sfx/monsters/scorpion/scorpion-hit4.ogg        | Bin 0 -> 7410 bytes
 sfx/monsters/scorpion/scorpion-miss1.ogg       | Bin 0 -> 6692 bytes
 sfx/monsters/shroom/shroom-hit1.ogg            | Bin 0 -> 6297 bytes
 sfx/monsters/slime/slime-hit1.ogg              | Bin 0 -> 12943 bytes
 sfx/pinkie-hit1.ogg                            | Bin 10428 -> 0 bytes
 sfx/pinkie-miss1.ogg                           | Bin 7426 -> 0 bytes
 sfx/scorpion-hit1.ogg                          | Bin 6626 -> 0 bytes
 sfx/scorpion-hit2.ogg                          | Bin 6486 -> 0 bytes
 sfx/scorpion-hit3.ogg                          | Bin 6638 -> 0 bytes
 sfx/scorpion-hit4.ogg                          | Bin 7410 -> 0 bytes
 sfx/scorpion-miss1.ogg                         | Bin 6692 -> 0 bytes
 sfx/short-sword-hit1.ogg                       | Bin 6153 -> 0 bytes
 sfx/short-sword-miss1.ogg                      | Bin 8116 -> 0 bytes
 sfx/shroom-hit1.ogg                            | Bin 6297 -> 0 bytes
 sfx/slime-hit1.ogg                             | Bin 12943 -> 0 bytes
 sfx/system/levelup.ogg                         | Bin 0 -> 8950 bytes
 sfx/weapons/bows/bow_shoot_1.ogg               | Bin 0 -> 8984 bytes
 sfx/weapons/fists/fist-swish.ogg               | Bin 0 -> 6723 bytes
 sfx/weapons/knives/knife-hit1.ogg              | Bin 0 -> 6389 bytes
 sfx/weapons/knives/knife-miss1.ogg             | Bin 0 -> 6438 bytes
 sfx/weapons/swords/short-sword-hit1.ogg        | Bin 0 -> 6153 bytes
 sfx/weapons/swords/short-sword-miss1.ogg       | Bin 0 -> 8116 bytes
 79 files changed, 69 insertions(+), 69 deletions(-)
 delete mode 100644 sfx/bat-dying1.ogg
 delete mode 100644 sfx/bat-hit1.ogg
 delete mode 100644 sfx/bow_shoot_1.ogg
 delete mode 100644 sfx/fire-goblin-hit1.ogg
 delete mode 100644 sfx/fire-goblin-hit2.ogg
 delete mode 100644 sfx/fire-goblin-miss1.ogg
 delete mode 100644 sfx/fist-swish.ogg
 delete mode 100644 sfx/flower-hit1.ogg
 delete mode 100644 sfx/flower-hit2.ogg
 delete mode 100644 sfx/flower-miss1.ogg
 delete mode 100644 sfx/fluffy-hit1.ogg
 delete mode 100644 sfx/fluffy-hit2.ogg
 delete mode 100644 sfx/fluffy-hit3.ogg
 delete mode 100644 sfx/fluffy-hurt1.ogg
 delete mode 100644 sfx/fluffy-miss1.ogg
 delete mode 100644 sfx/knife-hit1.ogg
 delete mode 100644 sfx/knife-miss1.ogg
 delete mode 100644 sfx/levelup.ogg
 delete mode 100644 sfx/loghead-hurt1.ogg
 delete mode 100644 sfx/loghead-hurt2.ogg
 delete mode 100644 sfx/loghead-hurt3.ogg
 delete mode 100644 sfx/loghead-hurt4.ogg
 delete mode 100644 sfx/loghead-hurt5.ogg
 delete mode 100644 sfx/maggot-dying1.ogg
 delete mode 100644 sfx/maggot-hit1.ogg
 delete mode 100644 sfx/maggot-hit2.ogg
 delete mode 100644 sfx/maggot-miss1.ogg
 create mode 100644 sfx/monsters/bat/bat-dying1.ogg
 create mode 100644 sfx/monsters/bat/bat-hit1.ogg
 create mode 100644 sfx/monsters/fire-goblin/fire-goblin-hit1.ogg
 create mode 100644 sfx/monsters/fire-goblin/fire-goblin-hit2.ogg
 create mode 100644 sfx/monsters/fire-goblin/fire-goblin-miss1.ogg
 create mode 100644 sfx/monsters/flower/flower-hit1.ogg
 create mode 100644 sfx/monsters/flower/flower-hit2.ogg
 create mode 100644 sfx/monsters/flower/flower-miss1.ogg
 create mode 100644 sfx/monsters/fluffy/fluffy-hit1.ogg
 create mode 100644 sfx/monsters/fluffy/fluffy-hit2.ogg
 create mode 100644 sfx/monsters/fluffy/fluffy-hit3.ogg
 create mode 100644 sfx/monsters/fluffy/fluffy-hurt1.ogg
 create mode 100644 sfx/monsters/fluffy/fluffy-miss1.ogg
 create mode 100644 sfx/monsters/loghead/loghead-hurt1.ogg
 create mode 100644 sfx/monsters/loghead/loghead-hurt2.ogg
 create mode 100644 sfx/monsters/loghead/loghead-hurt3.ogg
 create mode 100644 sfx/monsters/loghead/loghead-hurt4.ogg
 create mode 100644 sfx/monsters/loghead/loghead-hurt5.ogg
 create mode 100644 sfx/monsters/maggot/maggot-dying1.ogg
 create mode 100644 sfx/monsters/maggot/maggot-hit1.ogg
 create mode 100644 sfx/monsters/maggot/maggot-hit2.ogg
 create mode 100644 sfx/monsters/maggot/maggot-miss1.ogg
 create mode 100644 sfx/monsters/pinkie/pinkie-hit1.ogg
 create mode 100644 sfx/monsters/pinkie/pinkie-miss1.ogg
 create mode 100644 sfx/monsters/scorpion/scorpion-hit1.ogg
 create mode 100644 sfx/monsters/scorpion/scorpion-hit2.ogg
 create mode 100644 sfx/monsters/scorpion/scorpion-hit3.ogg
 create mode 100644 sfx/monsters/scorpion/scorpion-hit4.ogg
 create mode 100644 sfx/monsters/scorpion/scorpion-miss1.ogg
 create mode 100644 sfx/monsters/shroom/shroom-hit1.ogg
 create mode 100644 sfx/monsters/slime/slime-hit1.ogg
 delete mode 100644 sfx/pinkie-hit1.ogg
 delete mode 100644 sfx/pinkie-miss1.ogg
 delete mode 100644 sfx/scorpion-hit1.ogg
 delete mode 100644 sfx/scorpion-hit2.ogg
 delete mode 100644 sfx/scorpion-hit3.ogg
 delete mode 100644 sfx/scorpion-hit4.ogg
 delete mode 100644 sfx/scorpion-miss1.ogg
 delete mode 100644 sfx/short-sword-hit1.ogg
 delete mode 100644 sfx/short-sword-miss1.ogg
 delete mode 100644 sfx/shroom-hit1.ogg
 delete mode 100644 sfx/slime-hit1.ogg
 create mode 100644 sfx/system/levelup.ogg
 create mode 100644 sfx/weapons/bows/bow_shoot_1.ogg
 create mode 100644 sfx/weapons/fists/fist-swish.ogg
 create mode 100644 sfx/weapons/knives/knife-hit1.ogg
 create mode 100644 sfx/weapons/knives/knife-miss1.ogg
 create mode 100644 sfx/weapons/swords/short-sword-hit1.ogg
 create mode 100644 sfx/weapons/swords/short-sword-miss1.ogg

diff --git a/effects.xml b/effects.xml
index f6599fcf..808edec5 100644
--- a/effects.xml
+++ b/effects.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <being-effects>
-  <effect id="0" audio="sfx/levelup.ogg" particle="graphics/particles/levelup.particle.xml" />
-  <effect id="1" audio="sfx/levelup.ogg" particle="graphics/particles/skillup.particle.xml" />
+  <effect id="0" audio="sfx/system/levelup.ogg" particle="graphics/particles/levelup.particle.xml" />
+  <effect id="1" audio="sfx/system/levelup.ogg" particle="graphics/particles/skillup.particle.xml" />
   <effect id="2" particle="graphics/particles/magic.generic.xml"/>
   <effect id="3" particle="graphics/particles/magic.white.xml"/> <!-- life -->
   <effect id="4" particle="graphics/particles/magic.black.xml"/> <!-- war -->
diff --git a/items.xml b/items.xml
index 5d760def..cbe150b3 100644
--- a/items.xml
+++ b/items.xml
@@ -78,13 +78,13 @@
     <item id="30"
         weapon_type="1">
         <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">short-sword-miss1.ogg</sound>
-        <sound event="hit">short-sword-hit1.ogg</sound>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
     </item>
     <item id="31"
         weapon_type="10">
         <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">bow_shoot_1.ogg</sound>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
     </item>
     <item id="32"
         weapon_type="11">
@@ -93,8 +93,8 @@
     <item id="33"
         weapon_type="1">
         <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">short-sword-miss1.ogg</sound>
-        <sound event="hit">short-sword-hit1.ogg</sound>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
     </item>
     <item id="34"
         weapon_type="1"> <!-- magic fist -->
@@ -281,8 +281,8 @@
         attack-angle="135"
         max-per-slot="1">
         <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">short-sword-miss1.ogg</sound>
-        <sound event="hit">short-sword-hit1.ogg</sound>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
     </item>
     <item id="522"
         image="weapon-dagger-sharpknife.png"
@@ -2472,7 +2472,7 @@
         weapon-type="bow"
         max-per-slot="1">
         <sprite>weapon-bow.xml</sprite>
-        <sound event="swing">bow_shoot_1.ogg</sound>
+        <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
     </item>
     <item id="1201"
         image="weapon-dagger-knive.png"
@@ -2629,8 +2629,8 @@
         attack-angle="135"
         max-per-slot="1">
         <sprite>weapon-dagger.xml</sprite>
-        <sound event="strike">short-sword-miss1.ogg</sound>
-        <sound event="hit">short-sword-hit1.ogg</sound>
+        <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
+        <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
     </item>
     <item id="1216"
         image="armor-head-mouboohead.png"
diff --git a/monsters.xml b/monsters.xml
index 48ff4e0f..4b2c50e5 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -3,10 +3,10 @@
 
     <monster id="0" name="Maggot" targetCursor="small">
         <sprite>monster-maggot.xml</sprite>
-        <sound event="hit">maggot-hit1.ogg</sound>
-        <sound event="hit">maggot-hit2.ogg</sound>
-        <sound event="miss">maggot-miss1.ogg</sound>
-        <sound event="die">maggot-dying1.ogg</sound>
+        <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
+        <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
+        <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
+        <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
         <drop item="505" percent="8"/>
         <drop item="518" percent="4"/>
         <drop item="501" percent="1.5"/>
@@ -51,11 +51,11 @@
 
     <monster id="1" name="Scorpion">
         <sprite>monster-scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite>
-        <sound event="hit">scorpion-hit1.ogg</sound>
-        <sound event="hit">scorpion-hit2.ogg</sound>
-        <sound event="hit">scorpion-hit3.ogg</sound>
-        <sound event="hit">scorpion-hit4.ogg</sound>
-        <sound event="miss">scorpion-miss1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
+        <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
         <drop item="507" percent="7"/>
         <drop item="510" percent="1"/>
         <drop item="509" percent="0.5"/>
@@ -107,11 +107,11 @@
 
     <monster id="2" name="Red Scorpion">
         <sprite>monster-scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite>
-        <sound event="hit">scorpion-hit1.ogg</sound>
-        <sound event="hit">scorpion-hit2.ogg</sound>
-        <sound event="hit">scorpion-hit3.ogg</sound>
-        <sound event="hit">scorpion-hit4.ogg</sound>
-        <sound event="miss">scorpion-miss1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
+        <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
         <drop item="517" percent="20"/>
         <drop item="509" percent="1"/>
         <drop item="518" percent="5"/>
@@ -155,7 +155,7 @@
 
     <monster id="3" name="Green Slime">
         <sprite>monster-slime.xml|#72982c,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
+        <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="502" percent="2"/>
         <drop item="513" percent="1"/>
         <drop item="501" percent="1"/>
@@ -190,10 +190,10 @@
 
     <monster id="4" name="Giant Maggot" targetCursor="large">
         <sprite>monster-maggot-giant.xml</sprite>
-        <sound event="hit">maggot-hit1.ogg</sound>
-        <sound event="hit">maggot-hit2.ogg</sound>
-        <sound event="miss">maggot-miss1.ogg</sound>
-        <sound event="die">maggot-dying1.ogg</sound>
+        <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
+        <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
+        <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
+        <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
         <drop item="1199" percent="9"/>
         <drop item="519" percent="1"/>
         <drop item="518" percent="7.5"/>
@@ -218,7 +218,7 @@
 
     <monster id="5" name="Yellow Slime">
         <sprite>monster-slime.xml|#b47f00,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
+        <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="534" percent="2"/>
         <drop item="519" percent="1"/>
         <drop item="501" percent="3.5"/>
@@ -241,7 +241,7 @@
 
     <monster id="6" name="Red Slime">
         <sprite>monster-slime.xml|#7e0000,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
+        <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="1201" percent="3"/>
         <drop item="509" percent="1.1"/>
         <drop item="521" percent="2"/>
@@ -267,11 +267,11 @@
 
     <monster id="7" name="Black Scorpion">
         <sprite>monster-scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite>
-        <sound event="hit">scorpion-hit1.ogg</sound>
-        <sound event="hit">scorpion-hit2.ogg</sound>
-        <sound event="hit">scorpion-hit3.ogg</sound>
-        <sound event="hit">scorpion-hit4.ogg</sound>
-        <sound event="miss">scorpion-miss1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
+        <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
         <drop item="523" percent="1.5"/>
         <drop item="509" percent="1.0"/>
         <drop item="518" percent="8"/>
@@ -309,9 +309,9 @@
 
     <monster id="9" name="Fire Goblin">
         <sprite>monster-goblin-fire.xml</sprite>
-        <sound event="hit">fire-goblin-hit1.ogg</sound>
-        <sound event="hit">fire-goblin-hit2.ogg</sound>
-        <sound event="miss">fire-goblin-miss1.ogg</sound>
+        <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
+        <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
+        <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
         <drop item="505" percent="8"/>
         <drop item="501" percent="1.5"/>
         <drop item="518" percent="8"/>
@@ -377,7 +377,7 @@
 
     <monster id="11" name="Evil Mushroom">
         <sprite>monster-mushroom-red.xml</sprite>
-        <sound event="hit">shroom-hit1.ogg</sound>
+        <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
         <drop item="535" percent="5"/>
         <drop item="540" percent="0.1"/>
         <drop item="534" percent="1"/>
@@ -399,9 +399,9 @@
 
     <monster id="12" name="Flower">
         <sprite>monster-flower.xml</sprite>
-        <sound event="hit">flower-hit1.ogg</sound>
-        <sound event="hit">flower-hit2.ogg</sound>
-        <sound event="miss">flower-miss1.ogg</sound>
+        <sound event="hit">monsters/flower/flower-hit1.ogg</sound>
+        <sound event="hit">monsters/flower/flower-hit2.ogg</sound>
+        <sound event="miss">monsters/flower/flower-miss1.ogg</sound>
         <drop item="535" percent="1"/>
         <drop item="540" percent="0.1"/>
         <drop item="1199" percent="1"/>
@@ -480,8 +480,8 @@
 
     <monster id="15" name="Bat">
         <sprite>monster-bat.xml</sprite>
-        <sound event="die">bat-dying1.ogg</sound>
-        <sound event="hit">bat-hit1.ogg</sound>
+        <sound event="die">monsters/bat/bat-dying1.ogg</sound>
+        <sound event="hit">monsters/bat/bat-hit1.ogg</sound>
         <drop item="505" percent="8"/>
         <drop item="501" percent="1.5"/>
         <drop item="518" percent="4"/>
@@ -505,8 +505,8 @@
 
     <monster id="16" name="Pinkie" targetCursor="small">
         <sprite>monster-pinkie.xml</sprite>
-        <sound event="hit">pinkie-hit1.ogg</sound>
-        <sound event="miss">pinkie-miss1.ogg</sound>
+        <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound>
+        <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound>
         <drop item="614" percent="8"/>
         <attributes
             hp="20"
@@ -525,7 +525,7 @@
 
     <monster id="17" name="Spiky Mushroom">
         <sprite>monster-mushroom-spiky.xml</sprite>
-        <sound event="hit">shroom-hit1.ogg</sound>
+        <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
         <drop item="567" percent="8"/>
         <drop item="501" percent="1.5"/>
         <drop item="518" percent="0.5"/>
@@ -547,11 +547,11 @@
 
     <monster id="18" name="Fluffy">
         <sprite>monster-fluffy.xml</sprite>
-        <sound event="hit">fluffy-hit1.ogg</sound>
-        <sound event="hit">fluffy-hit2.ogg</sound>
-        <sound event="hit">fluffy-hit3.ogg</sound>
-        <sound event="miss">fluffy-miss1.ogg</sound>
-        <sound event="hurt">fluffy-hurt1.ogg</sound>
+        <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
+        <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
+        <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
+        <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound>
+        <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound>
         <drop item="611" percent="8"/>
         <drop item="527" percent="1.5"/>
         <drop item="535" percent="4"/>
@@ -646,11 +646,11 @@
 
     <monster id="23" name="Log Head">
         <sprite>monster-logmonster.xml</sprite>
-        <sound event="hurt">loghead-hurt1.ogg</sound>
-        <sound event="hurt">loghead-hurt2.ogg</sound>
-        <sound event="hurt">loghead-hurt3.ogg</sound>
-        <sound event="hurt">loghead-hurt4.ogg</sound>
-        <sound event="hurt">loghead-hurt5.ogg</sound>
+        <sound event="hurt">monsters/loghead/loghead-hurt1.ogg</sound>
+        <sound event="hurt">monsters/loghead/loghead-hurt2.ogg</sound>
+        <sound event="hurt">monsters/loghead/loghead-hurt3.ogg</sound>
+        <sound event="hurt">monsters/loghead/loghead-hurt4.ogg</sound>
+        <sound event="hurt">monsters/loghead/loghead-hurt5.ogg</sound>
         <drop item="569" percent="20"/>
         <attributes
             hp="20"
@@ -686,11 +686,11 @@
 
     <monster id="25" name="Easter Fluffy">
         <sprite>monster-fluffy.xml</sprite>
-        <sound event="hit">fluffy-hit1.ogg</sound>
-        <sound event="hit">fluffy-hit2.ogg</sound>
-        <sound event="hit">fluffy-hit3.ogg</sound>
-        <sound event="miss">fluffy-miss1.ogg</sound>
-        <sound event="hurt">fluffy-hurt1.ogg</sound>
+        <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
+        <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
+        <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
+        <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound>
+        <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound>
         <attributes
             hp="20"
             size="4"
@@ -793,7 +793,7 @@
     
     <monster id="31" name="Sea Slime">
         <sprite>monster-slime.xml|#4ca1a0,ffffff</sprite>
-        <sound event="hit">slime-hit1.ogg</sound>
+        <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <attributes
             hp="20"
             size="4"
@@ -896,9 +896,9 @@
 
     <monster id="37" name="Fire Lizard">
         <sprite>monster-lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</sprite>
-        <sound event="hit">fire-goblin-hit1.ogg</sound>
-        <sound event="hit">fire-goblin-hit2.ogg</sound>
-        <sound event="miss">fire-goblin-miss1.ogg</sound>
+        <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
+        <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
+        <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
         <!-- stats identical to maggot - change this when making up real monster stats -->
         <attributes
             hp="20"
diff --git a/sfx/bat-dying1.ogg b/sfx/bat-dying1.ogg
deleted file mode 100644
index 81c410b4..00000000
Binary files a/sfx/bat-dying1.ogg and /dev/null differ
diff --git a/sfx/bat-hit1.ogg b/sfx/bat-hit1.ogg
deleted file mode 100644
index 3b28bb61..00000000
Binary files a/sfx/bat-hit1.ogg and /dev/null differ
diff --git a/sfx/bow_shoot_1.ogg b/sfx/bow_shoot_1.ogg
deleted file mode 100644
index 872669c1..00000000
Binary files a/sfx/bow_shoot_1.ogg and /dev/null differ
diff --git a/sfx/fire-goblin-hit1.ogg b/sfx/fire-goblin-hit1.ogg
deleted file mode 100644
index 1ab5bb25..00000000
Binary files a/sfx/fire-goblin-hit1.ogg and /dev/null differ
diff --git a/sfx/fire-goblin-hit2.ogg b/sfx/fire-goblin-hit2.ogg
deleted file mode 100644
index dcc6cf96..00000000
Binary files a/sfx/fire-goblin-hit2.ogg and /dev/null differ
diff --git a/sfx/fire-goblin-miss1.ogg b/sfx/fire-goblin-miss1.ogg
deleted file mode 100644
index 7841d577..00000000
Binary files a/sfx/fire-goblin-miss1.ogg and /dev/null differ
diff --git a/sfx/fist-swish.ogg b/sfx/fist-swish.ogg
deleted file mode 100644
index 757d0f77..00000000
Binary files a/sfx/fist-swish.ogg and /dev/null differ
diff --git a/sfx/flower-hit1.ogg b/sfx/flower-hit1.ogg
deleted file mode 100644
index d6841972..00000000
Binary files a/sfx/flower-hit1.ogg and /dev/null differ
diff --git a/sfx/flower-hit2.ogg b/sfx/flower-hit2.ogg
deleted file mode 100644
index b3ee420d..00000000
Binary files a/sfx/flower-hit2.ogg and /dev/null differ
diff --git a/sfx/flower-miss1.ogg b/sfx/flower-miss1.ogg
deleted file mode 100644
index d5d913f0..00000000
Binary files a/sfx/flower-miss1.ogg and /dev/null differ
diff --git a/sfx/fluffy-hit1.ogg b/sfx/fluffy-hit1.ogg
deleted file mode 100644
index 0a155264..00000000
Binary files a/sfx/fluffy-hit1.ogg and /dev/null differ
diff --git a/sfx/fluffy-hit2.ogg b/sfx/fluffy-hit2.ogg
deleted file mode 100644
index 5bb39fbd..00000000
Binary files a/sfx/fluffy-hit2.ogg and /dev/null differ
diff --git a/sfx/fluffy-hit3.ogg b/sfx/fluffy-hit3.ogg
deleted file mode 100644
index f7c36cee..00000000
Binary files a/sfx/fluffy-hit3.ogg and /dev/null differ
diff --git a/sfx/fluffy-hurt1.ogg b/sfx/fluffy-hurt1.ogg
deleted file mode 100644
index 128e5aef..00000000
Binary files a/sfx/fluffy-hurt1.ogg and /dev/null differ
diff --git a/sfx/fluffy-miss1.ogg b/sfx/fluffy-miss1.ogg
deleted file mode 100644
index 164974af..00000000
Binary files a/sfx/fluffy-miss1.ogg and /dev/null differ
diff --git a/sfx/knife-hit1.ogg b/sfx/knife-hit1.ogg
deleted file mode 100644
index 5ed879e4..00000000
Binary files a/sfx/knife-hit1.ogg and /dev/null differ
diff --git a/sfx/knife-miss1.ogg b/sfx/knife-miss1.ogg
deleted file mode 100644
index b43229f2..00000000
Binary files a/sfx/knife-miss1.ogg and /dev/null differ
diff --git a/sfx/levelup.ogg b/sfx/levelup.ogg
deleted file mode 100644
index 84f070e5..00000000
Binary files a/sfx/levelup.ogg and /dev/null differ
diff --git a/sfx/loghead-hurt1.ogg b/sfx/loghead-hurt1.ogg
deleted file mode 100644
index 9f6b2b99..00000000
Binary files a/sfx/loghead-hurt1.ogg and /dev/null differ
diff --git a/sfx/loghead-hurt2.ogg b/sfx/loghead-hurt2.ogg
deleted file mode 100644
index 35cbde91..00000000
Binary files a/sfx/loghead-hurt2.ogg and /dev/null differ
diff --git a/sfx/loghead-hurt3.ogg b/sfx/loghead-hurt3.ogg
deleted file mode 100644
index 489273dd..00000000
Binary files a/sfx/loghead-hurt3.ogg and /dev/null differ
diff --git a/sfx/loghead-hurt4.ogg b/sfx/loghead-hurt4.ogg
deleted file mode 100644
index d9e35321..00000000
Binary files a/sfx/loghead-hurt4.ogg and /dev/null differ
diff --git a/sfx/loghead-hurt5.ogg b/sfx/loghead-hurt5.ogg
deleted file mode 100644
index 8cb01c85..00000000
Binary files a/sfx/loghead-hurt5.ogg and /dev/null differ
diff --git a/sfx/maggot-dying1.ogg b/sfx/maggot-dying1.ogg
deleted file mode 100644
index e05a5235..00000000
Binary files a/sfx/maggot-dying1.ogg and /dev/null differ
diff --git a/sfx/maggot-hit1.ogg b/sfx/maggot-hit1.ogg
deleted file mode 100644
index 695cb483..00000000
Binary files a/sfx/maggot-hit1.ogg and /dev/null differ
diff --git a/sfx/maggot-hit2.ogg b/sfx/maggot-hit2.ogg
deleted file mode 100644
index 12d92bb9..00000000
Binary files a/sfx/maggot-hit2.ogg and /dev/null differ
diff --git a/sfx/maggot-miss1.ogg b/sfx/maggot-miss1.ogg
deleted file mode 100644
index a251bf97..00000000
Binary files a/sfx/maggot-miss1.ogg and /dev/null differ
diff --git a/sfx/monsters/bat/bat-dying1.ogg b/sfx/monsters/bat/bat-dying1.ogg
new file mode 100644
index 00000000..81c410b4
Binary files /dev/null and b/sfx/monsters/bat/bat-dying1.ogg differ
diff --git a/sfx/monsters/bat/bat-hit1.ogg b/sfx/monsters/bat/bat-hit1.ogg
new file mode 100644
index 00000000..3b28bb61
Binary files /dev/null and b/sfx/monsters/bat/bat-hit1.ogg differ
diff --git a/sfx/monsters/fire-goblin/fire-goblin-hit1.ogg b/sfx/monsters/fire-goblin/fire-goblin-hit1.ogg
new file mode 100644
index 00000000..1ab5bb25
Binary files /dev/null and b/sfx/monsters/fire-goblin/fire-goblin-hit1.ogg differ
diff --git a/sfx/monsters/fire-goblin/fire-goblin-hit2.ogg b/sfx/monsters/fire-goblin/fire-goblin-hit2.ogg
new file mode 100644
index 00000000..dcc6cf96
Binary files /dev/null and b/sfx/monsters/fire-goblin/fire-goblin-hit2.ogg differ
diff --git a/sfx/monsters/fire-goblin/fire-goblin-miss1.ogg b/sfx/monsters/fire-goblin/fire-goblin-miss1.ogg
new file mode 100644
index 00000000..7841d577
Binary files /dev/null and b/sfx/monsters/fire-goblin/fire-goblin-miss1.ogg differ
diff --git a/sfx/monsters/flower/flower-hit1.ogg b/sfx/monsters/flower/flower-hit1.ogg
new file mode 100644
index 00000000..d6841972
Binary files /dev/null and b/sfx/monsters/flower/flower-hit1.ogg differ
diff --git a/sfx/monsters/flower/flower-hit2.ogg b/sfx/monsters/flower/flower-hit2.ogg
new file mode 100644
index 00000000..b3ee420d
Binary files /dev/null and b/sfx/monsters/flower/flower-hit2.ogg differ
diff --git a/sfx/monsters/flower/flower-miss1.ogg b/sfx/monsters/flower/flower-miss1.ogg
new file mode 100644
index 00000000..d5d913f0
Binary files /dev/null and b/sfx/monsters/flower/flower-miss1.ogg differ
diff --git a/sfx/monsters/fluffy/fluffy-hit1.ogg b/sfx/monsters/fluffy/fluffy-hit1.ogg
new file mode 100644
index 00000000..0a155264
Binary files /dev/null and b/sfx/monsters/fluffy/fluffy-hit1.ogg differ
diff --git a/sfx/monsters/fluffy/fluffy-hit2.ogg b/sfx/monsters/fluffy/fluffy-hit2.ogg
new file mode 100644
index 00000000..5bb39fbd
Binary files /dev/null and b/sfx/monsters/fluffy/fluffy-hit2.ogg differ
diff --git a/sfx/monsters/fluffy/fluffy-hit3.ogg b/sfx/monsters/fluffy/fluffy-hit3.ogg
new file mode 100644
index 00000000..f7c36cee
Binary files /dev/null and b/sfx/monsters/fluffy/fluffy-hit3.ogg differ
diff --git a/sfx/monsters/fluffy/fluffy-hurt1.ogg b/sfx/monsters/fluffy/fluffy-hurt1.ogg
new file mode 100644
index 00000000..128e5aef
Binary files /dev/null and b/sfx/monsters/fluffy/fluffy-hurt1.ogg differ
diff --git a/sfx/monsters/fluffy/fluffy-miss1.ogg b/sfx/monsters/fluffy/fluffy-miss1.ogg
new file mode 100644
index 00000000..164974af
Binary files /dev/null and b/sfx/monsters/fluffy/fluffy-miss1.ogg differ
diff --git a/sfx/monsters/loghead/loghead-hurt1.ogg b/sfx/monsters/loghead/loghead-hurt1.ogg
new file mode 100644
index 00000000..9f6b2b99
Binary files /dev/null and b/sfx/monsters/loghead/loghead-hurt1.ogg differ
diff --git a/sfx/monsters/loghead/loghead-hurt2.ogg b/sfx/monsters/loghead/loghead-hurt2.ogg
new file mode 100644
index 00000000..35cbde91
Binary files /dev/null and b/sfx/monsters/loghead/loghead-hurt2.ogg differ
diff --git a/sfx/monsters/loghead/loghead-hurt3.ogg b/sfx/monsters/loghead/loghead-hurt3.ogg
new file mode 100644
index 00000000..489273dd
Binary files /dev/null and b/sfx/monsters/loghead/loghead-hurt3.ogg differ
diff --git a/sfx/monsters/loghead/loghead-hurt4.ogg b/sfx/monsters/loghead/loghead-hurt4.ogg
new file mode 100644
index 00000000..d9e35321
Binary files /dev/null and b/sfx/monsters/loghead/loghead-hurt4.ogg differ
diff --git a/sfx/monsters/loghead/loghead-hurt5.ogg b/sfx/monsters/loghead/loghead-hurt5.ogg
new file mode 100644
index 00000000..8cb01c85
Binary files /dev/null and b/sfx/monsters/loghead/loghead-hurt5.ogg differ
diff --git a/sfx/monsters/maggot/maggot-dying1.ogg b/sfx/monsters/maggot/maggot-dying1.ogg
new file mode 100644
index 00000000..e05a5235
Binary files /dev/null and b/sfx/monsters/maggot/maggot-dying1.ogg differ
diff --git a/sfx/monsters/maggot/maggot-hit1.ogg b/sfx/monsters/maggot/maggot-hit1.ogg
new file mode 100644
index 00000000..695cb483
Binary files /dev/null and b/sfx/monsters/maggot/maggot-hit1.ogg differ
diff --git a/sfx/monsters/maggot/maggot-hit2.ogg b/sfx/monsters/maggot/maggot-hit2.ogg
new file mode 100644
index 00000000..12d92bb9
Binary files /dev/null and b/sfx/monsters/maggot/maggot-hit2.ogg differ
diff --git a/sfx/monsters/maggot/maggot-miss1.ogg b/sfx/monsters/maggot/maggot-miss1.ogg
new file mode 100644
index 00000000..a251bf97
Binary files /dev/null and b/sfx/monsters/maggot/maggot-miss1.ogg differ
diff --git a/sfx/monsters/pinkie/pinkie-hit1.ogg b/sfx/monsters/pinkie/pinkie-hit1.ogg
new file mode 100644
index 00000000..67354790
Binary files /dev/null and b/sfx/monsters/pinkie/pinkie-hit1.ogg differ
diff --git a/sfx/monsters/pinkie/pinkie-miss1.ogg b/sfx/monsters/pinkie/pinkie-miss1.ogg
new file mode 100644
index 00000000..d931bc47
Binary files /dev/null and b/sfx/monsters/pinkie/pinkie-miss1.ogg differ
diff --git a/sfx/monsters/scorpion/scorpion-hit1.ogg b/sfx/monsters/scorpion/scorpion-hit1.ogg
new file mode 100644
index 00000000..d0cf8d03
Binary files /dev/null and b/sfx/monsters/scorpion/scorpion-hit1.ogg differ
diff --git a/sfx/monsters/scorpion/scorpion-hit2.ogg b/sfx/monsters/scorpion/scorpion-hit2.ogg
new file mode 100644
index 00000000..04521d63
Binary files /dev/null and b/sfx/monsters/scorpion/scorpion-hit2.ogg differ
diff --git a/sfx/monsters/scorpion/scorpion-hit3.ogg b/sfx/monsters/scorpion/scorpion-hit3.ogg
new file mode 100644
index 00000000..283efff2
Binary files /dev/null and b/sfx/monsters/scorpion/scorpion-hit3.ogg differ
diff --git a/sfx/monsters/scorpion/scorpion-hit4.ogg b/sfx/monsters/scorpion/scorpion-hit4.ogg
new file mode 100644
index 00000000..bef67872
Binary files /dev/null and b/sfx/monsters/scorpion/scorpion-hit4.ogg differ
diff --git a/sfx/monsters/scorpion/scorpion-miss1.ogg b/sfx/monsters/scorpion/scorpion-miss1.ogg
new file mode 100644
index 00000000..264fe44e
Binary files /dev/null and b/sfx/monsters/scorpion/scorpion-miss1.ogg differ
diff --git a/sfx/monsters/shroom/shroom-hit1.ogg b/sfx/monsters/shroom/shroom-hit1.ogg
new file mode 100644
index 00000000..7a75f1ab
Binary files /dev/null and b/sfx/monsters/shroom/shroom-hit1.ogg differ
diff --git a/sfx/monsters/slime/slime-hit1.ogg b/sfx/monsters/slime/slime-hit1.ogg
new file mode 100644
index 00000000..decf40ae
Binary files /dev/null and b/sfx/monsters/slime/slime-hit1.ogg differ
diff --git a/sfx/pinkie-hit1.ogg b/sfx/pinkie-hit1.ogg
deleted file mode 100644
index 67354790..00000000
Binary files a/sfx/pinkie-hit1.ogg and /dev/null differ
diff --git a/sfx/pinkie-miss1.ogg b/sfx/pinkie-miss1.ogg
deleted file mode 100644
index d931bc47..00000000
Binary files a/sfx/pinkie-miss1.ogg and /dev/null differ
diff --git a/sfx/scorpion-hit1.ogg b/sfx/scorpion-hit1.ogg
deleted file mode 100644
index d0cf8d03..00000000
Binary files a/sfx/scorpion-hit1.ogg and /dev/null differ
diff --git a/sfx/scorpion-hit2.ogg b/sfx/scorpion-hit2.ogg
deleted file mode 100644
index 04521d63..00000000
Binary files a/sfx/scorpion-hit2.ogg and /dev/null differ
diff --git a/sfx/scorpion-hit3.ogg b/sfx/scorpion-hit3.ogg
deleted file mode 100644
index 283efff2..00000000
Binary files a/sfx/scorpion-hit3.ogg and /dev/null differ
diff --git a/sfx/scorpion-hit4.ogg b/sfx/scorpion-hit4.ogg
deleted file mode 100644
index bef67872..00000000
Binary files a/sfx/scorpion-hit4.ogg and /dev/null differ
diff --git a/sfx/scorpion-miss1.ogg b/sfx/scorpion-miss1.ogg
deleted file mode 100644
index 264fe44e..00000000
Binary files a/sfx/scorpion-miss1.ogg and /dev/null differ
diff --git a/sfx/short-sword-hit1.ogg b/sfx/short-sword-hit1.ogg
deleted file mode 100644
index 2fc7a17b..00000000
Binary files a/sfx/short-sword-hit1.ogg and /dev/null differ
diff --git a/sfx/short-sword-miss1.ogg b/sfx/short-sword-miss1.ogg
deleted file mode 100644
index ba76d967..00000000
Binary files a/sfx/short-sword-miss1.ogg and /dev/null differ
diff --git a/sfx/shroom-hit1.ogg b/sfx/shroom-hit1.ogg
deleted file mode 100644
index 7a75f1ab..00000000
Binary files a/sfx/shroom-hit1.ogg and /dev/null differ
diff --git a/sfx/slime-hit1.ogg b/sfx/slime-hit1.ogg
deleted file mode 100644
index decf40ae..00000000
Binary files a/sfx/slime-hit1.ogg and /dev/null differ
diff --git a/sfx/system/levelup.ogg b/sfx/system/levelup.ogg
new file mode 100644
index 00000000..84f070e5
Binary files /dev/null and b/sfx/system/levelup.ogg differ
diff --git a/sfx/weapons/bows/bow_shoot_1.ogg b/sfx/weapons/bows/bow_shoot_1.ogg
new file mode 100644
index 00000000..872669c1
Binary files /dev/null and b/sfx/weapons/bows/bow_shoot_1.ogg differ
diff --git a/sfx/weapons/fists/fist-swish.ogg b/sfx/weapons/fists/fist-swish.ogg
new file mode 100644
index 00000000..757d0f77
Binary files /dev/null and b/sfx/weapons/fists/fist-swish.ogg differ
diff --git a/sfx/weapons/knives/knife-hit1.ogg b/sfx/weapons/knives/knife-hit1.ogg
new file mode 100644
index 00000000..5ed879e4
Binary files /dev/null and b/sfx/weapons/knives/knife-hit1.ogg differ
diff --git a/sfx/weapons/knives/knife-miss1.ogg b/sfx/weapons/knives/knife-miss1.ogg
new file mode 100644
index 00000000..b43229f2
Binary files /dev/null and b/sfx/weapons/knives/knife-miss1.ogg differ
diff --git a/sfx/weapons/swords/short-sword-hit1.ogg b/sfx/weapons/swords/short-sword-hit1.ogg
new file mode 100644
index 00000000..2fc7a17b
Binary files /dev/null and b/sfx/weapons/swords/short-sword-hit1.ogg differ
diff --git a/sfx/weapons/swords/short-sword-miss1.ogg b/sfx/weapons/swords/short-sword-miss1.ogg
new file mode 100644
index 00000000..ba76d967
Binary files /dev/null and b/sfx/weapons/swords/short-sword-miss1.ogg differ
-- 
cgit v1.2.3-70-g09d2