diff --git a/gameplay/stages/mainStage/hall-of-fame-tweet.png b/exclude/funnies/hall-of-fame-tweet.png
similarity index 100%
rename from gameplay/stages/mainStage/hall-of-fame-tweet.png
rename to exclude/funnies/hall-of-fame-tweet.png
diff --git a/gameplay/stages/mainStage/lol.png b/exclude/funnies/lol.png
similarity index 100%
rename from gameplay/stages/mainStage/lol.png
rename to exclude/funnies/lol.png
diff --git a/gameplay/stages/mainStage/open-sauce-forever.png b/exclude/funnies/open-sauce-forever.png
similarity index 100%
rename from gameplay/stages/mainStage/open-sauce-forever.png
rename to exclude/funnies/open-sauce-forever.png
diff --git a/gameplay/stages/mainStage/screencap-tier-image.png b/exclude/funnies/screencap-tier-image.png
similarity index 100%
rename from gameplay/stages/mainStage/screencap-tier-image.png
rename to exclude/funnies/screencap-tier-image.png
diff --git a/gameplay/stages/mainStage/week-12-leak.jpg b/exclude/funnies/week-12-leak.jpg
similarity index 100%
rename from gameplay/stages/mainStage/week-12-leak.jpg
rename to exclude/funnies/week-12-leak.jpg
diff --git a/gameplay/stages/mainStage/week-54-prototype.png b/exclude/funnies/week-54-prototype.png
similarity index 100%
rename from gameplay/stages/mainStage/week-54-prototype.png
rename to exclude/funnies/week-54-prototype.png
diff --git a/gameplay/stages/mainStage/zzzzzzzz.png b/exclude/funnies/zzzzzzzz.png
similarity index 100%
rename from gameplay/stages/mainStage/zzzzzzzz.png
rename to exclude/funnies/zzzzzzzz.png
diff --git a/gameplay/characters/mom/mom.png b/gameplay/characters/unused/mom/mom.png
similarity index 100%
rename from gameplay/characters/mom/mom.png
rename to gameplay/characters/unused/mom/mom.png
diff --git a/gameplay/characters/mom/mom.xml b/gameplay/characters/unused/mom/mom.xml
similarity index 100%
rename from gameplay/characters/mom/mom.xml
rename to gameplay/characters/unused/mom/mom.xml
diff --git a/gameplay/characters/bf/bf.hxc b/gameplay/characters/week1/bf/bf.hxc
similarity index 100%
rename from gameplay/characters/bf/bf.hxc
rename to gameplay/characters/week1/bf/bf.hxc
diff --git a/gameplay/characters/bf/bf.json b/gameplay/characters/week1/bf/bf.json
similarity index 100%
rename from gameplay/characters/bf/bf.json
rename to gameplay/characters/week1/bf/bf.json
diff --git a/gameplay/characters/bf/bf-fakeout/Animation.json b/gameplay/characters/week1/bf/graphics/bf-fakeout/Animation.json
similarity index 100%
rename from gameplay/characters/bf/bf-fakeout/Animation.json
rename to gameplay/characters/week1/bf/graphics/bf-fakeout/Animation.json
diff --git a/gameplay/characters/bf/bf-fakeout/spritemap1.json b/gameplay/characters/week1/bf/graphics/bf-fakeout/spritemap1.json
similarity index 100%
rename from gameplay/characters/bf/bf-fakeout/spritemap1.json
rename to gameplay/characters/week1/bf/graphics/bf-fakeout/spritemap1.json
diff --git a/gameplay/characters/bf/bf-fakeout/spritemap1.png b/gameplay/characters/week1/bf/graphics/bf-fakeout/spritemap1.png
similarity index 100%
rename from gameplay/characters/bf/bf-fakeout/spritemap1.png
rename to gameplay/characters/week1/bf/graphics/bf-fakeout/spritemap1.png
diff --git a/gameplay/characters/bf/boyfriend-cheer.png b/gameplay/characters/week1/bf/graphics/boyfriend-cheer.png
similarity index 100%
rename from gameplay/characters/bf/boyfriend-cheer.png
rename to gameplay/characters/week1/bf/graphics/boyfriend-cheer.png
diff --git a/gameplay/characters/bf/boyfriend-cheer.xml b/gameplay/characters/week1/bf/graphics/boyfriend-cheer.xml
similarity index 100%
rename from gameplay/characters/bf/boyfriend-cheer.xml
rename to gameplay/characters/week1/bf/graphics/boyfriend-cheer.xml
diff --git a/gameplay/characters/bf/boyfriend.png b/gameplay/characters/week1/bf/graphics/boyfriend.png
similarity index 100%
rename from gameplay/characters/bf/boyfriend.png
rename to gameplay/characters/week1/bf/graphics/boyfriend.png
diff --git a/gameplay/characters/bf/boyfriend.xml b/gameplay/characters/week1/bf/graphics/boyfriend.xml
similarity index 100%
rename from gameplay/characters/bf/boyfriend.xml
rename to gameplay/characters/week1/bf/graphics/boyfriend.xml
diff --git a/gameplay/characters/bf/icon-bf-old.png b/gameplay/characters/week1/bf/icon-bf-old.png
similarity index 100%
rename from gameplay/characters/bf/icon-bf-old.png
rename to gameplay/characters/week1/bf/icon-bf-old.png
diff --git a/gameplay/characters/bf/icon-bf.png b/gameplay/characters/week1/bf/icon-bf.png
similarity index 100%
rename from gameplay/characters/bf/icon-bf.png
rename to gameplay/characters/week1/bf/icon-bf.png
diff --git a/gameplay/characters/bf/icon-face.png b/gameplay/characters/week1/bf/icon-face.png
similarity index 100%
rename from gameplay/characters/bf/icon-face.png
rename to gameplay/characters/week1/bf/icon-face.png
diff --git a/gameplay/characters/dad/dad.json b/gameplay/characters/week1/dad/dad.json
similarity index 100%
rename from gameplay/characters/dad/dad.json
rename to gameplay/characters/week1/dad/dad.json
diff --git a/gameplay/characters/dad/daddy-dearest.png b/gameplay/characters/week1/dad/daddy-dearest.png
similarity index 100%
rename from gameplay/characters/dad/daddy-dearest.png
rename to gameplay/characters/week1/dad/daddy-dearest.png
diff --git a/gameplay/characters/dad/daddy-dearest.xml b/gameplay/characters/week1/dad/daddy-dearest.xml
similarity index 100%
rename from gameplay/characters/dad/daddy-dearest.xml
rename to gameplay/characters/week1/dad/daddy-dearest.xml
diff --git a/gameplay/characters/dad/icon-dad.png b/gameplay/characters/week1/dad/icon-dad.png
similarity index 100%
rename from gameplay/characters/dad/icon-dad.png
rename to gameplay/characters/week1/dad/icon-dad.png
diff --git a/gameplay/characters/gf/gf.hxc b/gameplay/characters/week1/gf/gf.hxc
similarity index 100%
rename from gameplay/characters/gf/gf.hxc
rename to gameplay/characters/week1/gf/gf.hxc
diff --git a/gameplay/characters/gf/gf.json b/gameplay/characters/week1/gf/gf.json
similarity index 100%
rename from gameplay/characters/gf/gf.json
rename to gameplay/characters/week1/gf/gf.json
diff --git a/gameplay/characters/gf/girlfriend.png b/gameplay/characters/week1/gf/girlfriend.png
similarity index 100%
rename from gameplay/characters/gf/girlfriend.png
rename to gameplay/characters/week1/gf/girlfriend.png
diff --git a/gameplay/characters/gf/girlfriend.xml b/gameplay/characters/week1/gf/girlfriend.xml
similarity index 100%
rename from gameplay/characters/gf/girlfriend.xml
rename to gameplay/characters/week1/gf/girlfriend.xml
diff --git a/gameplay/characters/gf/icon-gf.png b/gameplay/characters/week1/gf/icon-gf.png
similarity index 100%
rename from gameplay/characters/gf/icon-gf.png
rename to gameplay/characters/week1/gf/icon-gf.png
diff --git a/gameplay/characters/monster/icon-monster.png b/gameplay/characters/week2/default/monster/icon-monster.png
similarity index 100%
rename from gameplay/characters/monster/icon-monster.png
rename to gameplay/characters/week2/default/monster/icon-monster.png
diff --git a/gameplay/characters/monster/monster-assets.png b/gameplay/characters/week2/default/monster/monster-assets.png
similarity index 100%
rename from gameplay/characters/monster/monster-assets.png
rename to gameplay/characters/week2/default/monster/monster-assets.png
diff --git a/gameplay/characters/monster/monster-assets.xml b/gameplay/characters/week2/default/monster/monster-assets.xml
similarity index 100%
rename from gameplay/characters/monster/monster-assets.xml
rename to gameplay/characters/week2/default/monster/monster-assets.xml
diff --git a/gameplay/characters/monster/monster.json b/gameplay/characters/week2/default/monster/monster.json
similarity index 100%
rename from gameplay/characters/monster/monster.json
rename to gameplay/characters/week2/default/monster/monster.json
diff --git a/gameplay/characters/spooky/icon-spooky.png b/gameplay/characters/week2/default/spooky/icon-spooky.png
similarity index 100%
rename from gameplay/characters/spooky/icon-spooky.png
rename to gameplay/characters/week2/default/spooky/icon-spooky.png
diff --git a/gameplay/characters/spooky/spooky-kids.png b/gameplay/characters/week2/default/spooky/spooky-kids.png
similarity index 100%
rename from gameplay/characters/spooky/spooky-kids.png
rename to gameplay/characters/week2/default/spooky/spooky-kids.png
diff --git a/gameplay/characters/spooky/spooky-kids.xml b/gameplay/characters/week2/default/spooky/spooky-kids.xml
similarity index 100%
rename from gameplay/characters/spooky/spooky-kids.xml
rename to gameplay/characters/week2/default/spooky/spooky-kids.xml
diff --git a/gameplay/characters/spooky/spooky.json b/gameplay/characters/week2/default/spooky/spooky.json
similarity index 100%
rename from gameplay/characters/spooky/spooky.json
rename to gameplay/characters/week2/default/spooky/spooky.json
diff --git a/gameplay/characters/bf-dark/bf-dark.hxc b/gameplay/characters/week2/erect/bf-dark/bf-dark.hxc
similarity index 100%
rename from gameplay/characters/bf-dark/bf-dark.hxc
rename to gameplay/characters/week2/erect/bf-dark/bf-dark.hxc
diff --git a/gameplay/characters/bf-dark/bf-dark.json b/gameplay/characters/week2/erect/bf-dark/bf-dark.json
similarity index 100%
rename from gameplay/characters/bf-dark/bf-dark.json
rename to gameplay/characters/week2/erect/bf-dark/bf-dark.json
diff --git a/gameplay/characters/bf-dark/bf-dark.png b/gameplay/characters/week2/erect/bf-dark/bf-dark.png
similarity index 100%
rename from gameplay/characters/bf-dark/bf-dark.png
rename to gameplay/characters/week2/erect/bf-dark/bf-dark.png
diff --git a/gameplay/characters/bf-dark/bf-dark.xml b/gameplay/characters/week2/erect/bf-dark/bf-dark.xml
similarity index 100%
rename from gameplay/characters/bf-dark/bf-dark.xml
rename to gameplay/characters/week2/erect/bf-dark/bf-dark.xml
diff --git a/gameplay/characters/gf-dark/gf-dark.hxc b/gameplay/characters/week2/erect/gf-dark/gf-dark.hxc
similarity index 100%
rename from gameplay/characters/gf-dark/gf-dark.hxc
rename to gameplay/characters/week2/erect/gf-dark/gf-dark.hxc
diff --git a/gameplay/characters/gf-dark/gf-dark.json b/gameplay/characters/week2/erect/gf-dark/gf-dark.json
similarity index 100%
rename from gameplay/characters/gf-dark/gf-dark.json
rename to gameplay/characters/week2/erect/gf-dark/gf-dark.json
diff --git a/gameplay/characters/gf-dark/gf-dark.png b/gameplay/characters/week2/erect/gf-dark/gf-dark.png
similarity index 100%
rename from gameplay/characters/gf-dark/gf-dark.png
rename to gameplay/characters/week2/erect/gf-dark/gf-dark.png
diff --git a/gameplay/characters/gf-dark/gf-dark.xml b/gameplay/characters/week2/erect/gf-dark/gf-dark.xml
similarity index 100%
rename from gameplay/characters/gf-dark/gf-dark.xml
rename to gameplay/characters/week2/erect/gf-dark/gf-dark.xml
diff --git a/gameplay/characters/nene-dark/abot-system-dark/Animation.json b/gameplay/characters/week2/pico/nene-dark/abot-system-dark/Animation.json
similarity index 100%
rename from gameplay/characters/nene-dark/abot-system-dark/Animation.json
rename to gameplay/characters/week2/pico/nene-dark/abot-system-dark/Animation.json
diff --git a/gameplay/characters/nene-dark/abot-system-dark/spritemap1.json b/gameplay/characters/week2/pico/nene-dark/abot-system-dark/spritemap1.json
similarity index 100%
rename from gameplay/characters/nene-dark/abot-system-dark/spritemap1.json
rename to gameplay/characters/week2/pico/nene-dark/abot-system-dark/spritemap1.json
diff --git a/gameplay/characters/nene-dark/abot-system-dark/spritemap1.png b/gameplay/characters/week2/pico/nene-dark/abot-system-dark/spritemap1.png
similarity index 100%
rename from gameplay/characters/nene-dark/abot-system-dark/spritemap1.png
rename to gameplay/characters/week2/pico/nene-dark/abot-system-dark/spritemap1.png
diff --git a/gameplay/characters/nene-dark/nene-dark.hxc b/gameplay/characters/week2/pico/nene-dark/nene-dark.hxc
similarity index 100%
rename from gameplay/characters/nene-dark/nene-dark.hxc
rename to gameplay/characters/week2/pico/nene-dark/nene-dark.hxc
diff --git a/gameplay/characters/nene-dark/nene-dark.json b/gameplay/characters/week2/pico/nene-dark/nene-dark.json
similarity index 100%
rename from gameplay/characters/nene-dark/nene-dark.json
rename to gameplay/characters/week2/pico/nene-dark/nene-dark.json
diff --git a/gameplay/characters/nene-dark/nene-dark.png b/gameplay/characters/week2/pico/nene-dark/nene-dark.png
similarity index 100%
rename from gameplay/characters/nene-dark/nene-dark.png
rename to gameplay/characters/week2/pico/nene-dark/nene-dark.png
diff --git a/gameplay/characters/nene-dark/nene-dark.xml b/gameplay/characters/week2/pico/nene-dark/nene-dark.xml
similarity index 100%
rename from gameplay/characters/nene-dark/nene-dark.xml
rename to gameplay/characters/week2/pico/nene-dark/nene-dark.xml
diff --git a/gameplay/characters/pico-dark/pico-dark.hxc b/gameplay/characters/week2/pico/pico-dark/pico-dark.hxc
similarity index 100%
rename from gameplay/characters/pico-dark/pico-dark.hxc
rename to gameplay/characters/week2/pico/pico-dark/pico-dark.hxc
diff --git a/gameplay/characters/pico-dark/pico-dark.json b/gameplay/characters/week2/pico/pico-dark/pico-dark.json
similarity index 100%
rename from gameplay/characters/pico-dark/pico-dark.json
rename to gameplay/characters/week2/pico/pico-dark/pico-dark.json
diff --git a/gameplay/characters/pico-dark/pico-dark.png b/gameplay/characters/week2/pico/pico-dark/pico-dark.png
similarity index 100%
rename from gameplay/characters/pico-dark/pico-dark.png
rename to gameplay/characters/week2/pico/pico-dark/pico-dark.png
diff --git a/gameplay/characters/pico-dark/pico-dark.xml b/gameplay/characters/week2/pico/pico-dark/pico-dark.xml
similarity index 100%
rename from gameplay/characters/pico-dark/pico-dark.xml
rename to gameplay/characters/week2/pico/pico-dark/pico-dark.xml
diff --git a/gameplay/characters/spooky-dark/spooky-dark.hxc b/gameplay/characters/week2/pico/spooky-dark/spooky-dark.hxc
similarity index 100%
rename from gameplay/characters/spooky-dark/spooky-dark.hxc
rename to gameplay/characters/week2/pico/spooky-dark/spooky-dark.hxc
diff --git a/gameplay/characters/spooky-dark/spooky-dark.json b/gameplay/characters/week2/pico/spooky-dark/spooky-dark.json
similarity index 100%
rename from gameplay/characters/spooky-dark/spooky-dark.json
rename to gameplay/characters/week2/pico/spooky-dark/spooky-dark.json
diff --git a/gameplay/characters/spooky-dark/spooky-dark.png b/gameplay/characters/week2/pico/spooky-dark/spooky-dark.png
similarity index 100%
rename from gameplay/characters/spooky-dark/spooky-dark.png
rename to gameplay/characters/week2/pico/spooky-dark/spooky-dark.png
diff --git a/gameplay/characters/spooky-dark/spooky-dark.xml b/gameplay/characters/week2/pico/spooky-dark/spooky-dark.xml
similarity index 100%
rename from gameplay/characters/spooky-dark/spooky-dark.xml
rename to gameplay/characters/week2/pico/spooky-dark/spooky-dark.xml
diff --git a/gameplay/characters/pico/icon-pico.png b/gameplay/characters/week3/pico/icon-pico.png
similarity index 100%
rename from gameplay/characters/pico/icon-pico.png
rename to gameplay/characters/week3/pico/icon-pico.png
diff --git a/gameplay/characters/pico/pico.json b/gameplay/characters/week3/pico/pico.json
similarity index 100%
rename from gameplay/characters/pico/pico.json
rename to gameplay/characters/week3/pico/pico.json
diff --git a/gameplay/characters/pico/pico.png b/gameplay/characters/week3/pico/pico.png
similarity index 100%
rename from gameplay/characters/pico/pico.png
rename to gameplay/characters/week3/pico/pico.png
diff --git a/gameplay/characters/pico/pico.xml b/gameplay/characters/week3/pico/pico.xml
similarity index 100%
rename from gameplay/characters/pico/pico.xml
rename to gameplay/characters/week3/pico/pico.xml
diff --git a/gameplay/characters/bf-car/bf-car.json b/gameplay/characters/week4/bf-car/bf-car.json
similarity index 100%
rename from gameplay/characters/bf-car/bf-car.json
rename to gameplay/characters/week4/bf-car/bf-car.json
diff --git a/gameplay/characters/bf-car/bf-car.png b/gameplay/characters/week4/bf-car/bf-car.png
similarity index 100%
rename from gameplay/characters/bf-car/bf-car.png
rename to gameplay/characters/week4/bf-car/bf-car.png
diff --git a/gameplay/characters/bf-car/bf-car.xml b/gameplay/characters/week4/bf-car/bf-car.xml
similarity index 100%
rename from gameplay/characters/bf-car/bf-car.xml
rename to gameplay/characters/week4/bf-car/bf-car.xml
diff --git a/gameplay/characters/gf-car/gf-car.json b/gameplay/characters/week4/gf-car/gf-car.json
similarity index 100%
rename from gameplay/characters/gf-car/gf-car.json
rename to gameplay/characters/week4/gf-car/gf-car.json
diff --git a/gameplay/characters/gf-car/gf-car.png b/gameplay/characters/week4/gf-car/gf-car.png
similarity index 100%
rename from gameplay/characters/gf-car/gf-car.png
rename to gameplay/characters/week4/gf-car/gf-car.png
diff --git a/gameplay/characters/gf-car/gf-car.xml b/gameplay/characters/week4/gf-car/gf-car.xml
similarity index 100%
rename from gameplay/characters/gf-car/gf-car.xml
rename to gameplay/characters/week4/gf-car/gf-car.xml
diff --git a/gameplay/characters/mom-car/icon-mom.png b/gameplay/characters/week4/mom-car/icon-mom.png
similarity index 100%
rename from gameplay/characters/mom-car/icon-mom.png
rename to gameplay/characters/week4/mom-car/icon-mom.png
diff --git a/gameplay/characters/mom-car/mom-car.json b/gameplay/characters/week4/mom-car/mom-car.json
similarity index 100%
rename from gameplay/characters/mom-car/mom-car.json
rename to gameplay/characters/week4/mom-car/mom-car.json
diff --git a/gameplay/characters/mom-car/mom-car.png b/gameplay/characters/week4/mom-car/mom-car.png
similarity index 100%
rename from gameplay/characters/mom-car/mom-car.png
rename to gameplay/characters/week4/mom-car/mom-car.png
diff --git a/gameplay/characters/mom-car/mom-car.xml b/gameplay/characters/week4/mom-car/mom-car.xml
similarity index 100%
rename from gameplay/characters/mom-car/mom-car.xml
rename to gameplay/characters/week4/mom-car/mom-car.xml
diff --git a/gameplay/characters/bf-christmas/bf-christmas.hxc b/gameplay/characters/week5/default/bf-christmas/bf-christmas.hxc
similarity index 100%
rename from gameplay/characters/bf-christmas/bf-christmas.hxc
rename to gameplay/characters/week5/default/bf-christmas/bf-christmas.hxc
diff --git a/gameplay/characters/bf-christmas/bf-christmas.json b/gameplay/characters/week5/default/bf-christmas/bf-christmas.json
similarity index 100%
rename from gameplay/characters/bf-christmas/bf-christmas.json
rename to gameplay/characters/week5/default/bf-christmas/bf-christmas.json
diff --git a/gameplay/characters/bf-christmas/bf-christmas-censored.png b/gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas-censored.png
similarity index 100%
rename from gameplay/characters/bf-christmas/bf-christmas-censored.png
rename to gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas-censored.png
diff --git a/gameplay/characters/bf-christmas/bf-christmas-censored.xml b/gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas-censored.xml
similarity index 100%
rename from gameplay/characters/bf-christmas/bf-christmas-censored.xml
rename to gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas-censored.xml
diff --git a/gameplay/characters/bf-christmas/bf-christmas.png b/gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas.png
similarity index 100%
rename from gameplay/characters/bf-christmas/bf-christmas.png
rename to gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas.png
diff --git a/gameplay/characters/bf-christmas/bf-christmas.xml b/gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas.xml
similarity index 100%
rename from gameplay/characters/bf-christmas/bf-christmas.xml
rename to gameplay/characters/week5/default/bf-christmas/graphics/bf-christmas.xml
diff --git a/gameplay/characters/bf-christmas/icon-bf-christmas.png b/gameplay/characters/week5/default/bf-christmas/icon-bf-christmas.png
similarity index 100%
rename from gameplay/characters/bf-christmas/icon-bf-christmas.png
rename to gameplay/characters/week5/default/bf-christmas/icon-bf-christmas.png
diff --git a/gameplay/characters/gf-christmas/gf-christmas.json b/gameplay/characters/week5/default/gf-christmas/gf-christmas.json
similarity index 100%
rename from gameplay/characters/gf-christmas/gf-christmas.json
rename to gameplay/characters/week5/default/gf-christmas/gf-christmas.json
diff --git a/gameplay/characters/gf-christmas/gf-christmas.png b/gameplay/characters/week5/default/gf-christmas/gf-christmas.png
similarity index 100%
rename from gameplay/characters/gf-christmas/gf-christmas.png
rename to gameplay/characters/week5/default/gf-christmas/gf-christmas.png
diff --git a/gameplay/characters/gf-christmas/gf-christmas.xml b/gameplay/characters/week5/default/gf-christmas/gf-christmas.xml
similarity index 100%
rename from gameplay/characters/gf-christmas/gf-christmas.xml
rename to gameplay/characters/week5/default/gf-christmas/gf-christmas.xml
diff --git a/gameplay/characters/monster-christmas/monster-christmas.json b/gameplay/characters/week5/default/monster-christmas/monster-christmas.json
similarity index 100%
rename from gameplay/characters/monster-christmas/monster-christmas.json
rename to gameplay/characters/week5/default/monster-christmas/monster-christmas.json
diff --git a/gameplay/characters/monster-christmas/monster-christmas.png b/gameplay/characters/week5/default/monster-christmas/monster-christmas.png
similarity index 100%
rename from gameplay/characters/monster-christmas/monster-christmas.png
rename to gameplay/characters/week5/default/monster-christmas/monster-christmas.png
diff --git a/gameplay/characters/monster-christmas/monster-christmas.xml b/gameplay/characters/week5/default/monster-christmas/monster-christmas.xml
similarity index 100%
rename from gameplay/characters/monster-christmas/monster-christmas.xml
rename to gameplay/characters/week5/default/monster-christmas/monster-christmas.xml
diff --git a/gameplay/characters/parents-christmas/icon-parents-christmas.png b/gameplay/characters/week5/default/parents-christmas/icon-parents-christmas.png
similarity index 100%
rename from gameplay/characters/parents-christmas/icon-parents-christmas.png
rename to gameplay/characters/week5/default/parents-christmas/icon-parents-christmas.png
diff --git a/gameplay/characters/parents-christmas/icon-parents.png b/gameplay/characters/week5/default/parents-christmas/icon-parents.png
similarity index 100%
rename from gameplay/characters/parents-christmas/icon-parents.png
rename to gameplay/characters/week5/default/parents-christmas/icon-parents.png
diff --git a/gameplay/characters/parents-christmas/parents-christmas.hxc b/gameplay/characters/week5/default/parents-christmas/parents-christmas.hxc
similarity index 100%
rename from gameplay/characters/parents-christmas/parents-christmas.hxc
rename to gameplay/characters/week5/default/parents-christmas/parents-christmas.hxc
diff --git a/gameplay/characters/parents-christmas/parents-christmas.json b/gameplay/characters/week5/default/parents-christmas/parents-christmas.json
similarity index 100%
rename from gameplay/characters/parents-christmas/parents-christmas.json
rename to gameplay/characters/week5/default/parents-christmas/parents-christmas.json
diff --git a/gameplay/characters/parents-christmas/parents-christmas.png b/gameplay/characters/week5/default/parents-christmas/parents-christmas.png
similarity index 100%
rename from gameplay/characters/parents-christmas/parents-christmas.png
rename to gameplay/characters/week5/default/parents-christmas/parents-christmas.png
diff --git a/gameplay/characters/parents-christmas/parents-christmas.xml b/gameplay/characters/week5/default/parents-christmas/parents-christmas.xml
similarity index 100%
rename from gameplay/characters/parents-christmas/parents-christmas.xml
rename to gameplay/characters/week5/default/parents-christmas/parents-christmas.xml
diff --git a/gameplay/characters/nene-christmas/nene-christmas-knife.png b/gameplay/characters/week5/pico/nene-christmas/nene-christmas-knife.png
similarity index 100%
rename from gameplay/characters/nene-christmas/nene-christmas-knife.png
rename to gameplay/characters/week5/pico/nene-christmas/nene-christmas-knife.png
diff --git a/gameplay/characters/nene-christmas/nene-christmas-knife.xml b/gameplay/characters/week5/pico/nene-christmas/nene-christmas-knife.xml
similarity index 100%
rename from gameplay/characters/nene-christmas/nene-christmas-knife.xml
rename to gameplay/characters/week5/pico/nene-christmas/nene-christmas-knife.xml
diff --git a/gameplay/characters/nene-christmas/nene-christmas.hxc b/gameplay/characters/week5/pico/nene-christmas/nene-christmas.hxc
similarity index 100%
rename from gameplay/characters/nene-christmas/nene-christmas.hxc
rename to gameplay/characters/week5/pico/nene-christmas/nene-christmas.hxc
diff --git a/gameplay/characters/nene-christmas/nene-christmas.json b/gameplay/characters/week5/pico/nene-christmas/nene-christmas.json
similarity index 100%
rename from gameplay/characters/nene-christmas/nene-christmas.json
rename to gameplay/characters/week5/pico/nene-christmas/nene-christmas.json
diff --git a/gameplay/characters/nene-christmas/nene-christmas.png b/gameplay/characters/week5/pico/nene-christmas/nene-christmas.png
similarity index 100%
rename from gameplay/characters/nene-christmas/nene-christmas.png
rename to gameplay/characters/week5/pico/nene-christmas/nene-christmas.png
diff --git a/gameplay/characters/nene-christmas/nene-christmas.xml b/gameplay/characters/week5/pico/nene-christmas/nene-christmas.xml
similarity index 100%
rename from gameplay/characters/nene-christmas/nene-christmas.xml
rename to gameplay/characters/week5/pico/nene-christmas/nene-christmas.xml
diff --git a/gameplay/characters/pico-christmas/pico-christmas-death.png b/gameplay/characters/week5/pico/pico-christmas/pico-christmas-death.png
similarity index 100%
rename from gameplay/characters/pico-christmas/pico-christmas-death.png
rename to gameplay/characters/week5/pico/pico-christmas/pico-christmas-death.png
diff --git a/gameplay/characters/pico-christmas/pico-christmas-death.xml b/gameplay/characters/week5/pico/pico-christmas/pico-christmas-death.xml
similarity index 100%
rename from gameplay/characters/pico-christmas/pico-christmas-death.xml
rename to gameplay/characters/week5/pico/pico-christmas/pico-christmas-death.xml
diff --git a/gameplay/characters/pico-christmas/pico-christmas.hxc b/gameplay/characters/week5/pico/pico-christmas/pico-christmas.hxc
similarity index 100%
rename from gameplay/characters/pico-christmas/pico-christmas.hxc
rename to gameplay/characters/week5/pico/pico-christmas/pico-christmas.hxc
diff --git a/gameplay/characters/pico-christmas/pico-christmas.json b/gameplay/characters/week5/pico/pico-christmas/pico-christmas.json
similarity index 100%
rename from gameplay/characters/pico-christmas/pico-christmas.json
rename to gameplay/characters/week5/pico/pico-christmas/pico-christmas.json
diff --git a/gameplay/characters/pico-christmas/pico-christmas.png b/gameplay/characters/week5/pico/pico-christmas/pico-christmas.png
similarity index 100%
rename from gameplay/characters/pico-christmas/pico-christmas.png
rename to gameplay/characters/week5/pico/pico-christmas/pico-christmas.png
diff --git a/gameplay/characters/pico-christmas/pico-christmas.xml b/gameplay/characters/week5/pico/pico-christmas/pico-christmas.xml
similarity index 100%
rename from gameplay/characters/pico-christmas/pico-christmas.xml
rename to gameplay/characters/week5/pico/pico-christmas/pico-christmas.xml
diff --git a/gameplay/characters/bf-pixel/bf-pixel.hxc b/gameplay/characters/week6/bf-pixel/bf-pixel.hxc
similarity index 100%
rename from gameplay/characters/bf-pixel/bf-pixel.hxc
rename to gameplay/characters/week6/bf-pixel/bf-pixel.hxc
diff --git a/gameplay/characters/bf-pixel/bf-pixel.json b/gameplay/characters/week6/bf-pixel/bf-pixel.json
similarity index 100%
rename from gameplay/characters/bf-pixel/bf-pixel.json
rename to gameplay/characters/week6/bf-pixel/bf-pixel.json
diff --git a/gameplay/characters/bf-pixel/bf-pixel-dead.png b/gameplay/characters/week6/bf-pixel/graphics/bf-pixel-dead.png
similarity index 100%
rename from gameplay/characters/bf-pixel/bf-pixel-dead.png
rename to gameplay/characters/week6/bf-pixel/graphics/bf-pixel-dead.png
diff --git a/gameplay/characters/bf-pixel/bf-pixel-dead.xml b/gameplay/characters/week6/bf-pixel/graphics/bf-pixel-dead.xml
similarity index 100%
rename from gameplay/characters/bf-pixel/bf-pixel-dead.xml
rename to gameplay/characters/week6/bf-pixel/graphics/bf-pixel-dead.xml
diff --git a/gameplay/characters/bf-pixel/bf-pixel.png b/gameplay/characters/week6/bf-pixel/graphics/bf-pixel.png
similarity index 100%
rename from gameplay/characters/bf-pixel/bf-pixel.png
rename to gameplay/characters/week6/bf-pixel/graphics/bf-pixel.png
diff --git a/gameplay/characters/bf-pixel/bf-pixel.xml b/gameplay/characters/week6/bf-pixel/graphics/bf-pixel.xml
similarity index 100%
rename from gameplay/characters/bf-pixel/bf-pixel.xml
rename to gameplay/characters/week6/bf-pixel/graphics/bf-pixel.xml
diff --git a/gameplay/characters/bf-pixel/icon-bf-pixel.png b/gameplay/characters/week6/bf-pixel/icon-bf-pixel.png
similarity index 100%
rename from gameplay/characters/bf-pixel/icon-bf-pixel.png
rename to gameplay/characters/week6/bf-pixel/icon-bf-pixel.png
diff --git a/gameplay/characters/gf-pixel/gf-pixel.json b/gameplay/characters/week6/gf-pixel/gf-pixel.json
similarity index 100%
rename from gameplay/characters/gf-pixel/gf-pixel.json
rename to gameplay/characters/week6/gf-pixel/gf-pixel.json
diff --git a/gameplay/characters/gf-pixel/gf-pixel.png b/gameplay/characters/week6/gf-pixel/gf-pixel.png
similarity index 100%
rename from gameplay/characters/gf-pixel/gf-pixel.png
rename to gameplay/characters/week6/gf-pixel/gf-pixel.png
diff --git a/gameplay/characters/gf-pixel/gf-pixel.xml b/gameplay/characters/week6/gf-pixel/gf-pixel.xml
similarity index 100%
rename from gameplay/characters/gf-pixel/gf-pixel.xml
rename to gameplay/characters/week6/gf-pixel/gf-pixel.xml
diff --git a/gameplay/characters/senpai-angry/senpai-angry.json b/gameplay/characters/week6/senpai-angry/senpai-angry.json
similarity index 100%
rename from gameplay/characters/senpai-angry/senpai-angry.json
rename to gameplay/characters/week6/senpai-angry/senpai-angry.json
diff --git a/gameplay/characters/senpai/icon-senpai.png b/gameplay/characters/week6/senpai/icon-senpai.png
similarity index 100%
rename from gameplay/characters/senpai/icon-senpai.png
rename to gameplay/characters/week6/senpai/icon-senpai.png
diff --git a/gameplay/characters/senpai/senpai.json b/gameplay/characters/week6/senpai/senpai.json
similarity index 100%
rename from gameplay/characters/senpai/senpai.json
rename to gameplay/characters/week6/senpai/senpai.json
diff --git a/gameplay/characters/senpai/senpai.png b/gameplay/characters/week6/senpai/senpai.png
similarity index 100%
rename from gameplay/characters/senpai/senpai.png
rename to gameplay/characters/week6/senpai/senpai.png
diff --git a/gameplay/characters/senpai/senpai.xml b/gameplay/characters/week6/senpai/senpai.xml
similarity index 100%
rename from gameplay/characters/senpai/senpai.xml
rename to gameplay/characters/week6/senpai/senpai.xml
diff --git a/gameplay/characters/spirit/icon-spirit.png b/gameplay/characters/week6/spirit/icon-spirit.png
similarity index 100%
rename from gameplay/characters/spirit/icon-spirit.png
rename to gameplay/characters/week6/spirit/icon-spirit.png
diff --git a/gameplay/characters/spirit/spirit.hxc b/gameplay/characters/week6/spirit/spirit.hxc
similarity index 100%
rename from gameplay/characters/spirit/spirit.hxc
rename to gameplay/characters/week6/spirit/spirit.hxc
diff --git a/gameplay/characters/spirit/spirit.json b/gameplay/characters/week6/spirit/spirit.json
similarity index 100%
rename from gameplay/characters/spirit/spirit.json
rename to gameplay/characters/week6/spirit/spirit.json
diff --git a/gameplay/characters/spirit/spirit.png b/gameplay/characters/week6/spirit/spirit.png
similarity index 100%
rename from gameplay/characters/spirit/spirit.png
rename to gameplay/characters/week6/spirit/spirit.png
diff --git a/gameplay/characters/spirit/spirit.txt b/gameplay/characters/week6/spirit/spirit.txt
similarity index 100%
rename from gameplay/characters/spirit/spirit.txt
rename to gameplay/characters/week6/spirit/spirit.txt
diff --git a/gameplay/characters/bf-holding-gf/bf-holding-gf.json b/gameplay/characters/week7/bf-holding-gf/bf-holding-gf.json
similarity index 100%
rename from gameplay/characters/bf-holding-gf/bf-holding-gf.json
rename to gameplay/characters/week7/bf-holding-gf/bf-holding-gf.json
diff --git a/gameplay/characters/bf-holding-gf/bf-holding-gf-dead.png b/gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf-dead.png
similarity index 100%
rename from gameplay/characters/bf-holding-gf/bf-holding-gf-dead.png
rename to gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf-dead.png
diff --git a/gameplay/characters/bf-holding-gf/bf-holding-gf-dead.xml b/gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf-dead.xml
similarity index 100%
rename from gameplay/characters/bf-holding-gf/bf-holding-gf-dead.xml
rename to gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf-dead.xml
diff --git a/gameplay/characters/bf-holding-gf/bf-holding-gf.png b/gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf.png
similarity index 100%
rename from gameplay/characters/bf-holding-gf/bf-holding-gf.png
rename to gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf.png
diff --git a/gameplay/characters/bf-holding-gf/bf-holding-gf.xml b/gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf.xml
similarity index 100%
rename from gameplay/characters/bf-holding-gf/bf-holding-gf.xml
rename to gameplay/characters/week7/bf-holding-gf/graphics/bf-holding-gf.xml
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-1.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-1.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-1.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-1.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-1.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-1.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-1.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-1.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-10.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-10.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-10.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-10.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-10.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-10.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-10.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-10.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-11.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-11.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-11.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-11.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-11.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-11.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-11.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-11.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-12.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-12.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-12.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-12.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-12.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-12.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-12.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-12.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-13.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-13.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-13.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-13.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-13.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-13.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-13.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-13.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-14.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-14.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-14.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-14.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-14.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-14.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-14.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-14.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-15.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-15.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-15.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-15.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-15.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-15.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-15.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-15.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-16.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-16.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-16.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-16.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-16.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-16.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-16.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-16.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-17.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-17.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-17.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-17.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-17.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-17.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-17.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-17.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-18.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-18.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-18.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-18.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-18.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-18.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-18.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-18.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-19.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-19.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-19.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-19.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-19.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-19.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-19.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-19.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-2.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-2.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-2.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-2.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-2.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-2.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-2.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-2.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-20.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-20.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-20.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-20.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-20.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-20.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-20.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-20.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-21.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-21.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-21.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-21.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-21.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-21.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-21.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-21.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-22.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-22.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-22.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-22.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-22.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-22.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-22.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-22.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-23.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-23.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-23.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-23.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-23.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-23.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-23.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-23.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-24.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-24.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-24.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-24.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-24.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-24.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-24.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-24.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-25.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-25.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-25.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-25.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-25.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-25.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-25.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-25.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-3.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-3.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-3.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-3.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-3.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-3.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-3.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-3.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-4.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-4.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-4.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-4.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-4.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-4.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-4.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-4.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-5.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-5.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-5.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-5.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-5.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-5.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-5.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-5.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-6.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-6.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-6.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-6.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-6.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-6.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-6.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-6.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-7.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-7.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-7.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-7.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-7.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-7.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-7.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-7.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-8.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-8.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-8.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-8.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-8.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-8.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-8.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-8.ogg
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-9.mp3 b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-9.mp3
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-9.mp3
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-9.mp3
diff --git a/gameplay/characters/bf-holding-gf/sounds/jeff-gameover-9.ogg b/gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-9.ogg
similarity index 100%
rename from gameplay/characters/bf-holding-gf/sounds/jeff-gameover-9.ogg
rename to gameplay/characters/week7/bf-holding-gf/sounds/jeff-gameover-9.ogg
diff --git a/gameplay/characters/gf-tankmen/gf-tankmen.json b/gameplay/characters/week7/gf-tankmen/gf-tankmen.json
similarity index 100%
rename from gameplay/characters/gf-tankmen/gf-tankmen.json
rename to gameplay/characters/week7/gf-tankmen/gf-tankmen.json
diff --git a/gameplay/characters/gf-tankmen/gf-tankmen.png b/gameplay/characters/week7/gf-tankmen/gf-tankmen.png
similarity index 100%
rename from gameplay/characters/gf-tankmen/gf-tankmen.png
rename to gameplay/characters/week7/gf-tankmen/gf-tankmen.png
diff --git a/gameplay/characters/gf-tankmen/gf-tankmen.xml b/gameplay/characters/week7/gf-tankmen/gf-tankmen.xml
similarity index 100%
rename from gameplay/characters/gf-tankmen/gf-tankmen.xml
rename to gameplay/characters/week7/gf-tankmen/gf-tankmen.xml
diff --git a/gameplay/characters/pico-speaker/pico-speaker.hxc b/gameplay/characters/week7/pico-speaker/pico-speaker.hxc
similarity index 100%
rename from gameplay/characters/pico-speaker/pico-speaker.hxc
rename to gameplay/characters/week7/pico-speaker/pico-speaker.hxc
diff --git a/gameplay/characters/pico-speaker/pico-speaker.json b/gameplay/characters/week7/pico-speaker/pico-speaker.json
similarity index 100%
rename from gameplay/characters/pico-speaker/pico-speaker.json
rename to gameplay/characters/week7/pico-speaker/pico-speaker.json
diff --git a/gameplay/characters/pico-speaker/pico-speaker.png b/gameplay/characters/week7/pico-speaker/pico-speaker.png
similarity index 100%
rename from gameplay/characters/pico-speaker/pico-speaker.png
rename to gameplay/characters/week7/pico-speaker/pico-speaker.png
diff --git a/gameplay/characters/pico-speaker/pico-speaker.xml b/gameplay/characters/week7/pico-speaker/pico-speaker.xml
similarity index 100%
rename from gameplay/characters/pico-speaker/pico-speaker.xml
rename to gameplay/characters/week7/pico-speaker/pico-speaker.xml
diff --git a/gameplay/characters/tankman/tankman-captain.png b/gameplay/characters/week7/tankman/graphics/tankman-captain.png
similarity index 100%
rename from gameplay/characters/tankman/tankman-captain.png
rename to gameplay/characters/week7/tankman/graphics/tankman-captain.png
diff --git a/gameplay/characters/tankman/tankman-captain.xml b/gameplay/characters/week7/tankman/graphics/tankman-captain.xml
similarity index 100%
rename from gameplay/characters/tankman/tankman-captain.xml
rename to gameplay/characters/week7/tankman/graphics/tankman-captain.xml
diff --git a/gameplay/characters/tankman/tankman-pico.png b/gameplay/characters/week7/tankman/graphics/tankman-pico.png
similarity index 100%
rename from gameplay/characters/tankman/tankman-pico.png
rename to gameplay/characters/week7/tankman/graphics/tankman-pico.png
diff --git a/gameplay/characters/tankman/tankman-pico.xml b/gameplay/characters/week7/tankman/graphics/tankman-pico.xml
similarity index 100%
rename from gameplay/characters/tankman/tankman-pico.xml
rename to gameplay/characters/week7/tankman/graphics/tankman-pico.xml
diff --git a/gameplay/characters/tankman/icon-tankman.png b/gameplay/characters/week7/tankman/icon-tankman.png
similarity index 100%
rename from gameplay/characters/tankman/icon-tankman.png
rename to gameplay/characters/week7/tankman/icon-tankman.png
diff --git a/gameplay/characters/tankman-atlas/tankman-atlas.hxc b/gameplay/characters/week7/tankman/tankman-atlas/tankman-atlas.hxc
similarity index 100%
rename from gameplay/characters/tankman-atlas/tankman-atlas.hxc
rename to gameplay/characters/week7/tankman/tankman-atlas/tankman-atlas.hxc
diff --git a/gameplay/characters/tankman-atlas/tankman-atlas.json b/gameplay/characters/week7/tankman/tankman-atlas/tankman-atlas.json
similarity index 100%
rename from gameplay/characters/tankman-atlas/tankman-atlas.json
rename to gameplay/characters/week7/tankman/tankman-atlas/tankman-atlas.json
diff --git a/gameplay/characters/tankman/tankman.hxc b/gameplay/characters/week7/tankman/tankman.hxc
similarity index 100%
rename from gameplay/characters/tankman/tankman.hxc
rename to gameplay/characters/week7/tankman/tankman.hxc
diff --git a/gameplay/characters/tankman/tankman.json b/gameplay/characters/week7/tankman/tankman.json
similarity index 100%
rename from gameplay/characters/tankman/tankman.json
rename to gameplay/characters/week7/tankman/tankman.json
diff --git a/gameplay/characters/darnell-blazin/darnell-blazin.hxc b/gameplay/characters/weekend1/darnell-blazin/darnell-blazin.hxc
similarity index 100%
rename from gameplay/characters/darnell-blazin/darnell-blazin.hxc
rename to gameplay/characters/weekend1/darnell-blazin/darnell-blazin.hxc
diff --git a/gameplay/characters/darnell-blazin/darnell-blazin.json b/gameplay/characters/weekend1/darnell-blazin/darnell-blazin.json
similarity index 100%
rename from gameplay/characters/darnell-blazin/darnell-blazin.json
rename to gameplay/characters/weekend1/darnell-blazin/darnell-blazin.json
diff --git a/gameplay/characters/darnell-blazin/darnell-blazin/Animation.json b/gameplay/characters/weekend1/darnell-blazin/darnell-blazin/Animation.json
similarity index 100%
rename from gameplay/characters/darnell-blazin/darnell-blazin/Animation.json
rename to gameplay/characters/weekend1/darnell-blazin/darnell-blazin/Animation.json
diff --git a/gameplay/characters/darnell-blazin/darnell-blazin/spritemap1.json b/gameplay/characters/weekend1/darnell-blazin/darnell-blazin/spritemap1.json
similarity index 100%
rename from gameplay/characters/darnell-blazin/darnell-blazin/spritemap1.json
rename to gameplay/characters/weekend1/darnell-blazin/darnell-blazin/spritemap1.json
diff --git a/gameplay/characters/darnell-blazin/darnell-blazin/spritemap1.png b/gameplay/characters/weekend1/darnell-blazin/darnell-blazin/spritemap1.png
similarity index 100%
rename from gameplay/characters/darnell-blazin/darnell-blazin/spritemap1.png
rename to gameplay/characters/weekend1/darnell-blazin/darnell-blazin/spritemap1.png
diff --git a/gameplay/characters/darnell/darnell.hxc b/gameplay/characters/weekend1/darnell/darnell.hxc
similarity index 100%
rename from gameplay/characters/darnell/darnell.hxc
rename to gameplay/characters/weekend1/darnell/darnell.hxc
diff --git a/gameplay/characters/darnell/darnell.json b/gameplay/characters/weekend1/darnell/darnell.json
similarity index 100%
rename from gameplay/characters/darnell/darnell.json
rename to gameplay/characters/weekend1/darnell/darnell.json
diff --git a/gameplay/characters/darnell/darnell.png b/gameplay/characters/weekend1/darnell/darnell.png
similarity index 100%
rename from gameplay/characters/darnell/darnell.png
rename to gameplay/characters/weekend1/darnell/darnell.png
diff --git a/gameplay/characters/darnell/darnell.xml b/gameplay/characters/weekend1/darnell/darnell.xml
similarity index 100%
rename from gameplay/characters/darnell/darnell.xml
rename to gameplay/characters/weekend1/darnell/darnell.xml
diff --git a/gameplay/characters/darnell/icon-darnell.png b/gameplay/characters/weekend1/darnell/icon-darnell.png
similarity index 100%
rename from gameplay/characters/darnell/icon-darnell.png
rename to gameplay/characters/weekend1/darnell/icon-darnell.png
diff --git a/gameplay/characters/nene/abot-eyes/Animation.json b/gameplay/characters/weekend1/nene/graphics/abot/abot-eyes/Animation.json
similarity index 100%
rename from gameplay/characters/nene/abot-eyes/Animation.json
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-eyes/Animation.json
diff --git a/gameplay/characters/nene/abot-eyes/spritemap1.json b/gameplay/characters/weekend1/nene/graphics/abot/abot-eyes/spritemap1.json
similarity index 100%
rename from gameplay/characters/nene/abot-eyes/spritemap1.json
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-eyes/spritemap1.json
diff --git a/gameplay/characters/nene/abot-eyes/spritemap1.png b/gameplay/characters/weekend1/nene/graphics/abot/abot-eyes/spritemap1.png
similarity index 100%
rename from gameplay/characters/nene/abot-eyes/spritemap1.png
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-eyes/spritemap1.png
diff --git a/gameplay/characters/nene/abot-system/Animation.json b/gameplay/characters/weekend1/nene/graphics/abot/abot-system/Animation.json
similarity index 100%
rename from gameplay/characters/nene/abot-system/Animation.json
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-system/Animation.json
diff --git a/gameplay/characters/nene/abot-system/spritemap1.json b/gameplay/characters/weekend1/nene/graphics/abot/abot-system/spritemap1.json
similarity index 100%
rename from gameplay/characters/nene/abot-system/spritemap1.json
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-system/spritemap1.json
diff --git a/gameplay/characters/nene/abot-system/spritemap1.png b/gameplay/characters/weekend1/nene/graphics/abot/abot-system/spritemap1.png
similarity index 100%
rename from gameplay/characters/nene/abot-system/spritemap1.png
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-system/spritemap1.png
diff --git a/gameplay/characters/nene/abot-viz.png b/gameplay/characters/weekend1/nene/graphics/abot/abot-viz.png
similarity index 100%
rename from gameplay/characters/nene/abot-viz.png
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-viz.png
diff --git a/gameplay/characters/nene/abot-viz.xml b/gameplay/characters/weekend1/nene/graphics/abot/abot-viz.xml
similarity index 100%
rename from gameplay/characters/nene/abot-viz.xml
rename to gameplay/characters/weekend1/nene/graphics/abot/abot-viz.xml
diff --git a/gameplay/characters/nene/stereo-bg.png b/gameplay/characters/weekend1/nene/graphics/abot/stereo-bg.png
similarity index 100%
rename from gameplay/characters/nene/stereo-bg.png
rename to gameplay/characters/weekend1/nene/graphics/abot/stereo-bg.png
diff --git a/gameplay/characters/nene/nene-knifetoss.png b/gameplay/characters/weekend1/nene/graphics/nene-knifetoss.png
similarity index 100%
rename from gameplay/characters/nene/nene-knifetoss.png
rename to gameplay/characters/weekend1/nene/graphics/nene-knifetoss.png
diff --git a/gameplay/characters/nene/nene-knifetoss.xml b/gameplay/characters/weekend1/nene/graphics/nene-knifetoss.xml
similarity index 100%
rename from gameplay/characters/nene/nene-knifetoss.xml
rename to gameplay/characters/weekend1/nene/graphics/nene-knifetoss.xml
diff --git a/gameplay/characters/nene/nene.png b/gameplay/characters/weekend1/nene/graphics/nene.png
similarity index 100%
rename from gameplay/characters/nene/nene.png
rename to gameplay/characters/weekend1/nene/graphics/nene.png
diff --git a/gameplay/characters/nene/nene.xml b/gameplay/characters/weekend1/nene/graphics/nene.xml
similarity index 100%
rename from gameplay/characters/nene/nene.xml
rename to gameplay/characters/weekend1/nene/graphics/nene.xml
diff --git a/gameplay/characters/nene/nene.hxc b/gameplay/characters/weekend1/nene/nene.hxc
similarity index 100%
rename from gameplay/characters/nene/nene.hxc
rename to gameplay/characters/weekend1/nene/nene.hxc
diff --git a/gameplay/characters/nene/nene.json b/gameplay/characters/weekend1/nene/nene.json
similarity index 100%
rename from gameplay/characters/nene/nene.json
rename to gameplay/characters/weekend1/nene/nene.json
diff --git a/gameplay/characters/nene/ABotAtlasSprite.hxc b/gameplay/characters/weekend1/nene/scripts/ABotAtlasSprite.hxc
similarity index 100%
rename from gameplay/characters/nene/ABotAtlasSprite.hxc
rename to gameplay/characters/weekend1/nene/scripts/ABotAtlasSprite.hxc
diff --git a/gameplay/characters/nene/ABotVisualizer.hxc b/gameplay/characters/weekend1/nene/scripts/ABotVisualizer.hxc
similarity index 100%
rename from gameplay/characters/nene/ABotVisualizer.hxc
rename to gameplay/characters/weekend1/nene/scripts/ABotVisualizer.hxc
diff --git a/gameplay/characters/pico-blazin/pico-blazin-loss-confirm.png b/gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin-loss-confirm.png
similarity index 100%
rename from gameplay/characters/pico-blazin/pico-blazin-loss-confirm.png
rename to gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin-loss-confirm.png
diff --git a/gameplay/characters/pico-blazin/pico-blazin-loss-confirm.xml b/gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin-loss-confirm.xml
similarity index 100%
rename from gameplay/characters/pico-blazin/pico-blazin-loss-confirm.xml
rename to gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin-loss-confirm.xml
diff --git a/gameplay/characters/pico-blazin/pico-blazin/Animation.json b/gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin/Animation.json
similarity index 100%
rename from gameplay/characters/pico-blazin/pico-blazin/Animation.json
rename to gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin/Animation.json
diff --git a/gameplay/characters/pico-blazin/pico-blazin/spritemap1.json b/gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin/spritemap1.json
similarity index 100%
rename from gameplay/characters/pico-blazin/pico-blazin/spritemap1.json
rename to gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin/spritemap1.json
diff --git a/gameplay/characters/pico-blazin/pico-blazin/spritemap1.png b/gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin/spritemap1.png
similarity index 100%
rename from gameplay/characters/pico-blazin/pico-blazin/spritemap1.png
rename to gameplay/characters/weekend1/pico-blazin/graphics/pico-blazin/spritemap1.png
diff --git a/gameplay/characters/pico-blazin/pico-blazin.hxc b/gameplay/characters/weekend1/pico-blazin/pico-blazin.hxc
similarity index 100%
rename from gameplay/characters/pico-blazin/pico-blazin.hxc
rename to gameplay/characters/weekend1/pico-blazin/pico-blazin.hxc
diff --git a/gameplay/characters/pico-blazin/pico-blazin.json b/gameplay/characters/weekend1/pico-blazin/pico-blazin.json
similarity index 100%
rename from gameplay/characters/pico-blazin/pico-blazin.json
rename to gameplay/characters/weekend1/pico-blazin/pico-blazin.json
diff --git a/gameplay/characters/pico-playable/bonk.mp3 b/gameplay/characters/weekend1/pico-playable/audio/bonk.mp3
similarity index 100%
rename from gameplay/characters/pico-playable/bonk.mp3
rename to gameplay/characters/weekend1/pico-playable/audio/bonk.mp3
diff --git a/gameplay/characters/pico-playable/bonk.ogg b/gameplay/characters/weekend1/pico-playable/audio/bonk.ogg
similarity index 100%
rename from gameplay/characters/pico-playable/bonk.ogg
rename to gameplay/characters/weekend1/pico-playable/audio/bonk.ogg
diff --git a/gameplay/characters/pico-playable/gun-prep.mp3 b/gameplay/characters/weekend1/pico-playable/audio/gun-prep.mp3
similarity index 100%
rename from gameplay/characters/pico-playable/gun-prep.mp3
rename to gameplay/characters/weekend1/pico-playable/audio/gun-prep.mp3
diff --git a/gameplay/characters/pico-playable/gun-prep.ogg b/gameplay/characters/weekend1/pico-playable/audio/gun-prep.ogg
similarity index 100%
rename from gameplay/characters/pico-playable/gun-prep.ogg
rename to gameplay/characters/weekend1/pico-playable/audio/gun-prep.ogg
diff --git a/gameplay/characters/pico-playable/shot-1.ogg b/gameplay/characters/weekend1/pico-playable/audio/shot-1.ogg
similarity index 100%
rename from gameplay/characters/pico-playable/shot-1.ogg
rename to gameplay/characters/weekend1/pico-playable/audio/shot-1.ogg
diff --git a/gameplay/characters/pico-playable/shot-2.mp3 b/gameplay/characters/weekend1/pico-playable/audio/shot-2.mp3
similarity index 100%
rename from gameplay/characters/pico-playable/shot-2.mp3
rename to gameplay/characters/weekend1/pico-playable/audio/shot-2.mp3
diff --git a/gameplay/characters/pico-playable/shot-2.ogg b/gameplay/characters/weekend1/pico-playable/audio/shot-2.ogg
similarity index 100%
rename from gameplay/characters/pico-playable/shot-2.ogg
rename to gameplay/characters/weekend1/pico-playable/audio/shot-2.ogg
diff --git a/gameplay/characters/pico-playable/shot-3.mp3 b/gameplay/characters/weekend1/pico-playable/audio/shot-3.mp3
similarity index 100%
rename from gameplay/characters/pico-playable/shot-3.mp3
rename to gameplay/characters/weekend1/pico-playable/audio/shot-3.mp3
diff --git a/gameplay/characters/pico-playable/shot-3.ogg b/gameplay/characters/weekend1/pico-playable/audio/shot-3.ogg
similarity index 100%
rename from gameplay/characters/pico-playable/shot-3.ogg
rename to gameplay/characters/weekend1/pico-playable/audio/shot-3.ogg
diff --git a/gameplay/characters/pico-playable/shot-4.mp3 b/gameplay/characters/weekend1/pico-playable/audio/shot-4.mp3
similarity index 100%
rename from gameplay/characters/pico-playable/shot-4.mp3
rename to gameplay/characters/weekend1/pico-playable/audio/shot-4.mp3
diff --git a/gameplay/characters/pico-playable/shot-4.ogg b/gameplay/characters/weekend1/pico-playable/audio/shot-4.ogg
similarity index 100%
rename from gameplay/characters/pico-playable/shot-4.ogg
rename to gameplay/characters/weekend1/pico-playable/audio/shot-4.ogg
diff --git a/gameplay/characters/pico-playable/singed.mp3 b/gameplay/characters/weekend1/pico-playable/audio/singed.mp3
similarity index 100%
rename from gameplay/characters/pico-playable/singed.mp3
rename to gameplay/characters/weekend1/pico-playable/audio/singed.mp3
diff --git a/gameplay/characters/pico-playable/singed.ogg b/gameplay/characters/weekend1/pico-playable/audio/singed.ogg
similarity index 100%
rename from gameplay/characters/pico-playable/singed.ogg
rename to gameplay/characters/weekend1/pico-playable/audio/singed.ogg
diff --git a/gameplay/characters/pico-playable/pico-burps.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-burps.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-burps.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-burps.png
diff --git a/gameplay/characters/pico-playable/pico-burps.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-burps.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-burps.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-burps.xml
diff --git a/gameplay/characters/pico-playable/pico-casing.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-casing.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-casing.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-casing.png
diff --git a/gameplay/characters/pico-playable/pico-casing.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-casing.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-casing.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-casing.xml
diff --git a/gameplay/characters/pico-playable/pico-censored.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-censored.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-censored.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-censored.png
diff --git a/gameplay/characters/pico-playable/pico-censored.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-censored.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-censored.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-censored.xml
diff --git a/gameplay/characters/pico-playable/pico-death-explosion/Animation.json b/gameplay/characters/weekend1/pico-playable/graphics/pico-death-explosion/Animation.json
similarity index 100%
rename from gameplay/characters/pico-playable/pico-death-explosion/Animation.json
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-death-explosion/Animation.json
diff --git a/gameplay/characters/pico-playable/pico-death-explosion/spritemap1.json b/gameplay/characters/weekend1/pico-playable/graphics/pico-death-explosion/spritemap1.json
similarity index 100%
rename from gameplay/characters/pico-playable/pico-death-explosion/spritemap1.json
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-death-explosion/spritemap1.json
diff --git a/gameplay/characters/pico-playable/pico-death-explosion/spritemap1.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-death-explosion/spritemap1.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-death-explosion/spritemap1.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-death-explosion/spritemap1.png
diff --git a/gameplay/characters/pico-playable/pico-death-retry.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-death-retry.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-death-retry.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-death-retry.png
diff --git a/gameplay/characters/pico-playable/pico-death-retry.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-death-retry.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-death-retry.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-death-retry.xml
diff --git a/gameplay/characters/pico-playable/pico-death.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-death.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-death.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-death.png
diff --git a/gameplay/characters/pico-playable/pico-death.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-death.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-death.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-death.xml
diff --git a/gameplay/characters/pico-playable/pico-intro.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-intro.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-intro.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-intro.png
diff --git a/gameplay/characters/pico-playable/pico-intro.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-intro.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-intro.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-intro.xml
diff --git a/gameplay/characters/pico-playable/pico-playable.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-playable.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-playable.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-playable.png
diff --git a/gameplay/characters/pico-playable/pico-playable.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-playable.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-playable.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-playable.xml
diff --git a/gameplay/characters/pico-playable/pico-shooting.png b/gameplay/characters/weekend1/pico-playable/graphics/pico-shooting.png
similarity index 100%
rename from gameplay/characters/pico-playable/pico-shooting.png
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-shooting.png
diff --git a/gameplay/characters/pico-playable/pico-shooting.xml b/gameplay/characters/weekend1/pico-playable/graphics/pico-shooting.xml
similarity index 100%
rename from gameplay/characters/pico-playable/pico-shooting.xml
rename to gameplay/characters/weekend1/pico-playable/graphics/pico-shooting.xml
diff --git a/gameplay/characters/pico-playable/pico-playable.hxc b/gameplay/characters/weekend1/pico-playable/pico-playable.hxc
similarity index 100%
rename from gameplay/characters/pico-playable/pico-playable.hxc
rename to gameplay/characters/weekend1/pico-playable/pico-playable.hxc
diff --git a/gameplay/characters/pico-playable/pico-playable.json b/gameplay/characters/weekend1/pico-playable/pico-playable.json
similarity index 100%
rename from gameplay/characters/pico-playable/pico-playable.json
rename to gameplay/characters/weekend1/pico-playable/pico-playable.json
diff --git a/gameplay/characters/pico-playable/CasingSprite.hxc b/gameplay/characters/weekend1/pico-playable/scripts/CasingSprite.hxc
similarity index 100%
rename from gameplay/characters/pico-playable/CasingSprite.hxc
rename to gameplay/characters/weekend1/pico-playable/scripts/CasingSprite.hxc
diff --git a/gameplay/characters/pico-playable/PicoBloodPool.hxc b/gameplay/characters/weekend1/pico-playable/scripts/PicoBloodPool.hxc
similarity index 100%
rename from gameplay/characters/pico-playable/PicoBloodPool.hxc
rename to gameplay/characters/weekend1/pico-playable/scripts/PicoBloodPool.hxc
diff --git a/gameplay/characters/pico-playable/PicoDopplegangerSprite.hxc b/gameplay/characters/weekend1/pico-playable/scripts/PicoDopplegangerSprite.hxc
similarity index 100%
rename from gameplay/characters/pico-playable/PicoDopplegangerSprite.hxc
rename to gameplay/characters/weekend1/pico-playable/scripts/PicoDopplegangerSprite.hxc
diff --git a/gameplay/dialogue/boxes/roses/dialogue-box.png b/gameplay/dialogue/boxes/pixel/roses/graphics/dialogue-box.png
similarity index 100%
rename from gameplay/dialogue/boxes/roses/dialogue-box.png
rename to gameplay/dialogue/boxes/pixel/roses/graphics/dialogue-box.png
diff --git a/gameplay/dialogue/boxes/roses/dialogue-box.xml b/gameplay/dialogue/boxes/pixel/roses/graphics/dialogue-box.xml
similarity index 100%
rename from gameplay/dialogue/boxes/roses/dialogue-box.xml
rename to gameplay/dialogue/boxes/pixel/roses/graphics/dialogue-box.xml
diff --git a/gameplay/dialogue/boxes/roses/dialogue-hand.png b/gameplay/dialogue/boxes/pixel/roses/graphics/dialogue-hand.png
similarity index 100%
rename from gameplay/dialogue/boxes/roses/dialogue-hand.png
rename to gameplay/dialogue/boxes/pixel/roses/graphics/dialogue-hand.png
diff --git a/gameplay/dialogue/boxes/roses/roses.hxc b/gameplay/dialogue/boxes/pixel/roses/roses.hxc
similarity index 100%
rename from gameplay/dialogue/boxes/roses/roses.hxc
rename to gameplay/dialogue/boxes/pixel/roses/roses.hxc
diff --git a/gameplay/dialogue/boxes/roses/roses.json b/gameplay/dialogue/boxes/pixel/roses/roses.json
similarity index 100%
rename from gameplay/dialogue/boxes/roses/roses.json
rename to gameplay/dialogue/boxes/pixel/roses/roses.json
diff --git a/gameplay/dialogue/boxes/roses/angry-appear.mp3 b/gameplay/dialogue/boxes/pixel/roses/sounds/angry-appear.mp3
similarity index 100%
rename from gameplay/dialogue/boxes/roses/angry-appear.mp3
rename to gameplay/dialogue/boxes/pixel/roses/sounds/angry-appear.mp3
diff --git a/gameplay/dialogue/boxes/roses/angry-appear.ogg b/gameplay/dialogue/boxes/pixel/roses/sounds/angry-appear.ogg
similarity index 100%
rename from gameplay/dialogue/boxes/roses/angry-appear.ogg
rename to gameplay/dialogue/boxes/pixel/roses/sounds/angry-appear.ogg
diff --git a/gameplay/dialogue/boxes/roses/angry-click.mp3 b/gameplay/dialogue/boxes/pixel/roses/sounds/angry-click.mp3
similarity index 100%
rename from gameplay/dialogue/boxes/roses/angry-click.mp3
rename to gameplay/dialogue/boxes/pixel/roses/sounds/angry-click.mp3
diff --git a/gameplay/dialogue/boxes/roses/angry-click.ogg b/gameplay/dialogue/boxes/pixel/roses/sounds/angry-click.ogg
similarity index 100%
rename from gameplay/dialogue/boxes/roses/angry-click.ogg
rename to gameplay/dialogue/boxes/pixel/roses/sounds/angry-click.ogg
diff --git a/gameplay/dialogue/boxes/roses/click-advance.mp3 b/gameplay/dialogue/boxes/pixel/roses/sounds/click-advance.mp3
similarity index 100%
rename from gameplay/dialogue/boxes/roses/click-advance.mp3
rename to gameplay/dialogue/boxes/pixel/roses/sounds/click-advance.mp3
diff --git a/gameplay/dialogue/boxes/roses/click-advance.ogg b/gameplay/dialogue/boxes/pixel/roses/sounds/click-advance.ogg
similarity index 100%
rename from gameplay/dialogue/boxes/roses/click-advance.ogg
rename to gameplay/dialogue/boxes/pixel/roses/sounds/click-advance.ogg
diff --git a/gameplay/dialogue/boxes/roses/click.mp3 b/gameplay/dialogue/boxes/pixel/roses/sounds/click.mp3
similarity index 100%
rename from gameplay/dialogue/boxes/roses/click.mp3
rename to gameplay/dialogue/boxes/pixel/roses/sounds/click.mp3
diff --git a/gameplay/dialogue/boxes/roses/click.ogg b/gameplay/dialogue/boxes/pixel/roses/sounds/click.ogg
similarity index 100%
rename from gameplay/dialogue/boxes/roses/click.ogg
rename to gameplay/dialogue/boxes/pixel/roses/sounds/click.ogg
diff --git a/gameplay/dialogue/boxes/thorns/dialogue-box.png b/gameplay/dialogue/boxes/pixel/thorns/graphics/dialogue-box.png
similarity index 100%
rename from gameplay/dialogue/boxes/thorns/dialogue-box.png
rename to gameplay/dialogue/boxes/pixel/thorns/graphics/dialogue-box.png
diff --git a/gameplay/dialogue/boxes/thorns/dialogue-box.xml b/gameplay/dialogue/boxes/pixel/thorns/graphics/dialogue-box.xml
similarity index 100%
rename from gameplay/dialogue/boxes/thorns/dialogue-box.xml
rename to gameplay/dialogue/boxes/pixel/thorns/graphics/dialogue-box.xml
diff --git a/gameplay/dialogue/boxes/thorns/thorns.hxc b/gameplay/dialogue/boxes/pixel/thorns/thorns.hxc
similarity index 100%
rename from gameplay/dialogue/boxes/thorns/thorns.hxc
rename to gameplay/dialogue/boxes/pixel/thorns/thorns.hxc
diff --git a/gameplay/dialogue/boxes/thorns/thorns.json b/gameplay/dialogue/boxes/pixel/thorns/thorns.json
similarity index 100%
rename from gameplay/dialogue/boxes/thorns/thorns.json
rename to gameplay/dialogue/boxes/pixel/thorns/thorns.json
diff --git a/gameplay/notestyles/funkin/countdown/go.png b/gameplay/notestyles/funkin/countdown/graphics/go.png
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/go.png
rename to gameplay/notestyles/funkin/countdown/graphics/go.png
diff --git a/gameplay/notestyles/funkin/countdown/ready.png b/gameplay/notestyles/funkin/countdown/graphics/ready.png
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/ready.png
rename to gameplay/notestyles/funkin/countdown/graphics/ready.png
diff --git a/gameplay/notestyles/funkin/countdown/set.png b/gameplay/notestyles/funkin/countdown/graphics/set.png
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/set.png
rename to gameplay/notestyles/funkin/countdown/graphics/set.png
diff --git a/gameplay/notestyles/funkin/countdown/intro-go.mp3 b/gameplay/notestyles/funkin/countdown/sounds/intro-go.mp3
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-go.mp3
rename to gameplay/notestyles/funkin/countdown/sounds/intro-go.mp3
diff --git a/gameplay/notestyles/funkin/countdown/intro-go.ogg b/gameplay/notestyles/funkin/countdown/sounds/intro-go.ogg
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-go.ogg
rename to gameplay/notestyles/funkin/countdown/sounds/intro-go.ogg
diff --git a/gameplay/notestyles/funkin/countdown/intro-one.mp3 b/gameplay/notestyles/funkin/countdown/sounds/intro-one.mp3
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-one.mp3
rename to gameplay/notestyles/funkin/countdown/sounds/intro-one.mp3
diff --git a/gameplay/notestyles/funkin/countdown/intro-one.ogg b/gameplay/notestyles/funkin/countdown/sounds/intro-one.ogg
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-one.ogg
rename to gameplay/notestyles/funkin/countdown/sounds/intro-one.ogg
diff --git a/gameplay/notestyles/funkin/countdown/intro-three.mp3 b/gameplay/notestyles/funkin/countdown/sounds/intro-three.mp3
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-three.mp3
rename to gameplay/notestyles/funkin/countdown/sounds/intro-three.mp3
diff --git a/gameplay/notestyles/funkin/countdown/intro-three.ogg b/gameplay/notestyles/funkin/countdown/sounds/intro-three.ogg
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-three.ogg
rename to gameplay/notestyles/funkin/countdown/sounds/intro-three.ogg
diff --git a/gameplay/notestyles/funkin/countdown/intro-two.mp3 b/gameplay/notestyles/funkin/countdown/sounds/intro-two.mp3
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-two.mp3
rename to gameplay/notestyles/funkin/countdown/sounds/intro-two.mp3
diff --git a/gameplay/notestyles/funkin/countdown/intro-two.ogg b/gameplay/notestyles/funkin/countdown/sounds/intro-two.ogg
similarity index 100%
rename from gameplay/notestyles/funkin/countdown/intro-two.ogg
rename to gameplay/notestyles/funkin/countdown/sounds/intro-two.ogg
diff --git a/gameplay/notestyles/funkin/hold-cover-down.png b/gameplay/notestyles/funkin/hold-covers/hold-cover-down.png
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-down.png
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-down.png
diff --git a/gameplay/notestyles/funkin/hold-cover-down.xml b/gameplay/notestyles/funkin/hold-covers/hold-cover-down.xml
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-down.xml
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-down.xml
diff --git a/gameplay/notestyles/funkin/hold-cover-left.png b/gameplay/notestyles/funkin/hold-covers/hold-cover-left.png
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-left.png
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-left.png
diff --git a/gameplay/notestyles/funkin/hold-cover-left.xml b/gameplay/notestyles/funkin/hold-covers/hold-cover-left.xml
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-left.xml
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-left.xml
diff --git a/gameplay/notestyles/funkin/hold-cover-right.png b/gameplay/notestyles/funkin/hold-covers/hold-cover-right.png
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-right.png
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-right.png
diff --git a/gameplay/notestyles/funkin/hold-cover-right.xml b/gameplay/notestyles/funkin/hold-covers/hold-cover-right.xml
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-right.xml
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-right.xml
diff --git a/gameplay/notestyles/funkin/hold-cover-up.png b/gameplay/notestyles/funkin/hold-covers/hold-cover-up.png
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-up.png
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-up.png
diff --git a/gameplay/notestyles/funkin/hold-cover-up.xml b/gameplay/notestyles/funkin/hold-covers/hold-cover-up.xml
similarity index 100%
rename from gameplay/notestyles/funkin/hold-cover-up.xml
rename to gameplay/notestyles/funkin/hold-covers/hold-cover-up.xml
diff --git a/gameplay/notestyles/funkin/popup/digit-0.png b/gameplay/notestyles/funkin/popup/nums/digit-0.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-0.png
rename to gameplay/notestyles/funkin/popup/nums/digit-0.png
diff --git a/gameplay/notestyles/funkin/popup/digit-1.png b/gameplay/notestyles/funkin/popup/nums/digit-1.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-1.png
rename to gameplay/notestyles/funkin/popup/nums/digit-1.png
diff --git a/gameplay/notestyles/funkin/popup/digit-2.png b/gameplay/notestyles/funkin/popup/nums/digit-2.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-2.png
rename to gameplay/notestyles/funkin/popup/nums/digit-2.png
diff --git a/gameplay/notestyles/funkin/popup/digit-3.png b/gameplay/notestyles/funkin/popup/nums/digit-3.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-3.png
rename to gameplay/notestyles/funkin/popup/nums/digit-3.png
diff --git a/gameplay/notestyles/funkin/popup/digit-4.png b/gameplay/notestyles/funkin/popup/nums/digit-4.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-4.png
rename to gameplay/notestyles/funkin/popup/nums/digit-4.png
diff --git a/gameplay/notestyles/funkin/popup/digit-5.png b/gameplay/notestyles/funkin/popup/nums/digit-5.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-5.png
rename to gameplay/notestyles/funkin/popup/nums/digit-5.png
diff --git a/gameplay/notestyles/funkin/popup/digit-6.png b/gameplay/notestyles/funkin/popup/nums/digit-6.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-6.png
rename to gameplay/notestyles/funkin/popup/nums/digit-6.png
diff --git a/gameplay/notestyles/funkin/popup/digit-7.png b/gameplay/notestyles/funkin/popup/nums/digit-7.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-7.png
rename to gameplay/notestyles/funkin/popup/nums/digit-7.png
diff --git a/gameplay/notestyles/funkin/popup/digit-8.png b/gameplay/notestyles/funkin/popup/nums/digit-8.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-8.png
rename to gameplay/notestyles/funkin/popup/nums/digit-8.png
diff --git a/gameplay/notestyles/funkin/popup/digit-9.png b/gameplay/notestyles/funkin/popup/nums/digit-9.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/digit-9.png
rename to gameplay/notestyles/funkin/popup/nums/digit-9.png
diff --git a/gameplay/notestyles/funkin/popup/bad.png b/gameplay/notestyles/funkin/popup/ratings/bad.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/bad.png
rename to gameplay/notestyles/funkin/popup/ratings/bad.png
diff --git a/gameplay/notestyles/funkin/popup/good.png b/gameplay/notestyles/funkin/popup/ratings/good.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/good.png
rename to gameplay/notestyles/funkin/popup/ratings/good.png
diff --git a/gameplay/notestyles/funkin/popup/shit.png b/gameplay/notestyles/funkin/popup/ratings/shit.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/shit.png
rename to gameplay/notestyles/funkin/popup/ratings/shit.png
diff --git a/gameplay/notestyles/funkin/popup/sick.png b/gameplay/notestyles/funkin/popup/ratings/sick.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/sick.png
rename to gameplay/notestyles/funkin/popup/ratings/sick.png
diff --git a/gameplay/notestyles/funkin/popup/go.png b/gameplay/notestyles/pixel/countdown/graphics/go.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/go.png
rename to gameplay/notestyles/pixel/countdown/graphics/go.png
diff --git a/gameplay/notestyles/funkin/popup/ready.png b/gameplay/notestyles/pixel/countdown/graphics/ready.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/ready.png
rename to gameplay/notestyles/pixel/countdown/graphics/ready.png
diff --git a/gameplay/notestyles/funkin/popup/set.png b/gameplay/notestyles/pixel/countdown/graphics/set.png
similarity index 100%
rename from gameplay/notestyles/funkin/popup/set.png
rename to gameplay/notestyles/pixel/countdown/graphics/set.png
diff --git a/gameplay/notestyles/pixel/countdown/introGO.mp3 b/gameplay/notestyles/pixel/countdown/sounds/introGO.mp3
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introGO.mp3
rename to gameplay/notestyles/pixel/countdown/sounds/introGO.mp3
diff --git a/gameplay/notestyles/pixel/countdown/introGO.ogg b/gameplay/notestyles/pixel/countdown/sounds/introGO.ogg
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introGO.ogg
rename to gameplay/notestyles/pixel/countdown/sounds/introGO.ogg
diff --git a/gameplay/notestyles/pixel/countdown/introONE.mp3 b/gameplay/notestyles/pixel/countdown/sounds/introONE.mp3
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introONE.mp3
rename to gameplay/notestyles/pixel/countdown/sounds/introONE.mp3
diff --git a/gameplay/notestyles/pixel/countdown/introONE.ogg b/gameplay/notestyles/pixel/countdown/sounds/introONE.ogg
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introONE.ogg
rename to gameplay/notestyles/pixel/countdown/sounds/introONE.ogg
diff --git a/gameplay/notestyles/pixel/countdown/introTHREE.mp3 b/gameplay/notestyles/pixel/countdown/sounds/introTHREE.mp3
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introTHREE.mp3
rename to gameplay/notestyles/pixel/countdown/sounds/introTHREE.mp3
diff --git a/gameplay/notestyles/pixel/countdown/introTHREE.ogg b/gameplay/notestyles/pixel/countdown/sounds/introTHREE.ogg
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introTHREE.ogg
rename to gameplay/notestyles/pixel/countdown/sounds/introTHREE.ogg
diff --git a/gameplay/notestyles/pixel/countdown/introTWO.mp3 b/gameplay/notestyles/pixel/countdown/sounds/introTWO.mp3
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introTWO.mp3
rename to gameplay/notestyles/pixel/countdown/sounds/introTWO.mp3
diff --git a/gameplay/notestyles/pixel/countdown/introTWO.ogg b/gameplay/notestyles/pixel/countdown/sounds/introTWO.ogg
similarity index 100%
rename from gameplay/notestyles/pixel/countdown/introTWO.ogg
rename to gameplay/notestyles/pixel/countdown/sounds/introTWO.ogg
diff --git a/gameplay/notestyles/pixel/popup/digit-0.png b/gameplay/notestyles/pixel/popup/nums/digit-0.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-0.png
rename to gameplay/notestyles/pixel/popup/nums/digit-0.png
diff --git a/gameplay/notestyles/pixel/popup/digit-1.png b/gameplay/notestyles/pixel/popup/nums/digit-1.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-1.png
rename to gameplay/notestyles/pixel/popup/nums/digit-1.png
diff --git a/gameplay/notestyles/pixel/popup/digit-2.png b/gameplay/notestyles/pixel/popup/nums/digit-2.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-2.png
rename to gameplay/notestyles/pixel/popup/nums/digit-2.png
diff --git a/gameplay/notestyles/pixel/popup/digit-3.png b/gameplay/notestyles/pixel/popup/nums/digit-3.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-3.png
rename to gameplay/notestyles/pixel/popup/nums/digit-3.png
diff --git a/gameplay/notestyles/pixel/popup/digit-4.png b/gameplay/notestyles/pixel/popup/nums/digit-4.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-4.png
rename to gameplay/notestyles/pixel/popup/nums/digit-4.png
diff --git a/gameplay/notestyles/pixel/popup/digit-5.png b/gameplay/notestyles/pixel/popup/nums/digit-5.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-5.png
rename to gameplay/notestyles/pixel/popup/nums/digit-5.png
diff --git a/gameplay/notestyles/pixel/popup/digit-6.png b/gameplay/notestyles/pixel/popup/nums/digit-6.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-6.png
rename to gameplay/notestyles/pixel/popup/nums/digit-6.png
diff --git a/gameplay/notestyles/pixel/popup/digit-7.png b/gameplay/notestyles/pixel/popup/nums/digit-7.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-7.png
rename to gameplay/notestyles/pixel/popup/nums/digit-7.png
diff --git a/gameplay/notestyles/pixel/popup/digit-8.png b/gameplay/notestyles/pixel/popup/nums/digit-8.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-8.png
rename to gameplay/notestyles/pixel/popup/nums/digit-8.png
diff --git a/gameplay/notestyles/pixel/popup/digit-9.png b/gameplay/notestyles/pixel/popup/nums/digit-9.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/digit-9.png
rename to gameplay/notestyles/pixel/popup/nums/digit-9.png
diff --git a/gameplay/notestyles/pixel/popup/bad.png b/gameplay/notestyles/pixel/popup/ratings/bad.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/bad.png
rename to gameplay/notestyles/pixel/popup/ratings/bad.png
diff --git a/gameplay/notestyles/pixel/popup/good.png b/gameplay/notestyles/pixel/popup/ratings/good.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/good.png
rename to gameplay/notestyles/pixel/popup/ratings/good.png
diff --git a/gameplay/notestyles/pixel/popup/shit.png b/gameplay/notestyles/pixel/popup/ratings/shit.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/shit.png
rename to gameplay/notestyles/pixel/popup/ratings/shit.png
diff --git a/gameplay/notestyles/pixel/popup/sick.png b/gameplay/notestyles/pixel/popup/ratings/sick.png
similarity index 100%
rename from gameplay/notestyles/pixel/popup/sick.png
rename to gameplay/notestyles/pixel/popup/ratings/sick.png
diff --git a/gameplay/playable-characters/bf/game-over/game-over-end/game-over-end.mp3 b/gameplay/playable-characters/bf/game-over/music/default/game-over-end/game-over-end.mp3
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over-end/game-over-end.mp3
rename to gameplay/playable-characters/bf/game-over/music/default/game-over-end/game-over-end.mp3
diff --git a/gameplay/playable-characters/bf/game-over/game-over-end/game-over-end.ogg b/gameplay/playable-characters/bf/game-over/music/default/game-over-end/game-over-end.ogg
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over-end/game-over-end.ogg
rename to gameplay/playable-characters/bf/game-over/music/default/game-over-end/game-over-end.ogg
diff --git a/gameplay/playable-characters/bf/game-over/game-over/game-over.mp3 b/gameplay/playable-characters/bf/game-over/music/default/game-over/game-over.mp3
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over/game-over.mp3
rename to gameplay/playable-characters/bf/game-over/music/default/game-over/game-over.mp3
diff --git a/gameplay/playable-characters/bf/game-over/game-over/game-over.ogg b/gameplay/playable-characters/bf/game-over/music/default/game-over/game-over.ogg
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over/game-over.ogg
rename to gameplay/playable-characters/bf/game-over/music/default/game-over/game-over.ogg
diff --git a/gameplay/playable-characters/bf/game-over/game-over-pixel-end/game-over-pixel-end.mp3 b/gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel-end/game-over-pixel-end.mp3
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over-pixel-end/game-over-pixel-end.mp3
rename to gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel-end/game-over-pixel-end.mp3
diff --git a/gameplay/playable-characters/bf/game-over/game-over-pixel-end/game-over-pixel-end.ogg b/gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel-end/game-over-pixel-end.ogg
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over-pixel-end/game-over-pixel-end.ogg
rename to gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel-end/game-over-pixel-end.ogg
diff --git a/gameplay/playable-characters/bf/game-over/game-over-pixel/game-over-pixel.mp3 b/gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel/game-over-pixel.mp3
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over-pixel/game-over-pixel.mp3
rename to gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel/game-over-pixel.mp3
diff --git a/gameplay/playable-characters/bf/game-over/game-over-pixel/game-over-pixel.ogg b/gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel/game-over-pixel.ogg
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/game-over-pixel/game-over-pixel.ogg
rename to gameplay/playable-characters/bf/game-over/music/pixel/game-over-pixel/game-over-pixel.ogg
diff --git a/gameplay/playable-characters/bf/game-over/loss-sfx.mp3 b/gameplay/playable-characters/bf/game-over/sounds/default/loss-sfx.mp3
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/loss-sfx.mp3
rename to gameplay/playable-characters/bf/game-over/sounds/default/loss-sfx.mp3
diff --git a/gameplay/playable-characters/bf/game-over/loss-sfx.ogg b/gameplay/playable-characters/bf/game-over/sounds/default/loss-sfx.ogg
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/loss-sfx.ogg
rename to gameplay/playable-characters/bf/game-over/sounds/default/loss-sfx.ogg
diff --git a/gameplay/playable-characters/bf/game-over/loss-sfx-fakeout.mp3 b/gameplay/playable-characters/bf/game-over/sounds/fakeout/loss-sfx-fakeout.mp3
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/loss-sfx-fakeout.mp3
rename to gameplay/playable-characters/bf/game-over/sounds/fakeout/loss-sfx-fakeout.mp3
diff --git a/gameplay/playable-characters/bf/game-over/loss-sfx-fakeout.ogg b/gameplay/playable-characters/bf/game-over/sounds/fakeout/loss-sfx-fakeout.ogg
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/loss-sfx-fakeout.ogg
rename to gameplay/playable-characters/bf/game-over/sounds/fakeout/loss-sfx-fakeout.ogg
diff --git a/gameplay/playable-characters/bf/game-over/loss-sfx-pixel.mp3 b/gameplay/playable-characters/bf/game-over/sounds/pixel/loss-sfx-pixel.mp3
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/loss-sfx-pixel.mp3
rename to gameplay/playable-characters/bf/game-over/sounds/pixel/loss-sfx-pixel.mp3
diff --git a/gameplay/playable-characters/bf/game-over/loss-sfx-pixel.ogg b/gameplay/playable-characters/bf/game-over/sounds/pixel/loss-sfx-pixel.ogg
similarity index 100%
rename from gameplay/playable-characters/bf/game-over/loss-sfx-pixel.ogg
rename to gameplay/playable-characters/bf/game-over/sounds/pixel/loss-sfx-pixel.ogg
diff --git a/gameplay/playable-characters/pico/game-over/game-over-end/game-over-end.mp3 b/gameplay/playable-characters/pico/game-over/music/default/game-over-end/game-over-end.mp3
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/game-over-end/game-over-end.mp3
rename to gameplay/playable-characters/pico/game-over/music/default/game-over-end/game-over-end.mp3
diff --git a/gameplay/playable-characters/pico/game-over/game-over-end/game-over-end.ogg b/gameplay/playable-characters/pico/game-over/music/default/game-over-end/game-over-end.ogg
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/game-over-end/game-over-end.ogg
rename to gameplay/playable-characters/pico/game-over/music/default/game-over-end/game-over-end.ogg
diff --git a/gameplay/playable-characters/pico/game-over/game-over-explode/game-over-explode-start.mp3 b/gameplay/playable-characters/pico/game-over/music/default/game-over-explode/game-over-explode-start.mp3
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/game-over-explode/game-over-explode-start.mp3
rename to gameplay/playable-characters/pico/game-over/music/default/game-over-explode/game-over-explode-start.mp3
diff --git a/gameplay/playable-characters/pico/game-over/game-over-explode/game-over-explode-start.ogg b/gameplay/playable-characters/pico/game-over/music/default/game-over-explode/game-over-explode-start.ogg
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/game-over-explode/game-over-explode-start.ogg
rename to gameplay/playable-characters/pico/game-over/music/default/game-over-explode/game-over-explode-start.ogg
diff --git a/gameplay/playable-characters/pico/game-over/game-over/game-over.ogg b/gameplay/playable-characters/pico/game-over/music/default/game-over/game-over.ogg
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/game-over/game-over.ogg
rename to gameplay/playable-characters/pico/game-over/music/default/game-over/game-over.ogg
diff --git a/gameplay/playable-characters/pico/game-over/loss-sfx-explode.mp3 b/gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-explode.mp3
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/loss-sfx-explode.mp3
rename to gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-explode.mp3
diff --git a/gameplay/playable-characters/pico/game-over/loss-sfx-explode.ogg b/gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-explode.ogg
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/loss-sfx-explode.ogg
rename to gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-explode.ogg
diff --git a/gameplay/playable-characters/pico/game-over/loss-sfx-gutpunch.mp3 b/gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-gutpunch.mp3
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/loss-sfx-gutpunch.mp3
rename to gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-gutpunch.mp3
diff --git a/gameplay/playable-characters/pico/game-over/loss-sfx-gutpunch.ogg b/gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-gutpunch.ogg
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/loss-sfx-gutpunch.ogg
rename to gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx-gutpunch.ogg
diff --git a/gameplay/playable-characters/pico/game-over/loss-sfx.mp3 b/gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx.mp3
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/loss-sfx.mp3
rename to gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx.mp3
diff --git a/gameplay/playable-characters/pico/game-over/loss-sfx.ogg b/gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx.ogg
similarity index 100%
rename from gameplay/playable-characters/pico/game-over/loss-sfx.ogg
rename to gameplay/playable-characters/pico/game-over/sounds/default/loss-sfx.ogg
diff --git a/gameplay/songs/2hot/Inst.mp3 b/gameplay/songs/2hot/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/2hot/Inst.mp3
rename to gameplay/songs/2hot/audio/Inst.mp3
diff --git a/gameplay/songs/2hot/Inst.ogg b/gameplay/songs/2hot/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/2hot/Inst.ogg
rename to gameplay/songs/2hot/audio/Inst.ogg
diff --git a/gameplay/songs/2hot/Voices-darnell.mp3 b/gameplay/songs/2hot/audio/Voices-darnell.mp3
similarity index 100%
rename from gameplay/songs/2hot/Voices-darnell.mp3
rename to gameplay/songs/2hot/audio/Voices-darnell.mp3
diff --git a/gameplay/songs/2hot/Voices-darnell.ogg b/gameplay/songs/2hot/audio/Voices-darnell.ogg
similarity index 100%
rename from gameplay/songs/2hot/Voices-darnell.ogg
rename to gameplay/songs/2hot/audio/Voices-darnell.ogg
diff --git a/gameplay/songs/2hot/Voices-pico.mp3 b/gameplay/songs/2hot/audio/Voices-pico.mp3
similarity index 100%
rename from gameplay/songs/2hot/Voices-pico.mp3
rename to gameplay/songs/2hot/audio/Voices-pico.mp3
diff --git a/gameplay/songs/2hot/Voices-pico.ogg b/gameplay/songs/2hot/audio/Voices-pico.ogg
similarity index 100%
rename from gameplay/songs/2hot/Voices-pico.ogg
rename to gameplay/songs/2hot/audio/Voices-pico.ogg
diff --git a/gameplay/songs/2hot/2hot-chart.json b/gameplay/songs/2hot/charts/2hot-chart.json
similarity index 100%
rename from gameplay/songs/2hot/2hot-chart.json
rename to gameplay/songs/2hot/charts/2hot-chart.json
diff --git a/gameplay/songs/2hot/2hot-metadata.json b/gameplay/songs/2hot/charts/2hot-metadata.json
similarity index 100%
rename from gameplay/songs/2hot/2hot-metadata.json
rename to gameplay/songs/2hot/charts/2hot-metadata.json
diff --git a/gameplay/songs/2hot/spraycan/Animation.json b/gameplay/songs/2hot/graphics/spraycan/Animation.json
similarity index 100%
rename from gameplay/songs/2hot/spraycan/Animation.json
rename to gameplay/songs/2hot/graphics/spraycan/Animation.json
diff --git a/gameplay/songs/2hot/spraycan/spritemap1.json b/gameplay/songs/2hot/graphics/spraycan/spritemap1.json
similarity index 100%
rename from gameplay/songs/2hot/spraycan/spritemap1.json
rename to gameplay/songs/2hot/graphics/spraycan/spritemap1.json
diff --git a/gameplay/songs/2hot/spraycan/spritemap1.png b/gameplay/songs/2hot/graphics/spraycan/spritemap1.png
similarity index 100%
rename from gameplay/songs/2hot/spraycan/spritemap1.png
rename to gameplay/songs/2hot/graphics/spraycan/spritemap1.png
diff --git a/gameplay/songs/2hot/2hot.hxc b/gameplay/songs/2hot/scripts/2hot.hxc
similarity index 100%
rename from gameplay/songs/2hot/2hot.hxc
rename to gameplay/songs/2hot/scripts/2hot.hxc
diff --git a/gameplay/songs/2hot/SpraycanAtlasSprite.hxc b/gameplay/songs/2hot/scripts/SpraycanAtlasSprite.hxc
similarity index 100%
rename from gameplay/songs/2hot/SpraycanAtlasSprite.hxc
rename to gameplay/songs/2hot/scripts/SpraycanAtlasSprite.hxc
diff --git a/gameplay/songs/blammed/Inst.mp3 b/gameplay/songs/blammed/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/blammed/Inst.mp3
rename to gameplay/songs/blammed/audio/Inst.mp3
diff --git a/gameplay/songs/blammed/Inst.ogg b/gameplay/songs/blammed/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/blammed/Inst.ogg
rename to gameplay/songs/blammed/audio/Inst.ogg
diff --git a/gameplay/songs/blammed/Voices-bf.mp3 b/gameplay/songs/blammed/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/blammed/Voices-bf.mp3
rename to gameplay/songs/blammed/audio/Voices-bf.mp3
diff --git a/gameplay/songs/blammed/Voices-bf.ogg b/gameplay/songs/blammed/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/blammed/Voices-bf.ogg
rename to gameplay/songs/blammed/audio/Voices-bf.ogg
diff --git a/gameplay/songs/blammed/Voices-pico.mp3 b/gameplay/songs/blammed/audio/Voices-pico.mp3
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico.mp3
rename to gameplay/songs/blammed/audio/Voices-pico.mp3
diff --git a/gameplay/songs/blammed/Voices-pico.ogg b/gameplay/songs/blammed/audio/Voices-pico.ogg
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico.ogg
rename to gameplay/songs/blammed/audio/Voices-pico.ogg
diff --git a/gameplay/songs/blammed/Inst-erect.mp3 b/gameplay/songs/blammed/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/blammed/Inst-erect.mp3
rename to gameplay/songs/blammed/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/blammed/Inst-erect.ogg b/gameplay/songs/blammed/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/blammed/Inst-erect.ogg
rename to gameplay/songs/blammed/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/blammed/Voices-bf-erect.mp3 b/gameplay/songs/blammed/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/blammed/Voices-bf-erect.mp3
rename to gameplay/songs/blammed/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/blammed/Voices-bf-erect.ogg b/gameplay/songs/blammed/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/blammed/Voices-bf-erect.ogg
rename to gameplay/songs/blammed/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/blammed/Voices-pico-erect.mp3 b/gameplay/songs/blammed/audio/erect/Voices-pico-erect.mp3
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico-erect.mp3
rename to gameplay/songs/blammed/audio/erect/Voices-pico-erect.mp3
diff --git a/gameplay/songs/blammed/Voices-pico-erect.ogg b/gameplay/songs/blammed/audio/erect/Voices-pico-erect.ogg
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico-erect.ogg
rename to gameplay/songs/blammed/audio/erect/Voices-pico-erect.ogg
diff --git a/gameplay/songs/blammed/Inst-pico.mp3 b/gameplay/songs/blammed/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/blammed/Inst-pico.mp3
rename to gameplay/songs/blammed/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/blammed/Inst-pico.ogg b/gameplay/songs/blammed/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/blammed/Inst-pico.ogg
rename to gameplay/songs/blammed/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/blammed/Voices-pico-pico.mp3 b/gameplay/songs/blammed/audio/pico/Voices-pico-pico.mp3
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico-pico.mp3
rename to gameplay/songs/blammed/audio/pico/Voices-pico-pico.mp3
diff --git a/gameplay/songs/blammed/Voices-pico-pico.ogg b/gameplay/songs/blammed/audio/pico/Voices-pico-pico.ogg
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico-pico.ogg
rename to gameplay/songs/blammed/audio/pico/Voices-pico-pico.ogg
diff --git a/gameplay/songs/blammed/Voices-pico-playable-pico.mp3 b/gameplay/songs/blammed/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico-playable-pico.mp3
rename to gameplay/songs/blammed/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/blammed/Voices-pico-playable-pico.ogg b/gameplay/songs/blammed/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/blammed/Voices-pico-playable-pico.ogg
rename to gameplay/songs/blammed/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/blammed/blammed-chart.json b/gameplay/songs/blammed/charts/blammed-chart.json
similarity index 100%
rename from gameplay/songs/blammed/blammed-chart.json
rename to gameplay/songs/blammed/charts/blammed-chart.json
diff --git a/gameplay/songs/blammed/blammed-metadata.json b/gameplay/songs/blammed/charts/blammed-metadata.json
similarity index 100%
rename from gameplay/songs/blammed/blammed-metadata.json
rename to gameplay/songs/blammed/charts/blammed-metadata.json
diff --git a/gameplay/songs/blammed/blammed-chart-erect.json b/gameplay/songs/blammed/charts/erect/blammed-chart-erect.json
similarity index 100%
rename from gameplay/songs/blammed/blammed-chart-erect.json
rename to gameplay/songs/blammed/charts/erect/blammed-chart-erect.json
diff --git a/gameplay/songs/blammed/blammed-metadata-erect.json b/gameplay/songs/blammed/charts/erect/blammed-metadata-erect.json
similarity index 100%
rename from gameplay/songs/blammed/blammed-metadata-erect.json
rename to gameplay/songs/blammed/charts/erect/blammed-metadata-erect.json
diff --git a/gameplay/songs/blammed/blammed-chart-pico.json b/gameplay/songs/blammed/charts/pico/blammed-chart-pico.json
similarity index 100%
rename from gameplay/songs/blammed/blammed-chart-pico.json
rename to gameplay/songs/blammed/charts/pico/blammed-chart-pico.json
diff --git a/gameplay/songs/blammed/blammed-metadata-pico.json b/gameplay/songs/blammed/charts/pico/blammed-metadata-pico.json
similarity index 100%
rename from gameplay/songs/blammed/blammed-metadata-pico.json
rename to gameplay/songs/blammed/charts/pico/blammed-metadata-pico.json
diff --git a/gameplay/songs/blazin/Inst.mp3 b/gameplay/songs/blazin/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/blazin/Inst.mp3
rename to gameplay/songs/blazin/audio/Inst.mp3
diff --git a/gameplay/songs/blazin/Inst.ogg b/gameplay/songs/blazin/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/blazin/Inst.ogg
rename to gameplay/songs/blazin/audio/Inst.ogg
diff --git a/gameplay/songs/blazin/blazin-chart.json b/gameplay/songs/blazin/charts/blazin-chart.json
similarity index 100%
rename from gameplay/songs/blazin/blazin-chart.json
rename to gameplay/songs/blazin/charts/blazin-chart.json
diff --git a/gameplay/songs/blazin/blazin-metadata.json b/gameplay/songs/blazin/charts/blazin-metadata.json
similarity index 100%
rename from gameplay/songs/blazin/blazin-metadata.json
rename to gameplay/songs/blazin/charts/blazin-metadata.json
diff --git a/gameplay/songs/bopeebo/Voices-pico-pico.mp3 b/gameplay/songs/bopeebo/Voices-pico-pico.mp3
deleted file mode 100644
index 439b4ccdb..000000000
Binary files a/gameplay/songs/bopeebo/Voices-pico-pico.mp3 and /dev/null differ
diff --git a/gameplay/songs/bopeebo/Voices-pico-pico.ogg b/gameplay/songs/bopeebo/Voices-pico-pico.ogg
deleted file mode 100644
index a8306d01d..000000000
Binary files a/gameplay/songs/bopeebo/Voices-pico-pico.ogg and /dev/null differ
diff --git a/gameplay/songs/bopeebo/Inst.mp3 b/gameplay/songs/bopeebo/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Inst.mp3
rename to gameplay/songs/bopeebo/audio/Inst.mp3
diff --git a/gameplay/songs/bopeebo/Inst.ogg b/gameplay/songs/bopeebo/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Inst.ogg
rename to gameplay/songs/bopeebo/audio/Inst.ogg
diff --git a/gameplay/songs/bopeebo/Voices-bf.mp3 b/gameplay/songs/bopeebo/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-bf.mp3
rename to gameplay/songs/bopeebo/audio/Voices-bf.mp3
diff --git a/gameplay/songs/bopeebo/Voices-bf.ogg b/gameplay/songs/bopeebo/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-bf.ogg
rename to gameplay/songs/bopeebo/audio/Voices-bf.ogg
diff --git a/gameplay/songs/bopeebo/Voices-dad.mp3 b/gameplay/songs/bopeebo/audio/Voices-dad.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-dad.mp3
rename to gameplay/songs/bopeebo/audio/Voices-dad.mp3
diff --git a/gameplay/songs/bopeebo/Voices-dad.ogg b/gameplay/songs/bopeebo/audio/Voices-dad.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-dad.ogg
rename to gameplay/songs/bopeebo/audio/Voices-dad.ogg
diff --git a/gameplay/songs/bopeebo/Inst-erect.mp3 b/gameplay/songs/bopeebo/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Inst-erect.mp3
rename to gameplay/songs/bopeebo/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/bopeebo/Inst-erect.ogg b/gameplay/songs/bopeebo/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Inst-erect.ogg
rename to gameplay/songs/bopeebo/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/bopeebo/Voices-bf-erect.mp3 b/gameplay/songs/bopeebo/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-bf-erect.mp3
rename to gameplay/songs/bopeebo/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/bopeebo/Voices-bf-erect.ogg b/gameplay/songs/bopeebo/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-bf-erect.ogg
rename to gameplay/songs/bopeebo/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/bopeebo/Voices-dad-erect.mp3 b/gameplay/songs/bopeebo/audio/erect/Voices-dad-erect.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-dad-erect.mp3
rename to gameplay/songs/bopeebo/audio/erect/Voices-dad-erect.mp3
diff --git a/gameplay/songs/bopeebo/Voices-dad-erect.ogg b/gameplay/songs/bopeebo/audio/erect/Voices-dad-erect.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-dad-erect.ogg
rename to gameplay/songs/bopeebo/audio/erect/Voices-dad-erect.ogg
diff --git a/gameplay/songs/bopeebo/Inst-pico.mp3 b/gameplay/songs/bopeebo/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Inst-pico.mp3
rename to gameplay/songs/bopeebo/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/bopeebo/Inst-pico.ogg b/gameplay/songs/bopeebo/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Inst-pico.ogg
rename to gameplay/songs/bopeebo/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/bopeebo/Voices-dad-pico.mp3 b/gameplay/songs/bopeebo/audio/pico/Voices-dad-pico.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-dad-pico.mp3
rename to gameplay/songs/bopeebo/audio/pico/Voices-dad-pico.mp3
diff --git a/gameplay/songs/bopeebo/Voices-dad-pico.ogg b/gameplay/songs/bopeebo/audio/pico/Voices-dad-pico.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-dad-pico.ogg
rename to gameplay/songs/bopeebo/audio/pico/Voices-dad-pico.ogg
diff --git a/gameplay/songs/bopeebo/Voices-pico-playable-pico.mp3 b/gameplay/songs/bopeebo/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-pico-playable-pico.mp3
rename to gameplay/songs/bopeebo/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/bopeebo/Voices-pico-playable-pico.ogg b/gameplay/songs/bopeebo/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/bopeebo/Voices-pico-playable-pico.ogg
rename to gameplay/songs/bopeebo/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/bopeebo/bopeebo-chart.json b/gameplay/songs/bopeebo/charts/bopeebo-chart.json
similarity index 100%
rename from gameplay/songs/bopeebo/bopeebo-chart.json
rename to gameplay/songs/bopeebo/charts/bopeebo-chart.json
diff --git a/gameplay/songs/bopeebo/bopeebo-metadata.json b/gameplay/songs/bopeebo/charts/bopeebo-metadata.json
similarity index 100%
rename from gameplay/songs/bopeebo/bopeebo-metadata.json
rename to gameplay/songs/bopeebo/charts/bopeebo-metadata.json
diff --git a/gameplay/songs/bopeebo/bopeebo-chart-erect.json b/gameplay/songs/bopeebo/charts/erect/bopeebo-chart-erect.json
similarity index 100%
rename from gameplay/songs/bopeebo/bopeebo-chart-erect.json
rename to gameplay/songs/bopeebo/charts/erect/bopeebo-chart-erect.json
diff --git a/gameplay/songs/bopeebo/bopeebo-metadata-erect.json b/gameplay/songs/bopeebo/charts/erect/bopeebo-metadata-erect.json
similarity index 100%
rename from gameplay/songs/bopeebo/bopeebo-metadata-erect.json
rename to gameplay/songs/bopeebo/charts/erect/bopeebo-metadata-erect.json
diff --git a/gameplay/songs/bopeebo/bopeebo-chart-pico.json b/gameplay/songs/bopeebo/charts/pico/bopeebo-chart-pico.json
similarity index 100%
rename from gameplay/songs/bopeebo/bopeebo-chart-pico.json
rename to gameplay/songs/bopeebo/charts/pico/bopeebo-chart-pico.json
diff --git a/gameplay/songs/bopeebo/bopeebo-metadata-pico.json b/gameplay/songs/bopeebo/charts/pico/bopeebo-metadata-pico.json
similarity index 100%
rename from gameplay/songs/bopeebo/bopeebo-metadata-pico.json
rename to gameplay/songs/bopeebo/charts/pico/bopeebo-metadata-pico.json
diff --git a/gameplay/songs/cocoa/Inst.mp3 b/gameplay/songs/cocoa/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/cocoa/Inst.mp3
rename to gameplay/songs/cocoa/audio/Inst.mp3
diff --git a/gameplay/songs/cocoa/Inst.ogg b/gameplay/songs/cocoa/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/cocoa/Inst.ogg
rename to gameplay/songs/cocoa/audio/Inst.ogg
diff --git a/gameplay/songs/cocoa/Voices-bf.mp3 b/gameplay/songs/cocoa/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/cocoa/Voices-bf.mp3
rename to gameplay/songs/cocoa/audio/Voices-bf.mp3
diff --git a/gameplay/songs/cocoa/Voices-bf.ogg b/gameplay/songs/cocoa/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/cocoa/Voices-bf.ogg
rename to gameplay/songs/cocoa/audio/Voices-bf.ogg
diff --git a/gameplay/songs/cocoa/Voices-parents-christmas.mp3 b/gameplay/songs/cocoa/audio/Voices-parents-christmas.mp3
similarity index 100%
rename from gameplay/songs/cocoa/Voices-parents-christmas.mp3
rename to gameplay/songs/cocoa/audio/Voices-parents-christmas.mp3
diff --git a/gameplay/songs/cocoa/Voices-parents-christmas.ogg b/gameplay/songs/cocoa/audio/Voices-parents-christmas.ogg
similarity index 100%
rename from gameplay/songs/cocoa/Voices-parents-christmas.ogg
rename to gameplay/songs/cocoa/audio/Voices-parents-christmas.ogg
diff --git a/gameplay/songs/cocoa/Inst-erect.mp3 b/gameplay/songs/cocoa/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/cocoa/Inst-erect.mp3
rename to gameplay/songs/cocoa/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/cocoa/Inst-erect.ogg b/gameplay/songs/cocoa/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/cocoa/Inst-erect.ogg
rename to gameplay/songs/cocoa/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/cocoa/Voices-bf-christmas-erect.mp3 b/gameplay/songs/cocoa/audio/erect/Voices-bf-christmas-erect.mp3
similarity index 100%
rename from gameplay/songs/cocoa/Voices-bf-christmas-erect.mp3
rename to gameplay/songs/cocoa/audio/erect/Voices-bf-christmas-erect.mp3
diff --git a/gameplay/songs/cocoa/Voices-bf-christmas-erect.ogg b/gameplay/songs/cocoa/audio/erect/Voices-bf-christmas-erect.ogg
similarity index 100%
rename from gameplay/songs/cocoa/Voices-bf-christmas-erect.ogg
rename to gameplay/songs/cocoa/audio/erect/Voices-bf-christmas-erect.ogg
diff --git a/gameplay/songs/cocoa/Voices-bf-erect.mp3 b/gameplay/songs/cocoa/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/cocoa/Voices-bf-erect.mp3
rename to gameplay/songs/cocoa/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/cocoa/Voices-bf-erect.ogg b/gameplay/songs/cocoa/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/cocoa/Voices-bf-erect.ogg
rename to gameplay/songs/cocoa/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/cocoa/Voices-parents-christmas-erect.mp3 b/gameplay/songs/cocoa/audio/erect/Voices-parents-christmas-erect.mp3
similarity index 100%
rename from gameplay/songs/cocoa/Voices-parents-christmas-erect.mp3
rename to gameplay/songs/cocoa/audio/erect/Voices-parents-christmas-erect.mp3
diff --git a/gameplay/songs/cocoa/Voices-parents-christmas-erect.ogg b/gameplay/songs/cocoa/audio/erect/Voices-parents-christmas-erect.ogg
similarity index 100%
rename from gameplay/songs/cocoa/Voices-parents-christmas-erect.ogg
rename to gameplay/songs/cocoa/audio/erect/Voices-parents-christmas-erect.ogg
diff --git a/gameplay/songs/cocoa/cocoa-chart.json b/gameplay/songs/cocoa/charts/cocoa-chart.json
similarity index 100%
rename from gameplay/songs/cocoa/cocoa-chart.json
rename to gameplay/songs/cocoa/charts/cocoa-chart.json
diff --git a/gameplay/songs/cocoa/cocoa-metadata.json b/gameplay/songs/cocoa/charts/cocoa-metadata.json
similarity index 100%
rename from gameplay/songs/cocoa/cocoa-metadata.json
rename to gameplay/songs/cocoa/charts/cocoa-metadata.json
diff --git a/gameplay/songs/cocoa/cocoa-chart-erect.json b/gameplay/songs/cocoa/charts/erect/cocoa-chart-erect.json
similarity index 100%
rename from gameplay/songs/cocoa/cocoa-chart-erect.json
rename to gameplay/songs/cocoa/charts/erect/cocoa-chart-erect.json
diff --git a/gameplay/songs/cocoa/cocoa-metadata-erect.json b/gameplay/songs/cocoa/charts/erect/cocoa-metadata-erect.json
similarity index 100%
rename from gameplay/songs/cocoa/cocoa-metadata-erect.json
rename to gameplay/songs/cocoa/charts/erect/cocoa-metadata-erect.json
diff --git a/gameplay/songs/dadbattle/Inst.mp3 b/gameplay/songs/dadbattle/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Inst.mp3
rename to gameplay/songs/dadbattle/audio/Inst.mp3
diff --git a/gameplay/songs/dadbattle/Inst.ogg b/gameplay/songs/dadbattle/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Inst.ogg
rename to gameplay/songs/dadbattle/audio/Inst.ogg
diff --git a/gameplay/songs/dadbattle/Voices-bf.mp3 b/gameplay/songs/dadbattle/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-bf.mp3
rename to gameplay/songs/dadbattle/audio/Voices-bf.mp3
diff --git a/gameplay/songs/dadbattle/Voices-bf.ogg b/gameplay/songs/dadbattle/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-bf.ogg
rename to gameplay/songs/dadbattle/audio/Voices-bf.ogg
diff --git a/gameplay/songs/dadbattle/Voices-dad.mp3 b/gameplay/songs/dadbattle/audio/Voices-dad.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-dad.mp3
rename to gameplay/songs/dadbattle/audio/Voices-dad.mp3
diff --git a/gameplay/songs/dadbattle/Voices-dad.ogg b/gameplay/songs/dadbattle/audio/Voices-dad.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-dad.ogg
rename to gameplay/songs/dadbattle/audio/Voices-dad.ogg
diff --git a/gameplay/songs/dadbattle/Inst-erect.mp3 b/gameplay/songs/dadbattle/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Inst-erect.mp3
rename to gameplay/songs/dadbattle/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/dadbattle/Inst-erect.ogg b/gameplay/songs/dadbattle/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Inst-erect.ogg
rename to gameplay/songs/dadbattle/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/dadbattle/Voices-bf-erect.mp3 b/gameplay/songs/dadbattle/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-bf-erect.mp3
rename to gameplay/songs/dadbattle/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/dadbattle/Voices-bf-erect.ogg b/gameplay/songs/dadbattle/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-bf-erect.ogg
rename to gameplay/songs/dadbattle/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/dadbattle/Voices-dad-erect.mp3 b/gameplay/songs/dadbattle/audio/erect/Voices-dad-erect.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-dad-erect.mp3
rename to gameplay/songs/dadbattle/audio/erect/Voices-dad-erect.mp3
diff --git a/gameplay/songs/dadbattle/Voices-dad-erect.ogg b/gameplay/songs/dadbattle/audio/erect/Voices-dad-erect.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-dad-erect.ogg
rename to gameplay/songs/dadbattle/audio/erect/Voices-dad-erect.ogg
diff --git a/gameplay/songs/dadbattle/Inst-pico.mp3 b/gameplay/songs/dadbattle/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Inst-pico.mp3
rename to gameplay/songs/dadbattle/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/dadbattle/Inst-pico.ogg b/gameplay/songs/dadbattle/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Inst-pico.ogg
rename to gameplay/songs/dadbattle/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/dadbattle/Voices-dad-pico.mp3 b/gameplay/songs/dadbattle/audio/pico/Voices-dad-pico.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-dad-pico.mp3
rename to gameplay/songs/dadbattle/audio/pico/Voices-dad-pico.mp3
diff --git a/gameplay/songs/dadbattle/Voices-dad-pico.ogg b/gameplay/songs/dadbattle/audio/pico/Voices-dad-pico.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-dad-pico.ogg
rename to gameplay/songs/dadbattle/audio/pico/Voices-dad-pico.ogg
diff --git a/gameplay/songs/dadbattle/Voices-pico-playable-pico.mp3 b/gameplay/songs/dadbattle/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-pico-playable-pico.mp3
rename to gameplay/songs/dadbattle/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/dadbattle/Voices-pico-playable-pico.ogg b/gameplay/songs/dadbattle/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/dadbattle/Voices-pico-playable-pico.ogg
rename to gameplay/songs/dadbattle/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/dadbattle/dadbattle-chart.json b/gameplay/songs/dadbattle/charts/dadbattle-chart.json
similarity index 100%
rename from gameplay/songs/dadbattle/dadbattle-chart.json
rename to gameplay/songs/dadbattle/charts/dadbattle-chart.json
diff --git a/gameplay/songs/dadbattle/dadbattle-metadata.json b/gameplay/songs/dadbattle/charts/dadbattle-metadata.json
similarity index 100%
rename from gameplay/songs/dadbattle/dadbattle-metadata.json
rename to gameplay/songs/dadbattle/charts/dadbattle-metadata.json
diff --git a/gameplay/songs/dadbattle/dadbattle-chart-erect.json b/gameplay/songs/dadbattle/charts/erect/dadbattle-chart-erect.json
similarity index 100%
rename from gameplay/songs/dadbattle/dadbattle-chart-erect.json
rename to gameplay/songs/dadbattle/charts/erect/dadbattle-chart-erect.json
diff --git a/gameplay/songs/dadbattle/dadbattle-metadata-erect.json b/gameplay/songs/dadbattle/charts/erect/dadbattle-metadata-erect.json
similarity index 100%
rename from gameplay/songs/dadbattle/dadbattle-metadata-erect.json
rename to gameplay/songs/dadbattle/charts/erect/dadbattle-metadata-erect.json
diff --git a/gameplay/songs/dadbattle/dadbattle-chart-pico.json b/gameplay/songs/dadbattle/charts/pico/dadbattle-chart-pico.json
similarity index 100%
rename from gameplay/songs/dadbattle/dadbattle-chart-pico.json
rename to gameplay/songs/dadbattle/charts/pico/dadbattle-chart-pico.json
diff --git a/gameplay/songs/dadbattle/dadbattle-metadata-pico.json b/gameplay/songs/dadbattle/charts/pico/dadbattle-metadata-pico.json
similarity index 100%
rename from gameplay/songs/dadbattle/dadbattle-metadata-pico.json
rename to gameplay/songs/dadbattle/charts/pico/dadbattle-metadata-pico.json
diff --git a/gameplay/songs/darnell/Inst.mp3 b/gameplay/songs/darnell/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/darnell/Inst.mp3
rename to gameplay/songs/darnell/audio/Inst.mp3
diff --git a/gameplay/songs/darnell/Inst.ogg b/gameplay/songs/darnell/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/darnell/Inst.ogg
rename to gameplay/songs/darnell/audio/Inst.ogg
diff --git a/gameplay/songs/darnell/Voices-darnell.mp3 b/gameplay/songs/darnell/audio/Voices-darnell.mp3
similarity index 100%
rename from gameplay/songs/darnell/Voices-darnell.mp3
rename to gameplay/songs/darnell/audio/Voices-darnell.mp3
diff --git a/gameplay/songs/darnell/Voices-darnell.ogg b/gameplay/songs/darnell/audio/Voices-darnell.ogg
similarity index 100%
rename from gameplay/songs/darnell/Voices-darnell.ogg
rename to gameplay/songs/darnell/audio/Voices-darnell.ogg
diff --git a/gameplay/songs/darnell/Voices-pico.mp3 b/gameplay/songs/darnell/audio/Voices-pico.mp3
similarity index 100%
rename from gameplay/songs/darnell/Voices-pico.mp3
rename to gameplay/songs/darnell/audio/Voices-pico.mp3
diff --git a/gameplay/songs/darnell/Voices-pico.ogg b/gameplay/songs/darnell/audio/Voices-pico.ogg
similarity index 100%
rename from gameplay/songs/darnell/Voices-pico.ogg
rename to gameplay/songs/darnell/audio/Voices-pico.ogg
diff --git a/gameplay/songs/darnell/Inst-bf.mp3 b/gameplay/songs/darnell/audio/bf/Inst-bf.mp3
similarity index 100%
rename from gameplay/songs/darnell/Inst-bf.mp3
rename to gameplay/songs/darnell/audio/bf/Inst-bf.mp3
diff --git a/gameplay/songs/darnell/Inst-bf.ogg b/gameplay/songs/darnell/audio/bf/Inst-bf.ogg
similarity index 100%
rename from gameplay/songs/darnell/Inst-bf.ogg
rename to gameplay/songs/darnell/audio/bf/Inst-bf.ogg
diff --git a/gameplay/songs/darnell/Voices-bf-bf.mp3 b/gameplay/songs/darnell/audio/bf/Voices-bf-bf.mp3
similarity index 100%
rename from gameplay/songs/darnell/Voices-bf-bf.mp3
rename to gameplay/songs/darnell/audio/bf/Voices-bf-bf.mp3
diff --git a/gameplay/songs/darnell/Voices-bf-bf.ogg b/gameplay/songs/darnell/audio/bf/Voices-bf-bf.ogg
similarity index 100%
rename from gameplay/songs/darnell/Voices-bf-bf.ogg
rename to gameplay/songs/darnell/audio/bf/Voices-bf-bf.ogg
diff --git a/gameplay/songs/darnell/Voices-darnell-bf.mp3 b/gameplay/songs/darnell/audio/bf/Voices-darnell-bf.mp3
similarity index 100%
rename from gameplay/songs/darnell/Voices-darnell-bf.mp3
rename to gameplay/songs/darnell/audio/bf/Voices-darnell-bf.mp3
diff --git a/gameplay/songs/darnell/Voices-darnell-bf.ogg b/gameplay/songs/darnell/audio/bf/Voices-darnell-bf.ogg
similarity index 100%
rename from gameplay/songs/darnell/Voices-darnell-bf.ogg
rename to gameplay/songs/darnell/audio/bf/Voices-darnell-bf.ogg
diff --git a/gameplay/songs/darnell/darnell-chart-bf.json b/gameplay/songs/darnell/charts/bf/darnell-chart-bf.json
similarity index 100%
rename from gameplay/songs/darnell/darnell-chart-bf.json
rename to gameplay/songs/darnell/charts/bf/darnell-chart-bf.json
diff --git a/gameplay/songs/darnell/darnell-metadata-bf.json b/gameplay/songs/darnell/charts/bf/darnell-metadata-bf.json
similarity index 100%
rename from gameplay/songs/darnell/darnell-metadata-bf.json
rename to gameplay/songs/darnell/charts/bf/darnell-metadata-bf.json
diff --git a/gameplay/songs/darnell/darnell-chart.json b/gameplay/songs/darnell/charts/darnell-chart.json
similarity index 100%
rename from gameplay/songs/darnell/darnell-chart.json
rename to gameplay/songs/darnell/charts/darnell-chart.json
diff --git a/gameplay/songs/darnell/darnell-metadata.json b/gameplay/songs/darnell/charts/darnell-metadata.json
similarity index 100%
rename from gameplay/songs/darnell/darnell-metadata.json
rename to gameplay/songs/darnell/charts/darnell-metadata.json
diff --git a/gameplay/songs/darnell/cutscene/cutscene-can.png b/gameplay/songs/darnell/cutscenes/in-game/cutscene-can.png
similarity index 100%
rename from gameplay/songs/darnell/cutscene/cutscene-can.png
rename to gameplay/songs/darnell/cutscenes/in-game/cutscene-can.png
diff --git a/gameplay/songs/darnell/cutscene/cutscene-can.xml b/gameplay/songs/darnell/cutscenes/in-game/cutscene-can.xml
similarity index 100%
rename from gameplay/songs/darnell/cutscene/cutscene-can.xml
rename to gameplay/songs/darnell/cutscenes/in-game/cutscene-can.xml
diff --git a/gameplay/songs/darnell/cutscene/darnell-can-cutscene/darnell-can-cutscene-metadata.json b/gameplay/songs/darnell/cutscenes/in-game/darnell-can-cutscene/darnell-can-cutscene-metadata.json
similarity index 100%
rename from gameplay/songs/darnell/cutscene/darnell-can-cutscene/darnell-can-cutscene-metadata.json
rename to gameplay/songs/darnell/cutscenes/in-game/darnell-can-cutscene/darnell-can-cutscene-metadata.json
diff --git a/gameplay/songs/darnell/cutscene/darnell-can-cutscene/darnell-can-cutscene.mp3 b/gameplay/songs/darnell/cutscenes/in-game/darnell-can-cutscene/darnell-can-cutscene.mp3
similarity index 100%
rename from gameplay/songs/darnell/cutscene/darnell-can-cutscene/darnell-can-cutscene.mp3
rename to gameplay/songs/darnell/cutscenes/in-game/darnell-can-cutscene/darnell-can-cutscene.mp3
diff --git a/gameplay/songs/darnell/cutscene/darnell-can-cutscene/darnell-can-cutscene.ogg b/gameplay/songs/darnell/cutscenes/in-game/darnell-can-cutscene/darnell-can-cutscene.ogg
similarity index 100%
rename from gameplay/songs/darnell/cutscene/darnell-can-cutscene/darnell-can-cutscene.ogg
rename to gameplay/songs/darnell/cutscenes/in-game/darnell-can-cutscene/darnell-can-cutscene.ogg
diff --git a/gameplay/songs/darnell/cutscene/darnell-laugh.mp3 b/gameplay/songs/darnell/cutscenes/in-game/darnell-laugh.mp3
similarity index 100%
rename from gameplay/songs/darnell/cutscene/darnell-laugh.mp3
rename to gameplay/songs/darnell/cutscenes/in-game/darnell-laugh.mp3
diff --git a/gameplay/songs/darnell/cutscene/darnell-laugh.ogg b/gameplay/songs/darnell/cutscenes/in-game/darnell-laugh.ogg
similarity index 100%
rename from gameplay/songs/darnell/cutscene/darnell-laugh.ogg
rename to gameplay/songs/darnell/cutscenes/in-game/darnell-laugh.ogg
diff --git a/gameplay/songs/darnell/cutscene/nene-laugh.mp3 b/gameplay/songs/darnell/cutscenes/in-game/nene-laugh.mp3
similarity index 100%
rename from gameplay/songs/darnell/cutscene/nene-laugh.mp3
rename to gameplay/songs/darnell/cutscenes/in-game/nene-laugh.mp3
diff --git a/gameplay/songs/darnell/cutscene/nene-laugh.ogg b/gameplay/songs/darnell/cutscenes/in-game/nene-laugh.ogg
similarity index 100%
rename from gameplay/songs/darnell/cutscene/nene-laugh.ogg
rename to gameplay/songs/darnell/cutscenes/in-game/nene-laugh.ogg
diff --git a/gameplay/songs/darnell/cutscene.mp4 b/gameplay/songs/darnell/cutscenes/video/cutscene.mp4
similarity index 100%
rename from gameplay/songs/darnell/cutscene.mp4
rename to gameplay/songs/darnell/cutscenes/video/cutscene.mp4
diff --git a/gameplay/songs/eggnog/Inst.mp3 b/gameplay/songs/eggnog/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Inst.mp3
rename to gameplay/songs/eggnog/audio/Inst.mp3
diff --git a/gameplay/songs/eggnog/Inst.ogg b/gameplay/songs/eggnog/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Inst.ogg
rename to gameplay/songs/eggnog/audio/Inst.ogg
diff --git a/gameplay/songs/eggnog/Voices-bf.mp3 b/gameplay/songs/eggnog/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-bf.mp3
rename to gameplay/songs/eggnog/audio/Voices-bf.mp3
diff --git a/gameplay/songs/eggnog/Voices-bf.ogg b/gameplay/songs/eggnog/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-bf.ogg
rename to gameplay/songs/eggnog/audio/Voices-bf.ogg
diff --git a/gameplay/songs/eggnog/Voices-parents-christmas.mp3 b/gameplay/songs/eggnog/audio/Voices-parents-christmas.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-parents-christmas.mp3
rename to gameplay/songs/eggnog/audio/Voices-parents-christmas.mp3
diff --git a/gameplay/songs/eggnog/Voices-parents-christmas.ogg b/gameplay/songs/eggnog/audio/Voices-parents-christmas.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-parents-christmas.ogg
rename to gameplay/songs/eggnog/audio/Voices-parents-christmas.ogg
diff --git a/gameplay/songs/eggnog/Inst-erect.mp3 b/gameplay/songs/eggnog/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Inst-erect.mp3
rename to gameplay/songs/eggnog/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/eggnog/Inst-erect.ogg b/gameplay/songs/eggnog/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Inst-erect.ogg
rename to gameplay/songs/eggnog/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/eggnog/Voices-bf-christmas-erect.mp3 b/gameplay/songs/eggnog/audio/erect/Voices-bf-christmas-erect.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-bf-christmas-erect.mp3
rename to gameplay/songs/eggnog/audio/erect/Voices-bf-christmas-erect.mp3
diff --git a/gameplay/songs/eggnog/Voices-bf-christmas-erect.ogg b/gameplay/songs/eggnog/audio/erect/Voices-bf-christmas-erect.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-bf-christmas-erect.ogg
rename to gameplay/songs/eggnog/audio/erect/Voices-bf-christmas-erect.ogg
diff --git a/gameplay/songs/eggnog/Voices-parents-christmas-erect.mp3 b/gameplay/songs/eggnog/audio/erect/Voices-parents-christmas-erect.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-parents-christmas-erect.mp3
rename to gameplay/songs/eggnog/audio/erect/Voices-parents-christmas-erect.mp3
diff --git a/gameplay/songs/eggnog/Voices-parents-christmas-erect.ogg b/gameplay/songs/eggnog/audio/erect/Voices-parents-christmas-erect.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-parents-christmas-erect.ogg
rename to gameplay/songs/eggnog/audio/erect/Voices-parents-christmas-erect.ogg
diff --git a/gameplay/songs/eggnog/Inst-pico.mp3 b/gameplay/songs/eggnog/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Inst-pico.mp3
rename to gameplay/songs/eggnog/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/eggnog/Inst-pico.ogg b/gameplay/songs/eggnog/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Inst-pico.ogg
rename to gameplay/songs/eggnog/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/eggnog/Voices-parents-christmas-pico.mp3 b/gameplay/songs/eggnog/audio/pico/Voices-parents-christmas-pico.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-parents-christmas-pico.mp3
rename to gameplay/songs/eggnog/audio/pico/Voices-parents-christmas-pico.mp3
diff --git a/gameplay/songs/eggnog/Voices-parents-christmas-pico.ogg b/gameplay/songs/eggnog/audio/pico/Voices-parents-christmas-pico.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-parents-christmas-pico.ogg
rename to gameplay/songs/eggnog/audio/pico/Voices-parents-christmas-pico.ogg
diff --git a/gameplay/songs/eggnog/Voices-pico-christmas-pico.mp3 b/gameplay/songs/eggnog/audio/pico/Voices-pico-christmas-pico.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-pico-christmas-pico.mp3
rename to gameplay/songs/eggnog/audio/pico/Voices-pico-christmas-pico.mp3
diff --git a/gameplay/songs/eggnog/Voices-pico-christmas-pico.ogg b/gameplay/songs/eggnog/audio/pico/Voices-pico-christmas-pico.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-pico-christmas-pico.ogg
rename to gameplay/songs/eggnog/audio/pico/Voices-pico-christmas-pico.ogg
diff --git a/gameplay/songs/eggnog/Voices-dad.mp3 b/gameplay/songs/eggnog/audio/unused/Voices-dad.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-dad.mp3
rename to gameplay/songs/eggnog/audio/unused/Voices-dad.mp3
diff --git a/gameplay/songs/eggnog/Voices-dad.ogg b/gameplay/songs/eggnog/audio/unused/Voices-dad.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-dad.ogg
rename to gameplay/songs/eggnog/audio/unused/Voices-dad.ogg
diff --git a/gameplay/songs/eggnog/Voices-mom.mp3 b/gameplay/songs/eggnog/audio/unused/Voices-mom.mp3
similarity index 100%
rename from gameplay/songs/eggnog/Voices-mom.mp3
rename to gameplay/songs/eggnog/audio/unused/Voices-mom.mp3
diff --git a/gameplay/songs/eggnog/Voices-mom.ogg b/gameplay/songs/eggnog/audio/unused/Voices-mom.ogg
similarity index 100%
rename from gameplay/songs/eggnog/Voices-mom.ogg
rename to gameplay/songs/eggnog/audio/unused/Voices-mom.ogg
diff --git a/gameplay/songs/eggnog/eggnog-chart.json b/gameplay/songs/eggnog/charts/eggnog-chart.json
similarity index 100%
rename from gameplay/songs/eggnog/eggnog-chart.json
rename to gameplay/songs/eggnog/charts/eggnog-chart.json
diff --git a/gameplay/songs/eggnog/eggnog-metadata.json b/gameplay/songs/eggnog/charts/eggnog-metadata.json
similarity index 100%
rename from gameplay/songs/eggnog/eggnog-metadata.json
rename to gameplay/songs/eggnog/charts/eggnog-metadata.json
diff --git a/gameplay/songs/eggnog/eggnog-chart-erect.json b/gameplay/songs/eggnog/charts/erect/eggnog-chart-erect.json
similarity index 100%
rename from gameplay/songs/eggnog/eggnog-chart-erect.json
rename to gameplay/songs/eggnog/charts/erect/eggnog-chart-erect.json
diff --git a/gameplay/songs/eggnog/eggnog-metadata-erect.json b/gameplay/songs/eggnog/charts/erect/eggnog-metadata-erect.json
similarity index 100%
rename from gameplay/songs/eggnog/eggnog-metadata-erect.json
rename to gameplay/songs/eggnog/charts/erect/eggnog-metadata-erect.json
diff --git a/gameplay/songs/eggnog/eggnog-chart-pico.json b/gameplay/songs/eggnog/charts/pico/eggnog-chart-pico.json
similarity index 100%
rename from gameplay/songs/eggnog/eggnog-chart-pico.json
rename to gameplay/songs/eggnog/charts/pico/eggnog-chart-pico.json
diff --git a/gameplay/songs/eggnog/eggnog-metadata-pico.json b/gameplay/songs/eggnog/charts/pico/eggnog-metadata-pico.json
similarity index 100%
rename from gameplay/songs/eggnog/eggnog-metadata-pico.json
rename to gameplay/songs/eggnog/charts/pico/eggnog-metadata-pico.json
diff --git a/gameplay/songs/fresh/Inst.mp3 b/gameplay/songs/fresh/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/fresh/Inst.mp3
rename to gameplay/songs/fresh/audio/Inst.mp3
diff --git a/gameplay/songs/fresh/Inst.ogg b/gameplay/songs/fresh/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/fresh/Inst.ogg
rename to gameplay/songs/fresh/audio/Inst.ogg
diff --git a/gameplay/songs/fresh/Voices-bf.mp3 b/gameplay/songs/fresh/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/fresh/Voices-bf.mp3
rename to gameplay/songs/fresh/audio/Voices-bf.mp3
diff --git a/gameplay/songs/fresh/Voices-bf.ogg b/gameplay/songs/fresh/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/fresh/Voices-bf.ogg
rename to gameplay/songs/fresh/audio/Voices-bf.ogg
diff --git a/gameplay/songs/fresh/Voices-dad.mp3 b/gameplay/songs/fresh/audio/Voices-dad.mp3
similarity index 100%
rename from gameplay/songs/fresh/Voices-dad.mp3
rename to gameplay/songs/fresh/audio/Voices-dad.mp3
diff --git a/gameplay/songs/fresh/Voices-dad.ogg b/gameplay/songs/fresh/audio/Voices-dad.ogg
similarity index 100%
rename from gameplay/songs/fresh/Voices-dad.ogg
rename to gameplay/songs/fresh/audio/Voices-dad.ogg
diff --git a/gameplay/songs/fresh/Inst-erect.mp3 b/gameplay/songs/fresh/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/fresh/Inst-erect.mp3
rename to gameplay/songs/fresh/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/fresh/Inst-erect.ogg b/gameplay/songs/fresh/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/fresh/Inst-erect.ogg
rename to gameplay/songs/fresh/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/fresh/Voices-bf-erect.mp3 b/gameplay/songs/fresh/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/fresh/Voices-bf-erect.mp3
rename to gameplay/songs/fresh/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/fresh/Voices-bf-erect.ogg b/gameplay/songs/fresh/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/fresh/Voices-bf-erect.ogg
rename to gameplay/songs/fresh/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/fresh/Voices-dad-erect.mp3 b/gameplay/songs/fresh/audio/erect/Voices-dad-erect.mp3
similarity index 100%
rename from gameplay/songs/fresh/Voices-dad-erect.mp3
rename to gameplay/songs/fresh/audio/erect/Voices-dad-erect.mp3
diff --git a/gameplay/songs/fresh/Voices-dad-erect.ogg b/gameplay/songs/fresh/audio/erect/Voices-dad-erect.ogg
similarity index 100%
rename from gameplay/songs/fresh/Voices-dad-erect.ogg
rename to gameplay/songs/fresh/audio/erect/Voices-dad-erect.ogg
diff --git a/gameplay/songs/fresh/Inst-pico.mp3 b/gameplay/songs/fresh/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/fresh/Inst-pico.mp3
rename to gameplay/songs/fresh/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/fresh/Inst-pico.ogg b/gameplay/songs/fresh/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/fresh/Inst-pico.ogg
rename to gameplay/songs/fresh/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/fresh/Voices-dad-pico.mp3 b/gameplay/songs/fresh/audio/pico/Voices-dad-pico.mp3
similarity index 100%
rename from gameplay/songs/fresh/Voices-dad-pico.mp3
rename to gameplay/songs/fresh/audio/pico/Voices-dad-pico.mp3
diff --git a/gameplay/songs/fresh/Voices-dad-pico.ogg b/gameplay/songs/fresh/audio/pico/Voices-dad-pico.ogg
similarity index 100%
rename from gameplay/songs/fresh/Voices-dad-pico.ogg
rename to gameplay/songs/fresh/audio/pico/Voices-dad-pico.ogg
diff --git a/gameplay/songs/fresh/Voices-pico-playable-pico.mp3 b/gameplay/songs/fresh/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/fresh/Voices-pico-playable-pico.mp3
rename to gameplay/songs/fresh/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/fresh/Voices-pico-playable-pico.ogg b/gameplay/songs/fresh/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/fresh/Voices-pico-playable-pico.ogg
rename to gameplay/songs/fresh/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/fresh/fresh-chart-erect.json b/gameplay/songs/fresh/charts/erect/fresh-chart-erect.json
similarity index 100%
rename from gameplay/songs/fresh/fresh-chart-erect.json
rename to gameplay/songs/fresh/charts/erect/fresh-chart-erect.json
diff --git a/gameplay/songs/fresh/fresh-metadata-erect.json b/gameplay/songs/fresh/charts/erect/fresh-metadata-erect.json
similarity index 100%
rename from gameplay/songs/fresh/fresh-metadata-erect.json
rename to gameplay/songs/fresh/charts/erect/fresh-metadata-erect.json
diff --git a/gameplay/songs/fresh/fresh-chart.json b/gameplay/songs/fresh/charts/fresh-chart.json
similarity index 100%
rename from gameplay/songs/fresh/fresh-chart.json
rename to gameplay/songs/fresh/charts/fresh-chart.json
diff --git a/gameplay/songs/fresh/fresh-metadata.json b/gameplay/songs/fresh/charts/fresh-metadata.json
similarity index 100%
rename from gameplay/songs/fresh/fresh-metadata.json
rename to gameplay/songs/fresh/charts/fresh-metadata.json
diff --git a/gameplay/songs/fresh/fresh-chart-pico.json b/gameplay/songs/fresh/charts/pico/fresh-chart-pico.json
similarity index 100%
rename from gameplay/songs/fresh/fresh-chart-pico.json
rename to gameplay/songs/fresh/charts/pico/fresh-chart-pico.json
diff --git a/gameplay/songs/fresh/fresh-metadata-pico.json b/gameplay/songs/fresh/charts/pico/fresh-metadata-pico.json
similarity index 100%
rename from gameplay/songs/fresh/fresh-metadata-pico.json
rename to gameplay/songs/fresh/charts/pico/fresh-metadata-pico.json
diff --git a/gameplay/songs/guns/Inst.mp3 b/gameplay/songs/guns/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/guns/Inst.mp3
rename to gameplay/songs/guns/audio/Inst.mp3
diff --git a/gameplay/songs/guns/Inst.ogg b/gameplay/songs/guns/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/guns/Inst.ogg
rename to gameplay/songs/guns/audio/Inst.ogg
diff --git a/gameplay/songs/guns/Voices-bf.mp3 b/gameplay/songs/guns/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/guns/Voices-bf.mp3
rename to gameplay/songs/guns/audio/Voices-bf.mp3
diff --git a/gameplay/songs/guns/Voices-bf.ogg b/gameplay/songs/guns/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/guns/Voices-bf.ogg
rename to gameplay/songs/guns/audio/Voices-bf.ogg
diff --git a/gameplay/songs/guns/Voices-tankman.mp3 b/gameplay/songs/guns/audio/Voices-tankman.mp3
similarity index 100%
rename from gameplay/songs/guns/Voices-tankman.mp3
rename to gameplay/songs/guns/audio/Voices-tankman.mp3
diff --git a/gameplay/songs/guns/Voices-tankman.ogg b/gameplay/songs/guns/audio/Voices-tankman.ogg
similarity index 100%
rename from gameplay/songs/guns/Voices-tankman.ogg
rename to gameplay/songs/guns/audio/Voices-tankman.ogg
diff --git a/gameplay/songs/guns/Inst-pico.mp3 b/gameplay/songs/guns/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/guns/Inst-pico.mp3
rename to gameplay/songs/guns/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/guns/Inst-pico.ogg b/gameplay/songs/guns/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/guns/Inst-pico.ogg
rename to gameplay/songs/guns/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/guns/Voices-pico-playable-pico.mp3 b/gameplay/songs/guns/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/guns/Voices-pico-playable-pico.mp3
rename to gameplay/songs/guns/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/guns/Voices-pico-playable-pico.ogg b/gameplay/songs/guns/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/guns/Voices-pico-playable-pico.ogg
rename to gameplay/songs/guns/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/guns/Voices-tankman-pico.mp3 b/gameplay/songs/guns/audio/pico/Voices-tankman-pico.mp3
similarity index 100%
rename from gameplay/songs/guns/Voices-tankman-pico.mp3
rename to gameplay/songs/guns/audio/pico/Voices-tankman-pico.mp3
diff --git a/gameplay/songs/guns/Voices-tankman-pico.ogg b/gameplay/songs/guns/audio/pico/Voices-tankman-pico.ogg
similarity index 100%
rename from gameplay/songs/guns/Voices-tankman-pico.ogg
rename to gameplay/songs/guns/audio/pico/Voices-tankman-pico.ogg
diff --git a/gameplay/songs/guns/guns-chart.json b/gameplay/songs/guns/charts/guns-chart.json
similarity index 100%
rename from gameplay/songs/guns/guns-chart.json
rename to gameplay/songs/guns/charts/guns-chart.json
diff --git a/gameplay/songs/guns/guns-metadata.json b/gameplay/songs/guns/charts/guns-metadata.json
similarity index 100%
rename from gameplay/songs/guns/guns-metadata.json
rename to gameplay/songs/guns/charts/guns-metadata.json
diff --git a/gameplay/songs/guns/guns-chart-pico.json b/gameplay/songs/guns/charts/pico/guns-chart-pico.json
similarity index 100%
rename from gameplay/songs/guns/guns-chart-pico.json
rename to gameplay/songs/guns/charts/pico/guns-chart-pico.json
diff --git a/gameplay/songs/guns/guns-metadata-pico.json b/gameplay/songs/guns/charts/pico/guns-metadata-pico.json
similarity index 100%
rename from gameplay/songs/guns/guns-metadata-pico.json
rename to gameplay/songs/guns/charts/pico/guns-metadata-pico.json
diff --git a/gameplay/songs/high/Inst.mp3 b/gameplay/songs/high/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/high/Inst.mp3
rename to gameplay/songs/high/audio/Inst.mp3
diff --git a/gameplay/songs/high/Inst.ogg b/gameplay/songs/high/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/high/Inst.ogg
rename to gameplay/songs/high/audio/Inst.ogg
diff --git a/gameplay/songs/high/Voices-bf.mp3 b/gameplay/songs/high/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/high/Voices-bf.mp3
rename to gameplay/songs/high/audio/Voices-bf.mp3
diff --git a/gameplay/songs/high/Voices-bf.ogg b/gameplay/songs/high/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/high/Voices-bf.ogg
rename to gameplay/songs/high/audio/Voices-bf.ogg
diff --git a/gameplay/songs/high/Voices-mom.mp3 b/gameplay/songs/high/audio/Voices-mom.mp3
similarity index 100%
rename from gameplay/songs/high/Voices-mom.mp3
rename to gameplay/songs/high/audio/Voices-mom.mp3
diff --git a/gameplay/songs/high/Voices-mom.ogg b/gameplay/songs/high/audio/Voices-mom.ogg
similarity index 100%
rename from gameplay/songs/high/Voices-mom.ogg
rename to gameplay/songs/high/audio/Voices-mom.ogg
diff --git a/gameplay/songs/high/Inst-erect.mp3 b/gameplay/songs/high/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/high/Inst-erect.mp3
rename to gameplay/songs/high/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/high/Inst-erect.ogg b/gameplay/songs/high/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/high/Inst-erect.ogg
rename to gameplay/songs/high/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/high/Voices-bf-car-erect.mp3 b/gameplay/songs/high/audio/erect/Voices-bf-car-erect.mp3
similarity index 100%
rename from gameplay/songs/high/Voices-bf-car-erect.mp3
rename to gameplay/songs/high/audio/erect/Voices-bf-car-erect.mp3
diff --git a/gameplay/songs/high/Voices-bf-car-erect.ogg b/gameplay/songs/high/audio/erect/Voices-bf-car-erect.ogg
similarity index 100%
rename from gameplay/songs/high/Voices-bf-car-erect.ogg
rename to gameplay/songs/high/audio/erect/Voices-bf-car-erect.ogg
diff --git a/gameplay/songs/high/Voices-mom-car-erect.mp3 b/gameplay/songs/high/audio/erect/Voices-mom-car-erect.mp3
similarity index 100%
rename from gameplay/songs/high/Voices-mom-car-erect.mp3
rename to gameplay/songs/high/audio/erect/Voices-mom-car-erect.mp3
diff --git a/gameplay/songs/high/Voices-mom-car-erect.ogg b/gameplay/songs/high/audio/erect/Voices-mom-car-erect.ogg
similarity index 100%
rename from gameplay/songs/high/Voices-mom-car-erect.ogg
rename to gameplay/songs/high/audio/erect/Voices-mom-car-erect.ogg
diff --git a/gameplay/songs/high/high-chart-erect.json b/gameplay/songs/high/charts/erect/high-chart-erect.json
similarity index 100%
rename from gameplay/songs/high/high-chart-erect.json
rename to gameplay/songs/high/charts/erect/high-chart-erect.json
diff --git a/gameplay/songs/high/high-metadata-erect.json b/gameplay/songs/high/charts/erect/high-metadata-erect.json
similarity index 100%
rename from gameplay/songs/high/high-metadata-erect.json
rename to gameplay/songs/high/charts/erect/high-metadata-erect.json
diff --git a/gameplay/songs/high/high-chart.json b/gameplay/songs/high/charts/high-chart.json
similarity index 100%
rename from gameplay/songs/high/high-chart.json
rename to gameplay/songs/high/charts/high-chart.json
diff --git a/gameplay/songs/high/high-metadata.json b/gameplay/songs/high/charts/high-metadata.json
similarity index 100%
rename from gameplay/songs/high/high-metadata.json
rename to gameplay/songs/high/charts/high-metadata.json
diff --git a/gameplay/songs/lit-up/Inst.mp3 b/gameplay/songs/lit-up/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/lit-up/Inst.mp3
rename to gameplay/songs/lit-up/audio/Inst.mp3
diff --git a/gameplay/songs/lit-up/Inst.ogg b/gameplay/songs/lit-up/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/lit-up/Inst.ogg
rename to gameplay/songs/lit-up/audio/Inst.ogg
diff --git a/gameplay/songs/lit-up/Voices-darnell.mp3 b/gameplay/songs/lit-up/audio/Voices-darnell.mp3
similarity index 100%
rename from gameplay/songs/lit-up/Voices-darnell.mp3
rename to gameplay/songs/lit-up/audio/Voices-darnell.mp3
diff --git a/gameplay/songs/lit-up/Voices-darnell.ogg b/gameplay/songs/lit-up/audio/Voices-darnell.ogg
similarity index 100%
rename from gameplay/songs/lit-up/Voices-darnell.ogg
rename to gameplay/songs/lit-up/audio/Voices-darnell.ogg
diff --git a/gameplay/songs/lit-up/Voices-pico.mp3 b/gameplay/songs/lit-up/audio/Voices-pico.mp3
similarity index 100%
rename from gameplay/songs/lit-up/Voices-pico.mp3
rename to gameplay/songs/lit-up/audio/Voices-pico.mp3
diff --git a/gameplay/songs/lit-up/Voices-pico.ogg b/gameplay/songs/lit-up/audio/Voices-pico.ogg
similarity index 100%
rename from gameplay/songs/lit-up/Voices-pico.ogg
rename to gameplay/songs/lit-up/audio/Voices-pico.ogg
diff --git a/gameplay/songs/lit-up/lit-up-chart.json b/gameplay/songs/lit-up/charts/lit-up-chart.json
similarity index 100%
rename from gameplay/songs/lit-up/lit-up-chart.json
rename to gameplay/songs/lit-up/charts/lit-up-chart.json
diff --git a/gameplay/songs/lit-up/lit-up-metadata.json b/gameplay/songs/lit-up/charts/lit-up-metadata.json
similarity index 100%
rename from gameplay/songs/lit-up/lit-up-metadata.json
rename to gameplay/songs/lit-up/charts/lit-up-metadata.json
diff --git a/gameplay/songs/milf/Inst.mp3 b/gameplay/songs/milf/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/milf/Inst.mp3
rename to gameplay/songs/milf/audio/Inst.mp3
diff --git a/gameplay/songs/milf/Inst.ogg b/gameplay/songs/milf/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/milf/Inst.ogg
rename to gameplay/songs/milf/audio/Inst.ogg
diff --git a/gameplay/songs/milf/Voices-bf.mp3 b/gameplay/songs/milf/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/milf/Voices-bf.mp3
rename to gameplay/songs/milf/audio/Voices-bf.mp3
diff --git a/gameplay/songs/milf/Voices-bf.ogg b/gameplay/songs/milf/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/milf/Voices-bf.ogg
rename to gameplay/songs/milf/audio/Voices-bf.ogg
diff --git a/gameplay/songs/milf/Voices-mom.mp3 b/gameplay/songs/milf/audio/Voices-mom.mp3
similarity index 100%
rename from gameplay/songs/milf/Voices-mom.mp3
rename to gameplay/songs/milf/audio/Voices-mom.mp3
diff --git a/gameplay/songs/milf/Voices-mom.ogg b/gameplay/songs/milf/audio/Voices-mom.ogg
similarity index 100%
rename from gameplay/songs/milf/Voices-mom.ogg
rename to gameplay/songs/milf/audio/Voices-mom.ogg
diff --git a/gameplay/songs/milf/milf-chart.json b/gameplay/songs/milf/charts/milf-chart.json
similarity index 100%
rename from gameplay/songs/milf/milf-chart.json
rename to gameplay/songs/milf/charts/milf-chart.json
diff --git a/gameplay/songs/milf/milf-metadata.json b/gameplay/songs/milf/charts/milf-metadata.json
similarity index 100%
rename from gameplay/songs/milf/milf-metadata.json
rename to gameplay/songs/milf/charts/milf-metadata.json
diff --git a/gameplay/songs/monster/Inst.mp3 b/gameplay/songs/monster/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/monster/Inst.mp3
rename to gameplay/songs/monster/audio/Inst.mp3
diff --git a/gameplay/songs/monster/Inst.ogg b/gameplay/songs/monster/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/monster/Inst.ogg
rename to gameplay/songs/monster/audio/Inst.ogg
diff --git a/gameplay/songs/monster/Voices-bf.mp3 b/gameplay/songs/monster/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/monster/Voices-bf.mp3
rename to gameplay/songs/monster/audio/Voices-bf.mp3
diff --git a/gameplay/songs/monster/Voices-bf.ogg b/gameplay/songs/monster/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/monster/Voices-bf.ogg
rename to gameplay/songs/monster/audio/Voices-bf.ogg
diff --git a/gameplay/songs/monster/Voices-monster.mp3 b/gameplay/songs/monster/audio/Voices-monster.mp3
similarity index 100%
rename from gameplay/songs/monster/Voices-monster.mp3
rename to gameplay/songs/monster/audio/Voices-monster.mp3
diff --git a/gameplay/songs/monster/Voices-monster.ogg b/gameplay/songs/monster/audio/Voices-monster.ogg
similarity index 100%
rename from gameplay/songs/monster/Voices-monster.ogg
rename to gameplay/songs/monster/audio/Voices-monster.ogg
diff --git a/gameplay/songs/monster/monster-chart.json b/gameplay/songs/monster/charts/monster-chart.json
similarity index 100%
rename from gameplay/songs/monster/monster-chart.json
rename to gameplay/songs/monster/charts/monster-chart.json
diff --git a/gameplay/songs/monster/monster-metadata.json b/gameplay/songs/monster/charts/monster-metadata.json
similarity index 100%
rename from gameplay/songs/monster/monster-metadata.json
rename to gameplay/songs/monster/charts/monster-metadata.json
diff --git a/gameplay/songs/philly-nice/Inst.mp3 b/gameplay/songs/philly-nice/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Inst.mp3
rename to gameplay/songs/philly-nice/audio/Inst.mp3
diff --git a/gameplay/songs/philly-nice/Inst.ogg b/gameplay/songs/philly-nice/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Inst.ogg
rename to gameplay/songs/philly-nice/audio/Inst.ogg
diff --git a/gameplay/songs/philly-nice/Voices-bf.mp3 b/gameplay/songs/philly-nice/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-bf.mp3
rename to gameplay/songs/philly-nice/audio/Voices-bf.mp3
diff --git a/gameplay/songs/philly-nice/Voices-bf.ogg b/gameplay/songs/philly-nice/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-bf.ogg
rename to gameplay/songs/philly-nice/audio/Voices-bf.ogg
diff --git a/gameplay/songs/philly-nice/Voices-pico.mp3 b/gameplay/songs/philly-nice/audio/Voices-pico.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico.mp3
rename to gameplay/songs/philly-nice/audio/Voices-pico.mp3
diff --git a/gameplay/songs/philly-nice/Voices-pico.ogg b/gameplay/songs/philly-nice/audio/Voices-pico.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico.ogg
rename to gameplay/songs/philly-nice/audio/Voices-pico.ogg
diff --git a/gameplay/songs/philly-nice/Inst-erect.mp3 b/gameplay/songs/philly-nice/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Inst-erect.mp3
rename to gameplay/songs/philly-nice/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/philly-nice/Inst-erect.ogg b/gameplay/songs/philly-nice/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Inst-erect.ogg
rename to gameplay/songs/philly-nice/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/philly-nice/Voices-bf-erect.mp3 b/gameplay/songs/philly-nice/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-bf-erect.mp3
rename to gameplay/songs/philly-nice/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/philly-nice/Voices-bf-erect.ogg b/gameplay/songs/philly-nice/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-bf-erect.ogg
rename to gameplay/songs/philly-nice/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/philly-nice/Voices-pico-erect.mp3 b/gameplay/songs/philly-nice/audio/erect/Voices-pico-erect.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico-erect.mp3
rename to gameplay/songs/philly-nice/audio/erect/Voices-pico-erect.mp3
diff --git a/gameplay/songs/philly-nice/Voices-pico-erect.ogg b/gameplay/songs/philly-nice/audio/erect/Voices-pico-erect.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico-erect.ogg
rename to gameplay/songs/philly-nice/audio/erect/Voices-pico-erect.ogg
diff --git a/gameplay/songs/philly-nice/Inst-pico.mp3 b/gameplay/songs/philly-nice/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Inst-pico.mp3
rename to gameplay/songs/philly-nice/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/philly-nice/Inst-pico.ogg b/gameplay/songs/philly-nice/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Inst-pico.ogg
rename to gameplay/songs/philly-nice/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/philly-nice/Voices-pico-pico.mp3 b/gameplay/songs/philly-nice/audio/pico/Voices-pico-pico.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico-pico.mp3
rename to gameplay/songs/philly-nice/audio/pico/Voices-pico-pico.mp3
diff --git a/gameplay/songs/philly-nice/Voices-pico-pico.ogg b/gameplay/songs/philly-nice/audio/pico/Voices-pico-pico.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico-pico.ogg
rename to gameplay/songs/philly-nice/audio/pico/Voices-pico-pico.ogg
diff --git a/gameplay/songs/philly-nice/Voices-pico-playable-pico.mp3 b/gameplay/songs/philly-nice/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico-playable-pico.mp3
rename to gameplay/songs/philly-nice/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/philly-nice/Voices-pico-playable-pico.ogg b/gameplay/songs/philly-nice/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/philly-nice/Voices-pico-playable-pico.ogg
rename to gameplay/songs/philly-nice/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/philly-nice/philly-nice-chart-erect.json b/gameplay/songs/philly-nice/charts/erect/philly-nice-chart-erect.json
similarity index 100%
rename from gameplay/songs/philly-nice/philly-nice-chart-erect.json
rename to gameplay/songs/philly-nice/charts/erect/philly-nice-chart-erect.json
diff --git a/gameplay/songs/philly-nice/philly-nice-metadata-erect.json b/gameplay/songs/philly-nice/charts/erect/philly-nice-metadata-erect.json
similarity index 100%
rename from gameplay/songs/philly-nice/philly-nice-metadata-erect.json
rename to gameplay/songs/philly-nice/charts/erect/philly-nice-metadata-erect.json
diff --git a/gameplay/songs/philly-nice/philly-nice-chart.json b/gameplay/songs/philly-nice/charts/philly-nice-chart.json
similarity index 100%
rename from gameplay/songs/philly-nice/philly-nice-chart.json
rename to gameplay/songs/philly-nice/charts/philly-nice-chart.json
diff --git a/gameplay/songs/philly-nice/philly-nice-metadata.json b/gameplay/songs/philly-nice/charts/philly-nice-metadata.json
similarity index 100%
rename from gameplay/songs/philly-nice/philly-nice-metadata.json
rename to gameplay/songs/philly-nice/charts/philly-nice-metadata.json
diff --git a/gameplay/songs/philly-nice/philly-nice-chart-pico.json b/gameplay/songs/philly-nice/charts/pico/philly-nice-chart-pico.json
similarity index 100%
rename from gameplay/songs/philly-nice/philly-nice-chart-pico.json
rename to gameplay/songs/philly-nice/charts/pico/philly-nice-chart-pico.json
diff --git a/gameplay/songs/philly-nice/philly-nice-metadata-pico.json b/gameplay/songs/philly-nice/charts/pico/philly-nice-metadata-pico.json
similarity index 100%
rename from gameplay/songs/philly-nice/philly-nice-metadata-pico.json
rename to gameplay/songs/philly-nice/charts/pico/philly-nice-metadata-pico.json
diff --git a/gameplay/songs/pico/Inst.mp3 b/gameplay/songs/pico/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/pico/Inst.mp3
rename to gameplay/songs/pico/audio/Inst.mp3
diff --git a/gameplay/songs/pico/Inst.ogg b/gameplay/songs/pico/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/pico/Inst.ogg
rename to gameplay/songs/pico/audio/Inst.ogg
diff --git a/gameplay/songs/pico/Voices-bf.mp3 b/gameplay/songs/pico/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/pico/Voices-bf.mp3
rename to gameplay/songs/pico/audio/Voices-bf.mp3
diff --git a/gameplay/songs/pico/Voices-bf.ogg b/gameplay/songs/pico/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/pico/Voices-bf.ogg
rename to gameplay/songs/pico/audio/Voices-bf.ogg
diff --git a/gameplay/songs/pico/Voices-pico.mp3 b/gameplay/songs/pico/audio/Voices-pico.mp3
similarity index 100%
rename from gameplay/songs/pico/Voices-pico.mp3
rename to gameplay/songs/pico/audio/Voices-pico.mp3
diff --git a/gameplay/songs/pico/Voices-pico.ogg b/gameplay/songs/pico/audio/Voices-pico.ogg
similarity index 100%
rename from gameplay/songs/pico/Voices-pico.ogg
rename to gameplay/songs/pico/audio/Voices-pico.ogg
diff --git a/gameplay/songs/pico/Inst-erect.mp3 b/gameplay/songs/pico/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/pico/Inst-erect.mp3
rename to gameplay/songs/pico/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/pico/Inst-erect.ogg b/gameplay/songs/pico/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/pico/Inst-erect.ogg
rename to gameplay/songs/pico/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/pico/Voices-bf-erect.mp3 b/gameplay/songs/pico/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/pico/Voices-bf-erect.mp3
rename to gameplay/songs/pico/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/pico/Voices-bf-erect.ogg b/gameplay/songs/pico/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/pico/Voices-bf-erect.ogg
rename to gameplay/songs/pico/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/pico/Voices-pico-erect.mp3 b/gameplay/songs/pico/audio/erect/Voices-pico-erect.mp3
similarity index 100%
rename from gameplay/songs/pico/Voices-pico-erect.mp3
rename to gameplay/songs/pico/audio/erect/Voices-pico-erect.mp3
diff --git a/gameplay/songs/pico/Voices-pico-erect.ogg b/gameplay/songs/pico/audio/erect/Voices-pico-erect.ogg
similarity index 100%
rename from gameplay/songs/pico/Voices-pico-erect.ogg
rename to gameplay/songs/pico/audio/erect/Voices-pico-erect.ogg
diff --git a/gameplay/songs/pico/Inst-pico.mp3 b/gameplay/songs/pico/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/pico/Inst-pico.mp3
rename to gameplay/songs/pico/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/pico/Inst-pico.ogg b/gameplay/songs/pico/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/pico/Inst-pico.ogg
rename to gameplay/songs/pico/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/pico/Voices-pico-pico.mp3 b/gameplay/songs/pico/audio/pico/Voices-pico-pico.mp3
similarity index 100%
rename from gameplay/songs/pico/Voices-pico-pico.mp3
rename to gameplay/songs/pico/audio/pico/Voices-pico-pico.mp3
diff --git a/gameplay/songs/pico/Voices-pico-pico.ogg b/gameplay/songs/pico/audio/pico/Voices-pico-pico.ogg
similarity index 100%
rename from gameplay/songs/pico/Voices-pico-pico.ogg
rename to gameplay/songs/pico/audio/pico/Voices-pico-pico.ogg
diff --git a/gameplay/songs/pico/Voices-pico-playable-pico.mp3 b/gameplay/songs/pico/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/pico/Voices-pico-playable-pico.mp3
rename to gameplay/songs/pico/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/pico/Voices-pico-playable-pico.ogg b/gameplay/songs/pico/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/pico/Voices-pico-playable-pico.ogg
rename to gameplay/songs/pico/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/pico/pico-chart-erect.json b/gameplay/songs/pico/charts/erect/pico-chart-erect.json
similarity index 100%
rename from gameplay/songs/pico/pico-chart-erect.json
rename to gameplay/songs/pico/charts/erect/pico-chart-erect.json
diff --git a/gameplay/songs/pico/pico-metadata-erect.json b/gameplay/songs/pico/charts/erect/pico-metadata-erect.json
similarity index 100%
rename from gameplay/songs/pico/pico-metadata-erect.json
rename to gameplay/songs/pico/charts/erect/pico-metadata-erect.json
diff --git a/gameplay/songs/pico/pico-chart.json b/gameplay/songs/pico/charts/pico-chart.json
similarity index 100%
rename from gameplay/songs/pico/pico-chart.json
rename to gameplay/songs/pico/charts/pico-chart.json
diff --git a/gameplay/songs/pico/pico-metadata.json b/gameplay/songs/pico/charts/pico-metadata.json
similarity index 100%
rename from gameplay/songs/pico/pico-metadata.json
rename to gameplay/songs/pico/charts/pico-metadata.json
diff --git a/gameplay/songs/pico/pico-chart-pico.json b/gameplay/songs/pico/charts/pico/pico-chart-pico.json
similarity index 100%
rename from gameplay/songs/pico/pico-chart-pico.json
rename to gameplay/songs/pico/charts/pico/pico-chart-pico.json
diff --git a/gameplay/songs/pico/pico-metadata-pico.json b/gameplay/songs/pico/charts/pico/pico-metadata-pico.json
similarity index 100%
rename from gameplay/songs/pico/pico-metadata-pico.json
rename to gameplay/songs/pico/charts/pico/pico-metadata-pico.json
diff --git a/gameplay/songs/roses/Inst.mp3 b/gameplay/songs/roses/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/roses/Inst.mp3
rename to gameplay/songs/roses/audio/Inst.mp3
diff --git a/gameplay/songs/roses/Inst.ogg b/gameplay/songs/roses/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/roses/Inst.ogg
rename to gameplay/songs/roses/audio/Inst.ogg
diff --git a/gameplay/songs/roses/Voices-bf.mp3 b/gameplay/songs/roses/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/roses/Voices-bf.mp3
rename to gameplay/songs/roses/audio/Voices-bf.mp3
diff --git a/gameplay/songs/roses/Voices-bf.ogg b/gameplay/songs/roses/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/roses/Voices-bf.ogg
rename to gameplay/songs/roses/audio/Voices-bf.ogg
diff --git a/gameplay/songs/roses/Voices-senpai.mp3 b/gameplay/songs/roses/audio/Voices-senpai.mp3
similarity index 100%
rename from gameplay/songs/roses/Voices-senpai.mp3
rename to gameplay/songs/roses/audio/Voices-senpai.mp3
diff --git a/gameplay/songs/roses/Voices-senpai.ogg b/gameplay/songs/roses/audio/Voices-senpai.ogg
similarity index 100%
rename from gameplay/songs/roses/Voices-senpai.ogg
rename to gameplay/songs/roses/audio/Voices-senpai.ogg
diff --git a/gameplay/songs/roses/Inst-erect.mp3 b/gameplay/songs/roses/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/roses/Inst-erect.mp3
rename to gameplay/songs/roses/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/roses/Inst-erect.ogg b/gameplay/songs/roses/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/roses/Inst-erect.ogg
rename to gameplay/songs/roses/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/roses/Voices-bf-pixel-erect.mp3 b/gameplay/songs/roses/audio/erect/Voices-bf-pixel-erect.mp3
similarity index 100%
rename from gameplay/songs/roses/Voices-bf-pixel-erect.mp3
rename to gameplay/songs/roses/audio/erect/Voices-bf-pixel-erect.mp3
diff --git a/gameplay/songs/roses/Voices-bf-pixel-erect.ogg b/gameplay/songs/roses/audio/erect/Voices-bf-pixel-erect.ogg
similarity index 100%
rename from gameplay/songs/roses/Voices-bf-pixel-erect.ogg
rename to gameplay/songs/roses/audio/erect/Voices-bf-pixel-erect.ogg
diff --git a/gameplay/songs/roses/Voices-senpai-angry-erect.mp3 b/gameplay/songs/roses/audio/erect/Voices-senpai-angry-erect.mp3
similarity index 100%
rename from gameplay/songs/roses/Voices-senpai-angry-erect.mp3
rename to gameplay/songs/roses/audio/erect/Voices-senpai-angry-erect.mp3
diff --git a/gameplay/songs/roses/Voices-senpai-angry-erect.ogg b/gameplay/songs/roses/audio/erect/Voices-senpai-angry-erect.ogg
similarity index 100%
rename from gameplay/songs/roses/Voices-senpai-angry-erect.ogg
rename to gameplay/songs/roses/audio/erect/Voices-senpai-angry-erect.ogg
diff --git a/gameplay/songs/roses/roses-chart-erect.json b/gameplay/songs/roses/charts/erect/roses-chart-erect.json
similarity index 100%
rename from gameplay/songs/roses/roses-chart-erect.json
rename to gameplay/songs/roses/charts/erect/roses-chart-erect.json
diff --git a/gameplay/songs/roses/roses-metadata-erect.json b/gameplay/songs/roses/charts/erect/roses-metadata-erect.json
similarity index 100%
rename from gameplay/songs/roses/roses-metadata-erect.json
rename to gameplay/songs/roses/charts/erect/roses-metadata-erect.json
diff --git a/gameplay/songs/roses/roses-chart.json b/gameplay/songs/roses/charts/roses-chart.json
similarity index 100%
rename from gameplay/songs/roses/roses-chart.json
rename to gameplay/songs/roses/charts/roses-chart.json
diff --git a/gameplay/songs/roses/roses-metadata.json b/gameplay/songs/roses/charts/roses-metadata.json
similarity index 100%
rename from gameplay/songs/roses/roses-metadata.json
rename to gameplay/songs/roses/charts/roses-metadata.json
diff --git a/gameplay/songs/satin-panties/Inst.mp3 b/gameplay/songs/satin-panties/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/satin-panties/Inst.mp3
rename to gameplay/songs/satin-panties/audio/Inst.mp3
diff --git a/gameplay/songs/satin-panties/Inst.ogg b/gameplay/songs/satin-panties/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/satin-panties/Inst.ogg
rename to gameplay/songs/satin-panties/audio/Inst.ogg
diff --git a/gameplay/songs/satin-panties/Voices-bf.mp3 b/gameplay/songs/satin-panties/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-bf.mp3
rename to gameplay/songs/satin-panties/audio/Voices-bf.mp3
diff --git a/gameplay/songs/satin-panties/Voices-bf.ogg b/gameplay/songs/satin-panties/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-bf.ogg
rename to gameplay/songs/satin-panties/audio/Voices-bf.ogg
diff --git a/gameplay/songs/satin-panties/Voices-mom.mp3 b/gameplay/songs/satin-panties/audio/Voices-mom.mp3
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-mom.mp3
rename to gameplay/songs/satin-panties/audio/Voices-mom.mp3
diff --git a/gameplay/songs/satin-panties/Voices-mom.ogg b/gameplay/songs/satin-panties/audio/Voices-mom.ogg
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-mom.ogg
rename to gameplay/songs/satin-panties/audio/Voices-mom.ogg
diff --git a/gameplay/songs/satin-panties/Inst-erect.mp3 b/gameplay/songs/satin-panties/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/satin-panties/Inst-erect.mp3
rename to gameplay/songs/satin-panties/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/satin-panties/Inst-erect.ogg b/gameplay/songs/satin-panties/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/satin-panties/Inst-erect.ogg
rename to gameplay/songs/satin-panties/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/satin-panties/Voices-bf-car-erect.mp3 b/gameplay/songs/satin-panties/audio/erect/Voices-bf-car-erect.mp3
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-bf-car-erect.mp3
rename to gameplay/songs/satin-panties/audio/erect/Voices-bf-car-erect.mp3
diff --git a/gameplay/songs/satin-panties/Voices-bf-car-erect.ogg b/gameplay/songs/satin-panties/audio/erect/Voices-bf-car-erect.ogg
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-bf-car-erect.ogg
rename to gameplay/songs/satin-panties/audio/erect/Voices-bf-car-erect.ogg
diff --git a/gameplay/songs/satin-panties/Voices-mom-car-erect.mp3 b/gameplay/songs/satin-panties/audio/erect/Voices-mom-car-erect.mp3
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-mom-car-erect.mp3
rename to gameplay/songs/satin-panties/audio/erect/Voices-mom-car-erect.mp3
diff --git a/gameplay/songs/satin-panties/Voices-mom-car-erect.ogg b/gameplay/songs/satin-panties/audio/erect/Voices-mom-car-erect.ogg
similarity index 100%
rename from gameplay/songs/satin-panties/Voices-mom-car-erect.ogg
rename to gameplay/songs/satin-panties/audio/erect/Voices-mom-car-erect.ogg
diff --git a/gameplay/songs/satin-panties/satin-panties-chart-erect.json b/gameplay/songs/satin-panties/charts/erect/satin-panties-chart-erect.json
similarity index 100%
rename from gameplay/songs/satin-panties/satin-panties-chart-erect.json
rename to gameplay/songs/satin-panties/charts/erect/satin-panties-chart-erect.json
diff --git a/gameplay/songs/satin-panties/satin-panties-metadata-erect.json b/gameplay/songs/satin-panties/charts/erect/satin-panties-metadata-erect.json
similarity index 100%
rename from gameplay/songs/satin-panties/satin-panties-metadata-erect.json
rename to gameplay/songs/satin-panties/charts/erect/satin-panties-metadata-erect.json
diff --git a/gameplay/songs/satin-panties/satin-panties-chart.json b/gameplay/songs/satin-panties/charts/satin-panties-chart.json
similarity index 100%
rename from gameplay/songs/satin-panties/satin-panties-chart.json
rename to gameplay/songs/satin-panties/charts/satin-panties-chart.json
diff --git a/gameplay/songs/satin-panties/satin-panties-metadata.json b/gameplay/songs/satin-panties/charts/satin-panties-metadata.json
similarity index 100%
rename from gameplay/songs/satin-panties/satin-panties-metadata.json
rename to gameplay/songs/satin-panties/charts/satin-panties-metadata.json
diff --git a/gameplay/songs/senpai/Inst.mp3 b/gameplay/songs/senpai/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/senpai/Inst.mp3
rename to gameplay/songs/senpai/audio/Inst.mp3
diff --git a/gameplay/songs/senpai/Inst.ogg b/gameplay/songs/senpai/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/senpai/Inst.ogg
rename to gameplay/songs/senpai/audio/Inst.ogg
diff --git a/gameplay/songs/senpai/Voices-bf.mp3 b/gameplay/songs/senpai/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/senpai/Voices-bf.mp3
rename to gameplay/songs/senpai/audio/Voices-bf.mp3
diff --git a/gameplay/songs/senpai/Voices-bf.ogg b/gameplay/songs/senpai/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/senpai/Voices-bf.ogg
rename to gameplay/songs/senpai/audio/Voices-bf.ogg
diff --git a/gameplay/songs/senpai/Voices-senpai.mp3 b/gameplay/songs/senpai/audio/Voices-senpai.mp3
similarity index 100%
rename from gameplay/songs/senpai/Voices-senpai.mp3
rename to gameplay/songs/senpai/audio/Voices-senpai.mp3
diff --git a/gameplay/songs/senpai/Voices-senpai.ogg b/gameplay/songs/senpai/audio/Voices-senpai.ogg
similarity index 100%
rename from gameplay/songs/senpai/Voices-senpai.ogg
rename to gameplay/songs/senpai/audio/Voices-senpai.ogg
diff --git a/gameplay/songs/senpai/Inst-erect.mp3 b/gameplay/songs/senpai/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/senpai/Inst-erect.mp3
rename to gameplay/songs/senpai/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/senpai/Inst-erect.ogg b/gameplay/songs/senpai/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/senpai/Inst-erect.ogg
rename to gameplay/songs/senpai/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/senpai/Voices-bf-pixel-erect.mp3 b/gameplay/songs/senpai/audio/erect/Voices-bf-pixel-erect.mp3
similarity index 100%
rename from gameplay/songs/senpai/Voices-bf-pixel-erect.mp3
rename to gameplay/songs/senpai/audio/erect/Voices-bf-pixel-erect.mp3
diff --git a/gameplay/songs/senpai/Voices-bf-pixel-erect.ogg b/gameplay/songs/senpai/audio/erect/Voices-bf-pixel-erect.ogg
similarity index 100%
rename from gameplay/songs/senpai/Voices-bf-pixel-erect.ogg
rename to gameplay/songs/senpai/audio/erect/Voices-bf-pixel-erect.ogg
diff --git a/gameplay/songs/senpai/Voices-senpai-erect.mp3 b/gameplay/songs/senpai/audio/erect/Voices-senpai-erect.mp3
similarity index 100%
rename from gameplay/songs/senpai/Voices-senpai-erect.mp3
rename to gameplay/songs/senpai/audio/erect/Voices-senpai-erect.mp3
diff --git a/gameplay/songs/senpai/Voices-senpai-erect.ogg b/gameplay/songs/senpai/audio/erect/Voices-senpai-erect.ogg
similarity index 100%
rename from gameplay/songs/senpai/Voices-senpai-erect.ogg
rename to gameplay/songs/senpai/audio/erect/Voices-senpai-erect.ogg
diff --git a/gameplay/songs/senpai/senpai-chart-erect.json b/gameplay/songs/senpai/charts/erect/senpai-chart-erect.json
similarity index 100%
rename from gameplay/songs/senpai/senpai-chart-erect.json
rename to gameplay/songs/senpai/charts/erect/senpai-chart-erect.json
diff --git a/gameplay/songs/senpai/senpai-metadata-erect.json b/gameplay/songs/senpai/charts/erect/senpai-metadata-erect.json
similarity index 100%
rename from gameplay/songs/senpai/senpai-metadata-erect.json
rename to gameplay/songs/senpai/charts/erect/senpai-metadata-erect.json
diff --git a/gameplay/songs/senpai/senpai-chart.json b/gameplay/songs/senpai/charts/senpai-chart.json
similarity index 100%
rename from gameplay/songs/senpai/senpai-chart.json
rename to gameplay/songs/senpai/charts/senpai-chart.json
diff --git a/gameplay/songs/senpai/senpai-metadata.json b/gameplay/songs/senpai/charts/senpai-metadata.json
similarity index 100%
rename from gameplay/songs/senpai/senpai-metadata.json
rename to gameplay/songs/senpai/charts/senpai-metadata.json
diff --git a/gameplay/songs/south/Voices-pico-pico.mp3 b/gameplay/songs/south/Voices-pico-pico.mp3
deleted file mode 100644
index d0533f3ca..000000000
Binary files a/gameplay/songs/south/Voices-pico-pico.mp3 and /dev/null differ
diff --git a/gameplay/songs/south/Voices-pico-pico.ogg b/gameplay/songs/south/Voices-pico-pico.ogg
deleted file mode 100644
index 8ddba9579..000000000
Binary files a/gameplay/songs/south/Voices-pico-pico.ogg and /dev/null differ
diff --git a/gameplay/songs/south/Inst.mp3 b/gameplay/songs/south/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/south/Inst.mp3
rename to gameplay/songs/south/audio/Inst.mp3
diff --git a/gameplay/songs/south/Inst.ogg b/gameplay/songs/south/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/south/Inst.ogg
rename to gameplay/songs/south/audio/Inst.ogg
diff --git a/gameplay/songs/south/Voices-bf.mp3 b/gameplay/songs/south/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/south/Voices-bf.mp3
rename to gameplay/songs/south/audio/Voices-bf.mp3
diff --git a/gameplay/songs/south/Voices-bf.ogg b/gameplay/songs/south/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/south/Voices-bf.ogg
rename to gameplay/songs/south/audio/Voices-bf.ogg
diff --git a/gameplay/songs/south/Voices-spooky.mp3 b/gameplay/songs/south/audio/Voices-spooky.mp3
similarity index 100%
rename from gameplay/songs/south/Voices-spooky.mp3
rename to gameplay/songs/south/audio/Voices-spooky.mp3
diff --git a/gameplay/songs/south/Voices-spooky.ogg b/gameplay/songs/south/audio/Voices-spooky.ogg
similarity index 100%
rename from gameplay/songs/south/Voices-spooky.ogg
rename to gameplay/songs/south/audio/Voices-spooky.ogg
diff --git a/gameplay/songs/south/Inst-erect.mp3 b/gameplay/songs/south/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/south/Inst-erect.mp3
rename to gameplay/songs/south/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/south/Inst-erect.ogg b/gameplay/songs/south/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/south/Inst-erect.ogg
rename to gameplay/songs/south/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/south/Voices-bf-erect.mp3 b/gameplay/songs/south/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/south/Voices-bf-erect.mp3
rename to gameplay/songs/south/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/south/Voices-bf-erect.ogg b/gameplay/songs/south/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/south/Voices-bf-erect.ogg
rename to gameplay/songs/south/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/south/Voices-spooky-erect.mp3 b/gameplay/songs/south/audio/erect/Voices-spooky-erect.mp3
similarity index 100%
rename from gameplay/songs/south/Voices-spooky-erect.mp3
rename to gameplay/songs/south/audio/erect/Voices-spooky-erect.mp3
diff --git a/gameplay/songs/south/Voices-spooky-erect.ogg b/gameplay/songs/south/audio/erect/Voices-spooky-erect.ogg
similarity index 100%
rename from gameplay/songs/south/Voices-spooky-erect.ogg
rename to gameplay/songs/south/audio/erect/Voices-spooky-erect.ogg
diff --git a/gameplay/songs/south/Inst-pico.mp3 b/gameplay/songs/south/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/south/Inst-pico.mp3
rename to gameplay/songs/south/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/south/Inst-pico.ogg b/gameplay/songs/south/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/south/Inst-pico.ogg
rename to gameplay/songs/south/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/south/Voices-pico-playable-pico.mp3 b/gameplay/songs/south/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/south/Voices-pico-playable-pico.mp3
rename to gameplay/songs/south/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/south/Voices-pico-playable-pico.ogg b/gameplay/songs/south/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/south/Voices-pico-playable-pico.ogg
rename to gameplay/songs/south/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/south/Voices-spooky-pico.mp3 b/gameplay/songs/south/audio/pico/Voices-spooky-pico.mp3
similarity index 100%
rename from gameplay/songs/south/Voices-spooky-pico.mp3
rename to gameplay/songs/south/audio/pico/Voices-spooky-pico.mp3
diff --git a/gameplay/songs/south/Voices-spooky-pico.ogg b/gameplay/songs/south/audio/pico/Voices-spooky-pico.ogg
similarity index 100%
rename from gameplay/songs/south/Voices-spooky-pico.ogg
rename to gameplay/songs/south/audio/pico/Voices-spooky-pico.ogg
diff --git a/gameplay/songs/south/south-chart-erect.json b/gameplay/songs/south/charts/erect/south-chart-erect.json
similarity index 100%
rename from gameplay/songs/south/south-chart-erect.json
rename to gameplay/songs/south/charts/erect/south-chart-erect.json
diff --git a/gameplay/songs/south/south-metadata-erect.json b/gameplay/songs/south/charts/erect/south-metadata-erect.json
similarity index 100%
rename from gameplay/songs/south/south-metadata-erect.json
rename to gameplay/songs/south/charts/erect/south-metadata-erect.json
diff --git a/gameplay/songs/south/south-chart-pico.json b/gameplay/songs/south/charts/pico/south-chart-pico.json
similarity index 100%
rename from gameplay/songs/south/south-chart-pico.json
rename to gameplay/songs/south/charts/pico/south-chart-pico.json
diff --git a/gameplay/songs/south/south-metadata-pico.json b/gameplay/songs/south/charts/pico/south-metadata-pico.json
similarity index 100%
rename from gameplay/songs/south/south-metadata-pico.json
rename to gameplay/songs/south/charts/pico/south-metadata-pico.json
diff --git a/gameplay/songs/south/south-chart.json b/gameplay/songs/south/charts/south-chart.json
similarity index 100%
rename from gameplay/songs/south/south-chart.json
rename to gameplay/songs/south/charts/south-chart.json
diff --git a/gameplay/songs/south/south-metadata.json b/gameplay/songs/south/charts/south-metadata.json
similarity index 100%
rename from gameplay/songs/south/south-metadata.json
rename to gameplay/songs/south/charts/south-metadata.json
diff --git a/gameplay/songs/spookeez/Inst.mp3 b/gameplay/songs/spookeez/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Inst.mp3
rename to gameplay/songs/spookeez/audio/Inst.mp3
diff --git a/gameplay/songs/spookeez/Inst.ogg b/gameplay/songs/spookeez/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Inst.ogg
rename to gameplay/songs/spookeez/audio/Inst.ogg
diff --git a/gameplay/songs/spookeez/Voices-bf.mp3 b/gameplay/songs/spookeez/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Voices-bf.mp3
rename to gameplay/songs/spookeez/audio/Voices-bf.mp3
diff --git a/gameplay/songs/spookeez/Voices-bf.ogg b/gameplay/songs/spookeez/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Voices-bf.ogg
rename to gameplay/songs/spookeez/audio/Voices-bf.ogg
diff --git a/gameplay/songs/spookeez/Voices-spooky.mp3 b/gameplay/songs/spookeez/audio/Voices-spooky.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Voices-spooky.mp3
rename to gameplay/songs/spookeez/audio/Voices-spooky.mp3
diff --git a/gameplay/songs/spookeez/Voices-spooky.ogg b/gameplay/songs/spookeez/audio/Voices-spooky.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Voices-spooky.ogg
rename to gameplay/songs/spookeez/audio/Voices-spooky.ogg
diff --git a/gameplay/songs/spookeez/Inst-erect.mp3 b/gameplay/songs/spookeez/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Inst-erect.mp3
rename to gameplay/songs/spookeez/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/spookeez/Inst-erect.ogg b/gameplay/songs/spookeez/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Inst-erect.ogg
rename to gameplay/songs/spookeez/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/spookeez/Voices-bf-dark-erect.mp3 b/gameplay/songs/spookeez/audio/erect/Voices-bf-dark-erect.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Voices-bf-dark-erect.mp3
rename to gameplay/songs/spookeez/audio/erect/Voices-bf-dark-erect.mp3
diff --git a/gameplay/songs/spookeez/Voices-bf-dark-erect.ogg b/gameplay/songs/spookeez/audio/erect/Voices-bf-dark-erect.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Voices-bf-dark-erect.ogg
rename to gameplay/songs/spookeez/audio/erect/Voices-bf-dark-erect.ogg
diff --git a/gameplay/songs/spookeez/Voices-spooky-dark-erect.mp3 b/gameplay/songs/spookeez/audio/erect/Voices-spooky-dark-erect.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Voices-spooky-dark-erect.mp3
rename to gameplay/songs/spookeez/audio/erect/Voices-spooky-dark-erect.mp3
diff --git a/gameplay/songs/spookeez/Voices-spooky-dark-erect.ogg b/gameplay/songs/spookeez/audio/erect/Voices-spooky-dark-erect.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Voices-spooky-dark-erect.ogg
rename to gameplay/songs/spookeez/audio/erect/Voices-spooky-dark-erect.ogg
diff --git a/gameplay/songs/spookeez/Inst-pico.mp3 b/gameplay/songs/spookeez/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Inst-pico.mp3
rename to gameplay/songs/spookeez/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/spookeez/Inst-pico.ogg b/gameplay/songs/spookeez/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Inst-pico.ogg
rename to gameplay/songs/spookeez/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/spookeez/Voices-pico-pico.mp3 b/gameplay/songs/spookeez/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Voices-pico-pico.mp3
rename to gameplay/songs/spookeez/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/spookeez/Voices-pico-pico.ogg b/gameplay/songs/spookeez/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Voices-pico-pico.ogg
rename to gameplay/songs/spookeez/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/spookeez/Voices-spooky-pico.mp3 b/gameplay/songs/spookeez/audio/pico/Voices-spooky-pico.mp3
similarity index 100%
rename from gameplay/songs/spookeez/Voices-spooky-pico.mp3
rename to gameplay/songs/spookeez/audio/pico/Voices-spooky-pico.mp3
diff --git a/gameplay/songs/spookeez/Voices-spooky-pico.ogg b/gameplay/songs/spookeez/audio/pico/Voices-spooky-pico.ogg
similarity index 100%
rename from gameplay/songs/spookeez/Voices-spooky-pico.ogg
rename to gameplay/songs/spookeez/audio/pico/Voices-spooky-pico.ogg
diff --git a/gameplay/songs/spookeez/spookeez-chart-erect.json b/gameplay/songs/spookeez/charts/erect/spookeez-chart-erect.json
similarity index 100%
rename from gameplay/songs/spookeez/spookeez-chart-erect.json
rename to gameplay/songs/spookeez/charts/erect/spookeez-chart-erect.json
diff --git a/gameplay/songs/spookeez/spookeez-metadata-erect.json b/gameplay/songs/spookeez/charts/erect/spookeez-metadata-erect.json
similarity index 100%
rename from gameplay/songs/spookeez/spookeez-metadata-erect.json
rename to gameplay/songs/spookeez/charts/erect/spookeez-metadata-erect.json
diff --git a/gameplay/songs/spookeez/spookeez-chart-pico.json b/gameplay/songs/spookeez/charts/pico/spookeez-chart-pico.json
similarity index 100%
rename from gameplay/songs/spookeez/spookeez-chart-pico.json
rename to gameplay/songs/spookeez/charts/pico/spookeez-chart-pico.json
diff --git a/gameplay/songs/spookeez/spookeez-metadata-pico.json b/gameplay/songs/spookeez/charts/pico/spookeez-metadata-pico.json
similarity index 100%
rename from gameplay/songs/spookeez/spookeez-metadata-pico.json
rename to gameplay/songs/spookeez/charts/pico/spookeez-metadata-pico.json
diff --git a/gameplay/songs/spookeez/spookeez-chart.json b/gameplay/songs/spookeez/charts/spookeez-chart.json
similarity index 100%
rename from gameplay/songs/spookeez/spookeez-chart.json
rename to gameplay/songs/spookeez/charts/spookeez-chart.json
diff --git a/gameplay/songs/spookeez/spookeez-metadata.json b/gameplay/songs/spookeez/charts/spookeez-metadata.json
similarity index 100%
rename from gameplay/songs/spookeez/spookeez-metadata.json
rename to gameplay/songs/spookeez/charts/spookeez-metadata.json
diff --git a/gameplay/songs/stress/Inst.mp3 b/gameplay/songs/stress/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/stress/Inst.mp3
rename to gameplay/songs/stress/audio/Inst.mp3
diff --git a/gameplay/songs/stress/Inst.ogg b/gameplay/songs/stress/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/stress/Inst.ogg
rename to gameplay/songs/stress/audio/Inst.ogg
diff --git a/gameplay/songs/stress/Voices-bf.mp3 b/gameplay/songs/stress/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/stress/Voices-bf.mp3
rename to gameplay/songs/stress/audio/Voices-bf.mp3
diff --git a/gameplay/songs/stress/Voices-bf.ogg b/gameplay/songs/stress/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/stress/Voices-bf.ogg
rename to gameplay/songs/stress/audio/Voices-bf.ogg
diff --git a/gameplay/songs/stress/Voices-tankman.mp3 b/gameplay/songs/stress/audio/Voices-tankman.mp3
similarity index 100%
rename from gameplay/songs/stress/Voices-tankman.mp3
rename to gameplay/songs/stress/audio/Voices-tankman.mp3
diff --git a/gameplay/songs/stress/Voices-tankman.ogg b/gameplay/songs/stress/audio/Voices-tankman.ogg
similarity index 100%
rename from gameplay/songs/stress/Voices-tankman.ogg
rename to gameplay/songs/stress/audio/Voices-tankman.ogg
diff --git a/gameplay/songs/stress/stress-chart.json b/gameplay/songs/stress/charts/stress-chart.json
similarity index 100%
rename from gameplay/songs/stress/stress-chart.json
rename to gameplay/songs/stress/charts/stress-chart.json
diff --git a/gameplay/songs/stress/stress-metadata.json b/gameplay/songs/stress/charts/stress-metadata.json
similarity index 100%
rename from gameplay/songs/stress/stress-metadata.json
rename to gameplay/songs/stress/charts/stress-metadata.json
diff --git a/gameplay/songs/thorns/Inst.mp3 b/gameplay/songs/thorns/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/thorns/Inst.mp3
rename to gameplay/songs/thorns/audio/Inst.mp3
diff --git a/gameplay/songs/thorns/Inst.ogg b/gameplay/songs/thorns/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/thorns/Inst.ogg
rename to gameplay/songs/thorns/audio/Inst.ogg
diff --git a/gameplay/songs/thorns/Voices-bf.mp3 b/gameplay/songs/thorns/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/thorns/Voices-bf.mp3
rename to gameplay/songs/thorns/audio/Voices-bf.mp3
diff --git a/gameplay/songs/thorns/Voices-bf.ogg b/gameplay/songs/thorns/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/thorns/Voices-bf.ogg
rename to gameplay/songs/thorns/audio/Voices-bf.ogg
diff --git a/gameplay/songs/thorns/Voices-spirit.mp3 b/gameplay/songs/thorns/audio/Voices-spirit.mp3
similarity index 100%
rename from gameplay/songs/thorns/Voices-spirit.mp3
rename to gameplay/songs/thorns/audio/Voices-spirit.mp3
diff --git a/gameplay/songs/thorns/Voices-spirit.ogg b/gameplay/songs/thorns/audio/Voices-spirit.ogg
similarity index 100%
rename from gameplay/songs/thorns/Voices-spirit.ogg
rename to gameplay/songs/thorns/audio/Voices-spirit.ogg
diff --git a/gameplay/songs/thorns/Inst-erect.mp3 b/gameplay/songs/thorns/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/thorns/Inst-erect.mp3
rename to gameplay/songs/thorns/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/thorns/Inst-erect.ogg b/gameplay/songs/thorns/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/thorns/Inst-erect.ogg
rename to gameplay/songs/thorns/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/thorns/Voices-bf-pixel-erect.mp3 b/gameplay/songs/thorns/audio/erect/Voices-bf-pixel-erect.mp3
similarity index 100%
rename from gameplay/songs/thorns/Voices-bf-pixel-erect.mp3
rename to gameplay/songs/thorns/audio/erect/Voices-bf-pixel-erect.mp3
diff --git a/gameplay/songs/thorns/Voices-bf-pixel-erect.ogg b/gameplay/songs/thorns/audio/erect/Voices-bf-pixel-erect.ogg
similarity index 100%
rename from gameplay/songs/thorns/Voices-bf-pixel-erect.ogg
rename to gameplay/songs/thorns/audio/erect/Voices-bf-pixel-erect.ogg
diff --git a/gameplay/songs/thorns/Voices-spirit-erect.mp3 b/gameplay/songs/thorns/audio/erect/Voices-spirit-erect.mp3
similarity index 100%
rename from gameplay/songs/thorns/Voices-spirit-erect.mp3
rename to gameplay/songs/thorns/audio/erect/Voices-spirit-erect.mp3
diff --git a/gameplay/songs/thorns/Voices-spirit-erect.ogg b/gameplay/songs/thorns/audio/erect/Voices-spirit-erect.ogg
similarity index 100%
rename from gameplay/songs/thorns/Voices-spirit-erect.ogg
rename to gameplay/songs/thorns/audio/erect/Voices-spirit-erect.ogg
diff --git a/gameplay/songs/thorns/thorns-chart-erect.json b/gameplay/songs/thorns/charts/erect/thorns-chart-erect.json
similarity index 100%
rename from gameplay/songs/thorns/thorns-chart-erect.json
rename to gameplay/songs/thorns/charts/erect/thorns-chart-erect.json
diff --git a/gameplay/songs/thorns/thorns-metadata-erect.json b/gameplay/songs/thorns/charts/erect/thorns-metadata-erect.json
similarity index 100%
rename from gameplay/songs/thorns/thorns-metadata-erect.json
rename to gameplay/songs/thorns/charts/erect/thorns-metadata-erect.json
diff --git a/gameplay/songs/thorns/thorns-chart.json b/gameplay/songs/thorns/charts/thorns-chart.json
similarity index 100%
rename from gameplay/songs/thorns/thorns-chart.json
rename to gameplay/songs/thorns/charts/thorns-chart.json
diff --git a/gameplay/songs/thorns/thorns-metadata.json b/gameplay/songs/thorns/charts/thorns-metadata.json
similarity index 100%
rename from gameplay/songs/thorns/thorns-metadata.json
rename to gameplay/songs/thorns/charts/thorns-metadata.json
diff --git a/gameplay/songs/tutorial/Inst.mp3 b/gameplay/songs/tutorial/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/tutorial/Inst.mp3
rename to gameplay/songs/tutorial/audio/Inst.mp3
diff --git a/gameplay/songs/tutorial/Inst.ogg b/gameplay/songs/tutorial/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/tutorial/Inst.ogg
rename to gameplay/songs/tutorial/audio/Inst.ogg
diff --git a/gameplay/songs/tutorial/Voices-bf.mp3 b/gameplay/songs/tutorial/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/tutorial/Voices-bf.mp3
rename to gameplay/songs/tutorial/audio/Voices-bf.mp3
diff --git a/gameplay/songs/tutorial/Voices-bf.ogg b/gameplay/songs/tutorial/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/tutorial/Voices-bf.ogg
rename to gameplay/songs/tutorial/audio/Voices-bf.ogg
diff --git a/gameplay/songs/tutorial/Voices-gf.mp3 b/gameplay/songs/tutorial/audio/Voices-gf.mp3
similarity index 100%
rename from gameplay/songs/tutorial/Voices-gf.mp3
rename to gameplay/songs/tutorial/audio/Voices-gf.mp3
diff --git a/gameplay/songs/tutorial/Voices-gf.ogg b/gameplay/songs/tutorial/audio/Voices-gf.ogg
similarity index 100%
rename from gameplay/songs/tutorial/Voices-gf.ogg
rename to gameplay/songs/tutorial/audio/Voices-gf.ogg
diff --git a/gameplay/songs/tutorial/tutorial-chart.json b/gameplay/songs/tutorial/charts/tutorial-chart.json
similarity index 100%
rename from gameplay/songs/tutorial/tutorial-chart.json
rename to gameplay/songs/tutorial/charts/tutorial-chart.json
diff --git a/gameplay/songs/tutorial/tutorial-metadata.json b/gameplay/songs/tutorial/charts/tutorial-metadata.json
similarity index 100%
rename from gameplay/songs/tutorial/tutorial-metadata.json
rename to gameplay/songs/tutorial/charts/tutorial-metadata.json
diff --git a/gameplay/songs/ugh/Inst.mp3 b/gameplay/songs/ugh/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/ugh/Inst.mp3
rename to gameplay/songs/ugh/audio/Inst.mp3
diff --git a/gameplay/songs/ugh/Inst.ogg b/gameplay/songs/ugh/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/ugh/Inst.ogg
rename to gameplay/songs/ugh/audio/Inst.ogg
diff --git a/gameplay/songs/ugh/Voices-bf.mp3 b/gameplay/songs/ugh/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/ugh/Voices-bf.mp3
rename to gameplay/songs/ugh/audio/Voices-bf.mp3
diff --git a/gameplay/songs/ugh/Voices-bf.ogg b/gameplay/songs/ugh/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/ugh/Voices-bf.ogg
rename to gameplay/songs/ugh/audio/Voices-bf.ogg
diff --git a/gameplay/songs/ugh/Voices-tankman.mp3 b/gameplay/songs/ugh/audio/Voices-tankman.mp3
similarity index 100%
rename from gameplay/songs/ugh/Voices-tankman.mp3
rename to gameplay/songs/ugh/audio/Voices-tankman.mp3
diff --git a/gameplay/songs/ugh/Voices-tankman.ogg b/gameplay/songs/ugh/audio/Voices-tankman.ogg
similarity index 100%
rename from gameplay/songs/ugh/Voices-tankman.ogg
rename to gameplay/songs/ugh/audio/Voices-tankman.ogg
diff --git a/gameplay/songs/ugh/Inst-erect.mp3 b/gameplay/songs/ugh/audio/erect/Inst-erect.mp3
similarity index 100%
rename from gameplay/songs/ugh/Inst-erect.mp3
rename to gameplay/songs/ugh/audio/erect/Inst-erect.mp3
diff --git a/gameplay/songs/ugh/Inst-erect.ogg b/gameplay/songs/ugh/audio/erect/Inst-erect.ogg
similarity index 100%
rename from gameplay/songs/ugh/Inst-erect.ogg
rename to gameplay/songs/ugh/audio/erect/Inst-erect.ogg
diff --git a/gameplay/songs/ugh/Voices-bf-erect.mp3 b/gameplay/songs/ugh/audio/erect/Voices-bf-erect.mp3
similarity index 100%
rename from gameplay/songs/ugh/Voices-bf-erect.mp3
rename to gameplay/songs/ugh/audio/erect/Voices-bf-erect.mp3
diff --git a/gameplay/songs/ugh/Voices-bf-erect.ogg b/gameplay/songs/ugh/audio/erect/Voices-bf-erect.ogg
similarity index 100%
rename from gameplay/songs/ugh/Voices-bf-erect.ogg
rename to gameplay/songs/ugh/audio/erect/Voices-bf-erect.ogg
diff --git a/gameplay/songs/ugh/Voices-tankman-erect.mp3 b/gameplay/songs/ugh/audio/erect/Voices-tankman-erect.mp3
similarity index 100%
rename from gameplay/songs/ugh/Voices-tankman-erect.mp3
rename to gameplay/songs/ugh/audio/erect/Voices-tankman-erect.mp3
diff --git a/gameplay/songs/ugh/Voices-tankman-erect.ogg b/gameplay/songs/ugh/audio/erect/Voices-tankman-erect.ogg
similarity index 100%
rename from gameplay/songs/ugh/Voices-tankman-erect.ogg
rename to gameplay/songs/ugh/audio/erect/Voices-tankman-erect.ogg
diff --git a/gameplay/songs/ugh/Inst-pico.mp3 b/gameplay/songs/ugh/audio/pico/Inst-pico.mp3
similarity index 100%
rename from gameplay/songs/ugh/Inst-pico.mp3
rename to gameplay/songs/ugh/audio/pico/Inst-pico.mp3
diff --git a/gameplay/songs/ugh/Inst-pico.ogg b/gameplay/songs/ugh/audio/pico/Inst-pico.ogg
similarity index 100%
rename from gameplay/songs/ugh/Inst-pico.ogg
rename to gameplay/songs/ugh/audio/pico/Inst-pico.ogg
diff --git a/gameplay/songs/ugh/Voices-pico-pico.mp3 b/gameplay/songs/ugh/audio/pico/Voices-pico-playable-pico.mp3
similarity index 100%
rename from gameplay/songs/ugh/Voices-pico-pico.mp3
rename to gameplay/songs/ugh/audio/pico/Voices-pico-playable-pico.mp3
diff --git a/gameplay/songs/ugh/Voices-pico-pico.ogg b/gameplay/songs/ugh/audio/pico/Voices-pico-playable-pico.ogg
similarity index 100%
rename from gameplay/songs/ugh/Voices-pico-pico.ogg
rename to gameplay/songs/ugh/audio/pico/Voices-pico-playable-pico.ogg
diff --git a/gameplay/songs/ugh/Voices-tankman-pico.mp3 b/gameplay/songs/ugh/audio/pico/Voices-tankman-pico.mp3
similarity index 100%
rename from gameplay/songs/ugh/Voices-tankman-pico.mp3
rename to gameplay/songs/ugh/audio/pico/Voices-tankman-pico.mp3
diff --git a/gameplay/songs/ugh/Voices-tankman-pico.ogg b/gameplay/songs/ugh/audio/pico/Voices-tankman-pico.ogg
similarity index 100%
rename from gameplay/songs/ugh/Voices-tankman-pico.ogg
rename to gameplay/songs/ugh/audio/pico/Voices-tankman-pico.ogg
diff --git a/gameplay/songs/ugh/ugh-chart-erect.json b/gameplay/songs/ugh/charts/erect/ugh-chart-erect.json
similarity index 100%
rename from gameplay/songs/ugh/ugh-chart-erect.json
rename to gameplay/songs/ugh/charts/erect/ugh-chart-erect.json
diff --git a/gameplay/songs/ugh/ugh-metadata-erect.json b/gameplay/songs/ugh/charts/erect/ugh-metadata-erect.json
similarity index 100%
rename from gameplay/songs/ugh/ugh-metadata-erect.json
rename to gameplay/songs/ugh/charts/erect/ugh-metadata-erect.json
diff --git a/gameplay/songs/ugh/ugh-chart-pico.json b/gameplay/songs/ugh/charts/pico/ugh-chart-pico.json
similarity index 100%
rename from gameplay/songs/ugh/ugh-chart-pico.json
rename to gameplay/songs/ugh/charts/pico/ugh-chart-pico.json
diff --git a/gameplay/songs/ugh/ugh-metadata-pico.json b/gameplay/songs/ugh/charts/pico/ugh-metadata-pico.json
similarity index 100%
rename from gameplay/songs/ugh/ugh-metadata-pico.json
rename to gameplay/songs/ugh/charts/pico/ugh-metadata-pico.json
diff --git a/gameplay/songs/ugh/ugh-chart.json b/gameplay/songs/ugh/charts/ugh-chart.json
similarity index 100%
rename from gameplay/songs/ugh/ugh-chart.json
rename to gameplay/songs/ugh/charts/ugh-chart.json
diff --git a/gameplay/songs/ugh/ugh-metadata.json b/gameplay/songs/ugh/charts/ugh-metadata.json
similarity index 100%
rename from gameplay/songs/ugh/ugh-metadata.json
rename to gameplay/songs/ugh/charts/ugh-metadata.json
diff --git a/gameplay/songs/winter-horrorland/Inst.mp3 b/gameplay/songs/winter-horrorland/audio/Inst.mp3
similarity index 100%
rename from gameplay/songs/winter-horrorland/Inst.mp3
rename to gameplay/songs/winter-horrorland/audio/Inst.mp3
diff --git a/gameplay/songs/winter-horrorland/Inst.ogg b/gameplay/songs/winter-horrorland/audio/Inst.ogg
similarity index 100%
rename from gameplay/songs/winter-horrorland/Inst.ogg
rename to gameplay/songs/winter-horrorland/audio/Inst.ogg
diff --git a/gameplay/songs/winter-horrorland/Voices-bf.mp3 b/gameplay/songs/winter-horrorland/audio/Voices-bf.mp3
similarity index 100%
rename from gameplay/songs/winter-horrorland/Voices-bf.mp3
rename to gameplay/songs/winter-horrorland/audio/Voices-bf.mp3
diff --git a/gameplay/songs/winter-horrorland/Voices-bf.ogg b/gameplay/songs/winter-horrorland/audio/Voices-bf.ogg
similarity index 100%
rename from gameplay/songs/winter-horrorland/Voices-bf.ogg
rename to gameplay/songs/winter-horrorland/audio/Voices-bf.ogg
diff --git a/gameplay/songs/winter-horrorland/Voices-monster.mp3 b/gameplay/songs/winter-horrorland/audio/Voices-monster.mp3
similarity index 100%
rename from gameplay/songs/winter-horrorland/Voices-monster.mp3
rename to gameplay/songs/winter-horrorland/audio/Voices-monster.mp3
diff --git a/gameplay/songs/winter-horrorland/Voices-monster.ogg b/gameplay/songs/winter-horrorland/audio/Voices-monster.ogg
similarity index 100%
rename from gameplay/songs/winter-horrorland/Voices-monster.ogg
rename to gameplay/songs/winter-horrorland/audio/Voices-monster.ogg
diff --git a/gameplay/songs/winter-horrorland/winter-horrorland-chart.json b/gameplay/songs/winter-horrorland/charts/winter-horrorland-chart.json
similarity index 100%
rename from gameplay/songs/winter-horrorland/winter-horrorland-chart.json
rename to gameplay/songs/winter-horrorland/charts/winter-horrorland-chart.json
diff --git a/gameplay/songs/winter-horrorland/winter-horrorland-metadata.json b/gameplay/songs/winter-horrorland/charts/winter-horrorland-metadata.json
similarity index 100%
rename from gameplay/songs/winter-horrorland/winter-horrorland-metadata.json
rename to gameplay/songs/winter-horrorland/charts/winter-horrorland-metadata.json
diff --git a/gameplay/stages/limoRide/bg-limo.png b/gameplay/stages/limoRide/default/graphics/bg-limo.png
similarity index 100%
rename from gameplay/stages/limoRide/bg-limo.png
rename to gameplay/stages/limoRide/default/graphics/bg-limo.png
diff --git a/gameplay/stages/limoRide/bg-limo.xml b/gameplay/stages/limoRide/default/graphics/bg-limo.xml
similarity index 100%
rename from gameplay/stages/limoRide/bg-limo.xml
rename to gameplay/stages/limoRide/default/graphics/bg-limo.xml
diff --git a/gameplay/stages/limoRide/fast-car.png b/gameplay/stages/limoRide/default/graphics/fast-car.png
similarity index 100%
rename from gameplay/stages/limoRide/fast-car.png
rename to gameplay/stages/limoRide/default/graphics/fast-car.png
diff --git a/gameplay/stages/limoRide/henchmen.png b/gameplay/stages/limoRide/default/graphics/henchmen.png
similarity index 100%
rename from gameplay/stages/limoRide/henchmen.png
rename to gameplay/stages/limoRide/default/graphics/henchmen.png
diff --git a/gameplay/stages/limoRide/henchmen.xml b/gameplay/stages/limoRide/default/graphics/henchmen.xml
similarity index 100%
rename from gameplay/stages/limoRide/henchmen.xml
rename to gameplay/stages/limoRide/default/graphics/henchmen.xml
diff --git a/gameplay/stages/limoRide/limo-dancer.png b/gameplay/stages/limoRide/default/graphics/limo-dancer.png
similarity index 100%
rename from gameplay/stages/limoRide/limo-dancer.png
rename to gameplay/stages/limoRide/default/graphics/limo-dancer.png
diff --git a/gameplay/stages/limoRide/limo-dancer.xml b/gameplay/stages/limoRide/default/graphics/limo-dancer.xml
similarity index 100%
rename from gameplay/stages/limoRide/limo-dancer.xml
rename to gameplay/stages/limoRide/default/graphics/limo-dancer.xml
diff --git a/gameplay/stages/limoRide/limo-drive.png b/gameplay/stages/limoRide/default/graphics/limo-drive.png
similarity index 100%
rename from gameplay/stages/limoRide/limo-drive.png
rename to gameplay/stages/limoRide/default/graphics/limo-drive.png
diff --git a/gameplay/stages/limoRide/limo-drive.xml b/gameplay/stages/limoRide/default/graphics/limo-drive.xml
similarity index 100%
rename from gameplay/stages/limoRide/limo-drive.xml
rename to gameplay/stages/limoRide/default/graphics/limo-drive.xml
diff --git a/gameplay/stages/limoRide/limo-overlay.png b/gameplay/stages/limoRide/default/graphics/limo-overlay.png
similarity index 100%
rename from gameplay/stages/limoRide/limo-overlay.png
rename to gameplay/stages/limoRide/default/graphics/limo-overlay.png
diff --git a/gameplay/stages/limoRide/limo-sunset.png b/gameplay/stages/limoRide/default/graphics/limo-sunset.png
similarity index 100%
rename from gameplay/stages/limoRide/limo-sunset.png
rename to gameplay/stages/limoRide/default/graphics/limo-sunset.png
diff --git a/gameplay/stages/limoRide/limoRide.hxc b/gameplay/stages/limoRide/default/limoRide.hxc
similarity index 100%
rename from gameplay/stages/limoRide/limoRide.hxc
rename to gameplay/stages/limoRide/default/limoRide.hxc
diff --git a/gameplay/stages/limoRide/limoRide.json b/gameplay/stages/limoRide/default/limoRide.json
similarity index 100%
rename from gameplay/stages/limoRide/limoRide.json
rename to gameplay/stages/limoRide/default/limoRide.json
diff --git a/gameplay/stages/limoRideErect/bg-limo.png b/gameplay/stages/limoRide/erect/graphics/bg-limo.png
similarity index 100%
rename from gameplay/stages/limoRideErect/bg-limo.png
rename to gameplay/stages/limoRide/erect/graphics/bg-limo.png
diff --git a/gameplay/stages/limoRideErect/bg-limo.xml b/gameplay/stages/limoRide/erect/graphics/bg-limo.xml
similarity index 100%
rename from gameplay/stages/limoRideErect/bg-limo.xml
rename to gameplay/stages/limoRide/erect/graphics/bg-limo.xml
diff --git a/gameplay/stages/limoRideErect/limo-drive.png b/gameplay/stages/limoRide/erect/graphics/limo-drive.png
similarity index 100%
rename from gameplay/stages/limoRideErect/limo-drive.png
rename to gameplay/stages/limoRide/erect/graphics/limo-drive.png
diff --git a/gameplay/stages/limoRideErect/limo-drive.xml b/gameplay/stages/limoRide/erect/graphics/limo-drive.xml
similarity index 100%
rename from gameplay/stages/limoRideErect/limo-drive.xml
rename to gameplay/stages/limoRide/erect/graphics/limo-drive.xml
diff --git a/gameplay/stages/limoRideErect/limo-sunset.png b/gameplay/stages/limoRide/erect/graphics/limo-sunset.png
similarity index 100%
rename from gameplay/stages/limoRideErect/limo-sunset.png
rename to gameplay/stages/limoRide/erect/graphics/limo-sunset.png
diff --git a/gameplay/stages/limoRideErect/mid-middle.png b/gameplay/stages/limoRide/erect/graphics/mid-middle.png
similarity index 100%
rename from gameplay/stages/limoRideErect/mid-middle.png
rename to gameplay/stages/limoRide/erect/graphics/mid-middle.png
diff --git a/gameplay/stages/limoRideErect/mist-back.png b/gameplay/stages/limoRide/erect/graphics/mist-back.png
similarity index 100%
rename from gameplay/stages/limoRideErect/mist-back.png
rename to gameplay/stages/limoRide/erect/graphics/mist-back.png
diff --git a/gameplay/stages/limoRideErect/mist-front.png b/gameplay/stages/limoRide/erect/graphics/mist-front.png
similarity index 100%
rename from gameplay/stages/limoRideErect/mist-front.png
rename to gameplay/stages/limoRide/erect/graphics/mist-front.png
diff --git a/gameplay/stages/limoRideErect/shooting-star.png b/gameplay/stages/limoRide/erect/graphics/shooting-star.png
similarity index 100%
rename from gameplay/stages/limoRideErect/shooting-star.png
rename to gameplay/stages/limoRide/erect/graphics/shooting-star.png
diff --git a/gameplay/stages/limoRideErect/shooting-star.xml b/gameplay/stages/limoRide/erect/graphics/shooting-star.xml
similarity index 100%
rename from gameplay/stages/limoRideErect/shooting-star.xml
rename to gameplay/stages/limoRide/erect/graphics/shooting-star.xml
diff --git a/gameplay/stages/limoRideErect/limoRideErect.hxc b/gameplay/stages/limoRide/erect/limoRideErect.hxc
similarity index 100%
rename from gameplay/stages/limoRideErect/limoRideErect.hxc
rename to gameplay/stages/limoRide/erect/limoRideErect.hxc
diff --git a/gameplay/stages/limoRideErect/limoRideErect.json b/gameplay/stages/limoRide/erect/limoRideErect.json
similarity index 100%
rename from gameplay/stages/limoRideErect/limoRideErect.json
rename to gameplay/stages/limoRide/erect/limoRideErect.json
diff --git a/gameplay/stages/mainStage/stage-back.png b/gameplay/stages/mainStage/default/graphics/stage-back.png
similarity index 100%
rename from gameplay/stages/mainStage/stage-back.png
rename to gameplay/stages/mainStage/default/graphics/stage-back.png
diff --git a/gameplay/stages/mainStage/stage-curtains.png b/gameplay/stages/mainStage/default/graphics/stage-curtains.png
similarity index 100%
rename from gameplay/stages/mainStage/stage-curtains.png
rename to gameplay/stages/mainStage/default/graphics/stage-curtains.png
diff --git a/gameplay/stages/mainStage/stage-front.png b/gameplay/stages/mainStage/default/graphics/stage-front.png
similarity index 100%
rename from gameplay/stages/mainStage/stage-front.png
rename to gameplay/stages/mainStage/default/graphics/stage-front.png
diff --git a/gameplay/stages/mainStage/stage-light.png b/gameplay/stages/mainStage/default/graphics/stage-light.png
similarity index 100%
rename from gameplay/stages/mainStage/stage-light.png
rename to gameplay/stages/mainStage/default/graphics/stage-light.png
diff --git a/gameplay/stages/mainStage/mainStage.json b/gameplay/stages/mainStage/default/mainStage.json
similarity index 100%
rename from gameplay/stages/mainStage/mainStage.json
rename to gameplay/stages/mainStage/default/mainStage.json
diff --git a/gameplay/stages/mainStageErect/back-dark.png b/gameplay/stages/mainStage/erect/graphics/back-dark.png
similarity index 100%
rename from gameplay/stages/mainStageErect/back-dark.png
rename to gameplay/stages/mainStage/erect/graphics/back-dark.png
diff --git a/gameplay/stages/mainStageErect/bg.png b/gameplay/stages/mainStage/erect/graphics/bg.png
similarity index 100%
rename from gameplay/stages/mainStageErect/bg.png
rename to gameplay/stages/mainStage/erect/graphics/bg.png
diff --git a/gameplay/stages/mainStageErect/bright-light.png b/gameplay/stages/mainStage/erect/graphics/bright-light.png
similarity index 100%
rename from gameplay/stages/mainStageErect/bright-light.png
rename to gameplay/stages/mainStage/erect/graphics/bright-light.png
diff --git a/gameplay/stages/mainStageErect/crowd.png b/gameplay/stages/mainStage/erect/graphics/crowd.png
similarity index 100%
rename from gameplay/stages/mainStageErect/crowd.png
rename to gameplay/stages/mainStage/erect/graphics/crowd.png
diff --git a/gameplay/stages/mainStageErect/crowd.xml b/gameplay/stages/mainStage/erect/graphics/crowd.xml
similarity index 100%
rename from gameplay/stages/mainStageErect/crowd.xml
rename to gameplay/stages/mainStage/erect/graphics/crowd.xml
diff --git a/gameplay/stages/mainStageErect/light-above.png b/gameplay/stages/mainStage/erect/graphics/light-above.png
similarity index 100%
rename from gameplay/stages/mainStageErect/light-above.png
rename to gameplay/stages/mainStage/erect/graphics/light-above.png
diff --git a/gameplay/stages/mainStageErect/light-green.png b/gameplay/stages/mainStage/erect/graphics/light-green.png
similarity index 100%
rename from gameplay/stages/mainStageErect/light-green.png
rename to gameplay/stages/mainStage/erect/graphics/light-green.png
diff --git a/gameplay/stages/mainStageErect/light-orange.png b/gameplay/stages/mainStage/erect/graphics/light-orange.png
similarity index 100%
rename from gameplay/stages/mainStageErect/light-orange.png
rename to gameplay/stages/mainStage/erect/graphics/light-orange.png
diff --git a/gameplay/stages/mainStageErect/light-red.png b/gameplay/stages/mainStage/erect/graphics/light-red.png
similarity index 100%
rename from gameplay/stages/mainStageErect/light-red.png
rename to gameplay/stages/mainStage/erect/graphics/light-red.png
diff --git a/gameplay/stages/mainStageErect/lights.png b/gameplay/stages/mainStage/erect/graphics/lights.png
similarity index 100%
rename from gameplay/stages/mainStageErect/lights.png
rename to gameplay/stages/mainStage/erect/graphics/lights.png
diff --git a/gameplay/stages/mainStageErect/server.png b/gameplay/stages/mainStage/erect/graphics/server.png
similarity index 100%
rename from gameplay/stages/mainStageErect/server.png
rename to gameplay/stages/mainStage/erect/graphics/server.png
diff --git a/gameplay/stages/mainStageErect/mainStageErect.hxc b/gameplay/stages/mainStage/erect/mainStageErect.hxc
similarity index 100%
rename from gameplay/stages/mainStageErect/mainStageErect.hxc
rename to gameplay/stages/mainStage/erect/mainStageErect.hxc
diff --git a/gameplay/stages/mainStageErect/mainStageErect.json b/gameplay/stages/mainStage/erect/mainStageErect.json
similarity index 100%
rename from gameplay/stages/mainStageErect/mainStageErect.json
rename to gameplay/stages/mainStage/erect/mainStageErect.json
diff --git a/gameplay/stages/mallXmas/boppers-bottom.png b/gameplay/stages/mallXmas/default/graphics/boppers-bottom.png
similarity index 100%
rename from gameplay/stages/mallXmas/boppers-bottom.png
rename to gameplay/stages/mallXmas/default/graphics/boppers-bottom.png
diff --git a/gameplay/stages/mallXmas/boppers-bottom.xml b/gameplay/stages/mallXmas/default/graphics/boppers-bottom.xml
similarity index 100%
rename from gameplay/stages/mallXmas/boppers-bottom.xml
rename to gameplay/stages/mallXmas/default/graphics/boppers-bottom.xml
diff --git a/gameplay/stages/mallXmas/boppers-upper.png b/gameplay/stages/mallXmas/default/graphics/boppers-upper.png
similarity index 100%
rename from gameplay/stages/mallXmas/boppers-upper.png
rename to gameplay/stages/mallXmas/default/graphics/boppers-upper.png
diff --git a/gameplay/stages/mallXmas/boppers-upper.xml b/gameplay/stages/mallXmas/default/graphics/boppers-upper.xml
similarity index 100%
rename from gameplay/stages/mallXmas/boppers-upper.xml
rename to gameplay/stages/mallXmas/default/graphics/boppers-upper.xml
diff --git a/gameplay/stages/mallXmas/christmas-wall.png b/gameplay/stages/mallXmas/default/graphics/christmas-wall.png
similarity index 100%
rename from gameplay/stages/mallXmas/christmas-wall.png
rename to gameplay/stages/mallXmas/default/graphics/christmas-wall.png
diff --git a/gameplay/stages/mallXmas/escalator.png b/gameplay/stages/mallXmas/default/graphics/escalator.png
similarity index 100%
rename from gameplay/stages/mallXmas/escalator.png
rename to gameplay/stages/mallXmas/default/graphics/escalator.png
diff --git a/gameplay/stages/mallXmas/santa.png b/gameplay/stages/mallXmas/default/graphics/santa.png
similarity index 100%
rename from gameplay/stages/mallXmas/santa.png
rename to gameplay/stages/mallXmas/default/graphics/santa.png
diff --git a/gameplay/stages/mallXmas/santa.xml b/gameplay/stages/mallXmas/default/graphics/santa.xml
similarity index 100%
rename from gameplay/stages/mallXmas/santa.xml
rename to gameplay/stages/mallXmas/default/graphics/santa.xml
diff --git a/gameplay/stages/mallXmas/snow-foreground.png b/gameplay/stages/mallXmas/default/graphics/snow-foreground.png
similarity index 100%
rename from gameplay/stages/mallXmas/snow-foreground.png
rename to gameplay/stages/mallXmas/default/graphics/snow-foreground.png
diff --git a/gameplay/stages/mallXmas/tree.png b/gameplay/stages/mallXmas/default/graphics/tree.png
similarity index 100%
rename from gameplay/stages/mallXmas/tree.png
rename to gameplay/stages/mallXmas/default/graphics/tree.png
diff --git a/gameplay/stages/mallXmas/walls.png b/gameplay/stages/mallXmas/default/graphics/walls.png
similarity index 100%
rename from gameplay/stages/mallXmas/walls.png
rename to gameplay/stages/mallXmas/default/graphics/walls.png
diff --git a/gameplay/stages/mallXmas/mallXmas.json b/gameplay/stages/mallXmas/default/mallXmas.json
similarity index 100%
rename from gameplay/stages/mallXmas/mallXmas.json
rename to gameplay/stages/mallXmas/default/mallXmas.json
diff --git a/gameplay/stages/mallXmas/sounds/lights-off.mp3 b/gameplay/stages/mallXmas/default/sounds/lights-off.mp3
similarity index 100%
rename from gameplay/stages/mallXmas/sounds/lights-off.mp3
rename to gameplay/stages/mallXmas/default/sounds/lights-off.mp3
diff --git a/gameplay/stages/mallXmas/sounds/lights-off.ogg b/gameplay/stages/mallXmas/default/sounds/lights-off.ogg
similarity index 100%
rename from gameplay/stages/mallXmas/sounds/lights-off.ogg
rename to gameplay/stages/mallXmas/default/sounds/lights-off.ogg
diff --git a/gameplay/stages/mallXmas/sounds/lights-on.mp3 b/gameplay/stages/mallXmas/default/sounds/lights-on.mp3
similarity index 100%
rename from gameplay/stages/mallXmas/sounds/lights-on.mp3
rename to gameplay/stages/mallXmas/default/sounds/lights-on.mp3
diff --git a/gameplay/stages/mallXmas/sounds/lights-on.ogg b/gameplay/stages/mallXmas/default/sounds/lights-on.ogg
similarity index 100%
rename from gameplay/stages/mallXmas/sounds/lights-on.ogg
rename to gameplay/stages/mallXmas/default/sounds/lights-on.ogg
diff --git a/gameplay/stages/mallXmasErect/cutscene/parents-shoot/Animation.json b/gameplay/stages/mallXmas/erect/cutscene/graphics/parents-shoot/Animation.json
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/parents-shoot/Animation.json
rename to gameplay/stages/mallXmas/erect/cutscene/graphics/parents-shoot/Animation.json
diff --git a/gameplay/stages/mallXmasErect/cutscene/parents-shoot/spritemap1.json b/gameplay/stages/mallXmas/erect/cutscene/graphics/parents-shoot/spritemap1.json
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/parents-shoot/spritemap1.json
rename to gameplay/stages/mallXmas/erect/cutscene/graphics/parents-shoot/spritemap1.json
diff --git a/gameplay/stages/mallXmasErect/cutscene/parents-shoot/spritemap1.png b/gameplay/stages/mallXmas/erect/cutscene/graphics/parents-shoot/spritemap1.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/parents-shoot/spritemap1.png
rename to gameplay/stages/mallXmas/erect/cutscene/graphics/parents-shoot/spritemap1.png
diff --git a/gameplay/stages/mallXmasErect/cutscene/santa-speaks/Animation.json b/gameplay/stages/mallXmas/erect/cutscene/graphics/santa-speaks/Animation.json
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/santa-speaks/Animation.json
rename to gameplay/stages/mallXmas/erect/cutscene/graphics/santa-speaks/Animation.json
diff --git a/gameplay/stages/mallXmasErect/cutscene/santa-speaks/spritemap1.json b/gameplay/stages/mallXmas/erect/cutscene/graphics/santa-speaks/spritemap1.json
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/santa-speaks/spritemap1.json
rename to gameplay/stages/mallXmas/erect/cutscene/graphics/santa-speaks/spritemap1.json
diff --git a/gameplay/stages/mallXmasErect/cutscene/santa-speaks/spritemap1.png b/gameplay/stages/mallXmas/erect/cutscene/graphics/santa-speaks/spritemap1.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/santa-speaks/spritemap1.png
rename to gameplay/stages/mallXmas/erect/cutscene/graphics/santa-speaks/spritemap1.png
diff --git a/gameplay/stages/mallXmasErect/cutscene/DadShootsSprite.hxc b/gameplay/stages/mallXmas/erect/cutscene/scripts/DadShootsSprite.hxc
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/DadShootsSprite.hxc
rename to gameplay/stages/mallXmas/erect/cutscene/scripts/DadShootsSprite.hxc
diff --git a/gameplay/stages/mallXmasErect/cutscene/SantaDiesSprite.hxc b/gameplay/stages/mallXmas/erect/cutscene/scripts/SantaDiesSprite.hxc
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/SantaDiesSprite.hxc
rename to gameplay/stages/mallXmas/erect/cutscene/scripts/SantaDiesSprite.hxc
diff --git a/gameplay/stages/mallXmasErect/cutscene/parents-shoot.mp3 b/gameplay/stages/mallXmas/erect/cutscene/sounds/parents-shoot.mp3
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/parents-shoot.mp3
rename to gameplay/stages/mallXmas/erect/cutscene/sounds/parents-shoot.mp3
diff --git a/gameplay/stages/mallXmasErect/cutscene/parents-shoot.ogg b/gameplay/stages/mallXmas/erect/cutscene/sounds/parents-shoot.ogg
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/parents-shoot.ogg
rename to gameplay/stages/mallXmas/erect/cutscene/sounds/parents-shoot.ogg
diff --git a/gameplay/stages/mallXmasErect/cutscene/santa-speaks.mp3 b/gameplay/stages/mallXmas/erect/cutscene/sounds/santa-speaks.mp3
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/santa-speaks.mp3
rename to gameplay/stages/mallXmas/erect/cutscene/sounds/santa-speaks.mp3
diff --git a/gameplay/stages/mallXmasErect/cutscene/santa-speaks.ogg b/gameplay/stages/mallXmas/erect/cutscene/sounds/santa-speaks.ogg
similarity index 100%
rename from gameplay/stages/mallXmasErect/cutscene/santa-speaks.ogg
rename to gameplay/stages/mallXmas/erect/cutscene/sounds/santa-speaks.ogg
diff --git a/gameplay/stages/mallXmasErect/boppers-bottom.png b/gameplay/stages/mallXmas/erect/graphics/boppers-bottom.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/boppers-bottom.png
rename to gameplay/stages/mallXmas/erect/graphics/boppers-bottom.png
diff --git a/gameplay/stages/mallXmasErect/boppers-bottom.xml b/gameplay/stages/mallXmas/erect/graphics/boppers-bottom.xml
similarity index 100%
rename from gameplay/stages/mallXmasErect/boppers-bottom.xml
rename to gameplay/stages/mallXmas/erect/graphics/boppers-bottom.xml
diff --git a/gameplay/stages/mallXmasErect/boppers-upper.png b/gameplay/stages/mallXmas/erect/graphics/boppers-upper.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/boppers-upper.png
rename to gameplay/stages/mallXmas/erect/graphics/boppers-upper.png
diff --git a/gameplay/stages/mallXmasErect/boppers-upper.xml b/gameplay/stages/mallXmas/erect/graphics/boppers-upper.xml
similarity index 100%
rename from gameplay/stages/mallXmasErect/boppers-upper.xml
rename to gameplay/stages/mallXmas/erect/graphics/boppers-upper.xml
diff --git a/gameplay/stages/mallXmasErect/escalator.png b/gameplay/stages/mallXmas/erect/graphics/escalator.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/escalator.png
rename to gameplay/stages/mallXmas/erect/graphics/escalator.png
diff --git a/gameplay/stages/mallXmasErect/snowflakes.png b/gameplay/stages/mallXmas/erect/graphics/snowflakes.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/snowflakes.png
rename to gameplay/stages/mallXmas/erect/graphics/snowflakes.png
diff --git a/gameplay/stages/mallXmasErect/snowflakes.xml b/gameplay/stages/mallXmas/erect/graphics/snowflakes.xml
similarity index 100%
rename from gameplay/stages/mallXmasErect/snowflakes.xml
rename to gameplay/stages/mallXmas/erect/graphics/snowflakes.xml
diff --git a/gameplay/stages/mallXmasErect/tree.png b/gameplay/stages/mallXmas/erect/graphics/tree.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/tree.png
rename to gameplay/stages/mallXmas/erect/graphics/tree.png
diff --git a/gameplay/stages/mallXmasErect/walls.png b/gameplay/stages/mallXmas/erect/graphics/walls.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/walls.png
rename to gameplay/stages/mallXmas/erect/graphics/walls.png
diff --git a/gameplay/stages/mallXmasErect/white.png b/gameplay/stages/mallXmas/erect/graphics/white.png
similarity index 100%
rename from gameplay/stages/mallXmasErect/white.png
rename to gameplay/stages/mallXmas/erect/graphics/white.png
diff --git a/gameplay/stages/mallXmasErect/mallXmasErect.hxc b/gameplay/stages/mallXmas/erect/mallXmasErect.hxc
similarity index 100%
rename from gameplay/stages/mallXmasErect/mallXmasErect.hxc
rename to gameplay/stages/mallXmas/erect/mallXmasErect.hxc
diff --git a/gameplay/stages/mallXmasErect/mallXmasErect.json b/gameplay/stages/mallXmas/erect/mallXmasErect.json
similarity index 100%
rename from gameplay/stages/mallXmasErect/mallXmasErect.json
rename to gameplay/stages/mallXmas/erect/mallXmasErect.json
diff --git a/gameplay/stages/mallEvil/mallEvil.json b/gameplay/stages/mallXmas/evil/mallEvil.json
similarity index 100%
rename from gameplay/stages/mallEvil/mallEvil.json
rename to gameplay/stages/mallXmas/evil/mallEvil.json
diff --git a/gameplay/stages/mallEvil/background.png b/gameplay/stages/mallXmas/evil/objects/background.png
similarity index 100%
rename from gameplay/stages/mallEvil/background.png
rename to gameplay/stages/mallXmas/evil/objects/background.png
diff --git a/gameplay/stages/mallEvil/snow.png b/gameplay/stages/mallXmas/evil/objects/snow.png
similarity index 100%
rename from gameplay/stages/mallEvil/snow.png
rename to gameplay/stages/mallXmas/evil/objects/snow.png
diff --git a/gameplay/stages/mallEvil/tree.png b/gameplay/stages/mallXmas/evil/objects/tree.png
similarity index 100%
rename from gameplay/stages/mallEvil/tree.png
rename to gameplay/stages/mallXmas/evil/objects/tree.png
diff --git a/gameplay/stages/phillyBlazin/lightning.png b/gameplay/stages/phillyStreets/blazin/graphics/lightning.png
similarity index 100%
rename from gameplay/stages/phillyBlazin/lightning.png
rename to gameplay/stages/phillyStreets/blazin/graphics/lightning.png
diff --git a/gameplay/stages/phillyBlazin/lightning.xml b/gameplay/stages/phillyStreets/blazin/graphics/lightning.xml
similarity index 100%
rename from gameplay/stages/phillyBlazin/lightning.xml
rename to gameplay/stages/phillyStreets/blazin/graphics/lightning.xml
diff --git a/gameplay/stages/phillyBlazin/sky-blur.png b/gameplay/stages/phillyStreets/blazin/graphics/sky-blur.png
similarity index 100%
rename from gameplay/stages/phillyBlazin/sky-blur.png
rename to gameplay/stages/phillyStreets/blazin/graphics/sky-blur.png
diff --git a/gameplay/stages/phillyBlazin/street-blur.png b/gameplay/stages/phillyStreets/blazin/graphics/street-blur.png
similarity index 100%
rename from gameplay/stages/phillyBlazin/street-blur.png
rename to gameplay/stages/phillyStreets/blazin/graphics/street-blur.png
diff --git a/gameplay/stages/phillyBlazin/phillyBlazin.hxc b/gameplay/stages/phillyStreets/blazin/phillyBlazin.hxc
similarity index 100%
rename from gameplay/stages/phillyBlazin/phillyBlazin.hxc
rename to gameplay/stages/phillyStreets/blazin/phillyBlazin.hxc
diff --git a/gameplay/stages/phillyBlazin/phillyBlazin.json b/gameplay/stages/phillyStreets/blazin/phillyBlazin.json
similarity index 100%
rename from gameplay/stages/phillyBlazin/phillyBlazin.json
rename to gameplay/stages/phillyStreets/blazin/phillyBlazin.json
diff --git a/gameplay/stages/phillyBlazin/sounds/lightning-1.mp3 b/gameplay/stages/phillyStreets/blazin/sounds/lightning-1.mp3
similarity index 100%
rename from gameplay/stages/phillyBlazin/sounds/lightning-1.mp3
rename to gameplay/stages/phillyStreets/blazin/sounds/lightning-1.mp3
diff --git a/gameplay/stages/phillyBlazin/sounds/lightning-1.ogg b/gameplay/stages/phillyStreets/blazin/sounds/lightning-1.ogg
similarity index 100%
rename from gameplay/stages/phillyBlazin/sounds/lightning-1.ogg
rename to gameplay/stages/phillyStreets/blazin/sounds/lightning-1.ogg
diff --git a/gameplay/stages/phillyBlazin/sounds/lightning-2.mp3 b/gameplay/stages/phillyStreets/blazin/sounds/lightning-2.mp3
similarity index 100%
rename from gameplay/stages/phillyBlazin/sounds/lightning-2.mp3
rename to gameplay/stages/phillyStreets/blazin/sounds/lightning-2.mp3
diff --git a/gameplay/stages/phillyBlazin/sounds/lightning-2.ogg b/gameplay/stages/phillyStreets/blazin/sounds/lightning-2.ogg
similarity index 100%
rename from gameplay/stages/phillyBlazin/sounds/lightning-2.ogg
rename to gameplay/stages/phillyStreets/blazin/sounds/lightning-2.ogg
diff --git a/gameplay/stages/phillyBlazin/sounds/lightning-3.mp3 b/gameplay/stages/phillyStreets/blazin/sounds/lightning-3.mp3
similarity index 100%
rename from gameplay/stages/phillyBlazin/sounds/lightning-3.mp3
rename to gameplay/stages/phillyStreets/blazin/sounds/lightning-3.mp3
diff --git a/gameplay/stages/phillyBlazin/sounds/lightning-3.ogg b/gameplay/stages/phillyStreets/blazin/sounds/lightning-3.ogg
similarity index 100%
rename from gameplay/stages/phillyBlazin/sounds/lightning-3.ogg
rename to gameplay/stages/phillyStreets/blazin/sounds/lightning-3.ogg
diff --git a/gameplay/stages/phillyStreets/philly-cars.png b/gameplay/stages/phillyStreets/default/graphics/philly-cars.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-cars.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-cars.png
diff --git a/gameplay/stages/phillyStreets/philly-cars.xml b/gameplay/stages/phillyStreets/default/graphics/philly-cars.xml
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-cars.xml
rename to gameplay/stages/phillyStreets/default/graphics/philly-cars.xml
diff --git a/gameplay/stages/phillyStreets/philly-construction.png b/gameplay/stages/phillyStreets/default/graphics/philly-construction.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-construction.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-construction.png
diff --git a/gameplay/stages/phillyStreets/philly-foreground-city.png b/gameplay/stages/phillyStreets/default/graphics/philly-foreground-city.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-foreground-city.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-foreground-city.png
diff --git a/gameplay/stages/phillyStreets/philly-foreground.png b/gameplay/stages/phillyStreets/default/graphics/philly-foreground.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-foreground.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-foreground.png
diff --git a/gameplay/stages/phillyStreets/philly-highway-lightmap.png b/gameplay/stages/phillyStreets/default/graphics/philly-highway-lightmap.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-highway-lightmap.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-highway-lightmap.png
diff --git a/gameplay/stages/phillyStreets/philly-highway-lights.png b/gameplay/stages/phillyStreets/default/graphics/philly-highway-lights.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-highway-lights.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-highway-lights.png
diff --git a/gameplay/stages/phillyStreets/philly-highway.png b/gameplay/stages/phillyStreets/default/graphics/philly-highway.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-highway.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-highway.png
diff --git a/gameplay/stages/phillyStreets/philly-skybox.png b/gameplay/stages/phillyStreets/default/graphics/philly-skybox.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-skybox.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-skybox.png
diff --git a/gameplay/stages/phillyStreets/philly-skyline.png b/gameplay/stages/phillyStreets/default/graphics/philly-skyline.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-skyline.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-skyline.png
diff --git a/gameplay/stages/phillyStreets/philly-smog.png b/gameplay/stages/phillyStreets/default/graphics/philly-smog.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-smog.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-smog.png
diff --git a/gameplay/stages/phillyStreets/philly-traffic-lightmap.png b/gameplay/stages/phillyStreets/default/graphics/philly-traffic-lightmap.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-traffic-lightmap.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-traffic-lightmap.png
diff --git a/gameplay/stages/phillyStreets/philly-traffic.png b/gameplay/stages/phillyStreets/default/graphics/philly-traffic.png
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-traffic.png
rename to gameplay/stages/phillyStreets/default/graphics/philly-traffic.png
diff --git a/gameplay/stages/phillyStreets/philly-traffic.xml b/gameplay/stages/phillyStreets/default/graphics/philly-traffic.xml
similarity index 100%
rename from gameplay/stages/phillyStreets/philly-traffic.xml
rename to gameplay/stages/phillyStreets/default/graphics/philly-traffic.xml
diff --git a/gameplay/stages/phillyStreets/puddle.png b/gameplay/stages/phillyStreets/default/graphics/puddle.png
similarity index 100%
rename from gameplay/stages/phillyStreets/puddle.png
rename to gameplay/stages/phillyStreets/default/graphics/puddle.png
diff --git a/gameplay/stages/phillyStreets/spraycans.png b/gameplay/stages/phillyStreets/default/graphics/spraycans.png
similarity index 100%
rename from gameplay/stages/phillyStreets/spraycans.png
rename to gameplay/stages/phillyStreets/default/graphics/spraycans.png
diff --git a/gameplay/stages/phillyStreets/phillyStreets.hxc b/gameplay/stages/phillyStreets/default/phillyStreets.hxc
similarity index 100%
rename from gameplay/stages/phillyStreets/phillyStreets.hxc
rename to gameplay/stages/phillyStreets/default/phillyStreets.hxc
diff --git a/gameplay/stages/phillyStreets/phillyStreets.json b/gameplay/stages/phillyStreets/default/phillyStreets.json
similarity index 100%
rename from gameplay/stages/phillyStreets/phillyStreets.json
rename to gameplay/stages/phillyStreets/default/phillyStreets.json
diff --git a/gameplay/stages/phillyStreets/sounds/ambience-car.mp3 b/gameplay/stages/phillyStreets/default/sounds/ambience-car.mp3
similarity index 100%
rename from gameplay/stages/phillyStreets/sounds/ambience-car.mp3
rename to gameplay/stages/phillyStreets/default/sounds/ambience-car.mp3
diff --git a/gameplay/stages/phillyStreets/sounds/ambience-car.ogg b/gameplay/stages/phillyStreets/default/sounds/ambience-car.ogg
similarity index 100%
rename from gameplay/stages/phillyStreets/sounds/ambience-car.ogg
rename to gameplay/stages/phillyStreets/default/sounds/ambience-car.ogg
diff --git a/gameplay/stages/phillyStreets/sounds/ambience-rain.mp3 b/gameplay/stages/phillyStreets/default/sounds/ambience-rain.mp3
similarity index 100%
rename from gameplay/stages/phillyStreets/sounds/ambience-rain.mp3
rename to gameplay/stages/phillyStreets/default/sounds/ambience-rain.mp3
diff --git a/gameplay/stages/phillyStreets/sounds/ambience-rain.ogg b/gameplay/stages/phillyStreets/default/sounds/ambience-rain.ogg
similarity index 100%
rename from gameplay/stages/phillyStreets/sounds/ambience-rain.ogg
rename to gameplay/stages/phillyStreets/default/sounds/ambience-rain.ogg
diff --git a/gameplay/stages/phillyStreetsErect/grey-gradient.png b/gameplay/stages/phillyStreets/erect/graphics/grey-gradient.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/grey-gradient.png
rename to gameplay/stages/phillyStreets/erect/graphics/grey-gradient.png
diff --git a/gameplay/stages/phillyStreetsErect/mist-back.png b/gameplay/stages/phillyStreets/erect/graphics/mist-back.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/mist-back.png
rename to gameplay/stages/phillyStreets/erect/graphics/mist-back.png
diff --git a/gameplay/stages/phillyStreetsErect/mist-front.png b/gameplay/stages/phillyStreets/erect/graphics/mist-front.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/mist-front.png
rename to gameplay/stages/phillyStreets/erect/graphics/mist-front.png
diff --git a/gameplay/stages/phillyStreetsErect/mist-middle.png b/gameplay/stages/phillyStreets/erect/graphics/mist-middle.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/mist-middle.png
rename to gameplay/stages/phillyStreets/erect/graphics/mist-middle.png
diff --git a/gameplay/stages/phillyStreetsErect/paper.png b/gameplay/stages/phillyStreets/erect/graphics/paper.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/paper.png
rename to gameplay/stages/phillyStreets/erect/graphics/paper.png
diff --git a/gameplay/stages/phillyStreetsErect/paper.xml b/gameplay/stages/phillyStreets/erect/graphics/paper.xml
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/paper.xml
rename to gameplay/stages/phillyStreets/erect/graphics/paper.xml
diff --git a/gameplay/stages/phillyStreetsErect/philly-cards.png b/gameplay/stages/phillyStreets/erect/graphics/philly-cards.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-cards.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-cards.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-cars.xml b/gameplay/stages/phillyStreets/erect/graphics/philly-cars.xml
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-cars.xml
rename to gameplay/stages/phillyStreets/erect/graphics/philly-cars.xml
diff --git a/gameplay/stages/phillyStreetsErect/philly-construction.png b/gameplay/stages/phillyStreets/erect/graphics/philly-construction.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-construction.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-construction.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-foreground-city.png b/gameplay/stages/phillyStreets/erect/graphics/philly-foreground-city.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-foreground-city.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-foreground-city.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-foreground.png b/gameplay/stages/phillyStreets/erect/graphics/philly-foreground.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-foreground.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-foreground.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-highway-lights.png b/gameplay/stages/phillyStreets/erect/graphics/philly-highway-lights.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-highway-lights.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-highway-lights.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-highway.png b/gameplay/stages/phillyStreets/erect/graphics/philly-highway.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-highway.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-highway.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-skybox.png b/gameplay/stages/phillyStreets/erect/graphics/philly-skybox.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-skybox.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-skybox.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-skyline.png b/gameplay/stages/phillyStreets/erect/graphics/philly-skyline.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-skyline.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-skyline.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-traffic-lightmap.png b/gameplay/stages/phillyStreets/erect/graphics/philly-traffic-lightmap.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-traffic-lightmap.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-traffic-lightmap.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-traffic.png b/gameplay/stages/phillyStreets/erect/graphics/philly-traffic.png
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-traffic.png
rename to gameplay/stages/phillyStreets/erect/graphics/philly-traffic.png
diff --git a/gameplay/stages/phillyStreetsErect/philly-traffic.xml b/gameplay/stages/phillyStreets/erect/graphics/philly-traffic.xml
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/philly-traffic.xml
rename to gameplay/stages/phillyStreets/erect/graphics/philly-traffic.xml
diff --git a/gameplay/stages/phillyStreetsErect/phillyStreetsErect.hxc b/gameplay/stages/phillyStreets/erect/phillyStreetsErect.hxc
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/phillyStreetsErect.hxc
rename to gameplay/stages/phillyStreets/erect/phillyStreetsErect.hxc
diff --git a/gameplay/stages/phillyStreetsErect/phillyStreetsErect.json b/gameplay/stages/phillyStreets/erect/phillyStreetsErect.json
similarity index 100%
rename from gameplay/stages/phillyStreetsErect/phillyStreetsErect.json
rename to gameplay/stages/phillyStreets/erect/phillyStreetsErect.json
diff --git a/gameplay/stages/phillyTrain/behind-train.png b/gameplay/stages/phillyTrain/default/graphics/behind-train.png
similarity index 100%
rename from gameplay/stages/phillyTrain/behind-train.png
rename to gameplay/stages/phillyTrain/default/graphics/behind-train.png
diff --git a/gameplay/stages/phillyTrain/city.png b/gameplay/stages/phillyTrain/default/graphics/city.png
similarity index 100%
rename from gameplay/stages/phillyTrain/city.png
rename to gameplay/stages/phillyTrain/default/graphics/city.png
diff --git a/gameplay/stages/phillyTrain/sky.png b/gameplay/stages/phillyTrain/default/graphics/sky.png
similarity index 100%
rename from gameplay/stages/phillyTrain/sky.png
rename to gameplay/stages/phillyTrain/default/graphics/sky.png
diff --git a/gameplay/stages/phillyTrain/street.png b/gameplay/stages/phillyTrain/default/graphics/street.png
similarity index 100%
rename from gameplay/stages/phillyTrain/street.png
rename to gameplay/stages/phillyTrain/default/graphics/street.png
diff --git a/gameplay/stages/phillyTrain/train.png b/gameplay/stages/phillyTrain/default/graphics/train.png
similarity index 100%
rename from gameplay/stages/phillyTrain/train.png
rename to gameplay/stages/phillyTrain/default/graphics/train.png
diff --git a/gameplay/stages/phillyTrain/win0.png b/gameplay/stages/phillyTrain/default/graphics/win0.png
similarity index 100%
rename from gameplay/stages/phillyTrain/win0.png
rename to gameplay/stages/phillyTrain/default/graphics/win0.png
diff --git a/gameplay/stages/phillyTrain/win1.png b/gameplay/stages/phillyTrain/default/graphics/win1.png
similarity index 100%
rename from gameplay/stages/phillyTrain/win1.png
rename to gameplay/stages/phillyTrain/default/graphics/win1.png
diff --git a/gameplay/stages/phillyTrain/win2.png b/gameplay/stages/phillyTrain/default/graphics/win2.png
similarity index 100%
rename from gameplay/stages/phillyTrain/win2.png
rename to gameplay/stages/phillyTrain/default/graphics/win2.png
diff --git a/gameplay/stages/phillyTrain/win3.png b/gameplay/stages/phillyTrain/default/graphics/win3.png
similarity index 100%
rename from gameplay/stages/phillyTrain/win3.png
rename to gameplay/stages/phillyTrain/default/graphics/win3.png
diff --git a/gameplay/stages/phillyTrain/win4.png b/gameplay/stages/phillyTrain/default/graphics/win4.png
similarity index 100%
rename from gameplay/stages/phillyTrain/win4.png
rename to gameplay/stages/phillyTrain/default/graphics/win4.png
diff --git a/gameplay/stages/phillyTrain/phillyTrain.hxc b/gameplay/stages/phillyTrain/default/phillyTrain.hxc
similarity index 100%
rename from gameplay/stages/phillyTrain/phillyTrain.hxc
rename to gameplay/stages/phillyTrain/default/phillyTrain.hxc
diff --git a/gameplay/stages/phillyTrain/phillyTrain.json b/gameplay/stages/phillyTrain/default/phillyTrain.json
similarity index 100%
rename from gameplay/stages/phillyTrain/phillyTrain.json
rename to gameplay/stages/phillyTrain/default/phillyTrain.json
diff --git a/gameplay/stages/phillyTrain/sounds/train_passes.mp3 b/gameplay/stages/phillyTrain/default/sounds/train_passes.mp3
similarity index 100%
rename from gameplay/stages/phillyTrain/sounds/train_passes.mp3
rename to gameplay/stages/phillyTrain/default/sounds/train_passes.mp3
diff --git a/gameplay/stages/phillyTrain/sounds/train_passes.ogg b/gameplay/stages/phillyTrain/default/sounds/train_passes.ogg
similarity index 100%
rename from gameplay/stages/phillyTrain/sounds/train_passes.ogg
rename to gameplay/stages/phillyTrain/default/sounds/train_passes.ogg
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoCigarette.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoCigarette.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoCigarette.ogg b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoCigarette.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette.ogg
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoCigarette2.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette2.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoCigarette2.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette2.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoCigarette2.ogg b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette2.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoCigarette2.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoCigarette2.ogg
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoExplode.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoExplode.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoExplode.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoExplode.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoExplode.ogg b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoExplode.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoExplode.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoExplode.ogg
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoGasp.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoGasp.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoGasp.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoGasp.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoGasp.ogg b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoGasp.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoGasp.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoGasp.ogg
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoShoot.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoShoot.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoShoot.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoShoot.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoShoot.ogg b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoShoot.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoShoot.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoShoot.ogg
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoSpin.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoSpin.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoSpin.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoSpin.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/picoSpin.ogg b/gameplay/stages/phillyTrain/erect/cutscene/audio/picoSpin.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/picoSpin.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/audio/picoSpin.ogg
diff --git a/gameplay/stages/phillyTrainErect/blood-pool/Animation.json b/gameplay/stages/phillyTrain/erect/cutscene/graphics/blood-pool/Animation.json
similarity index 100%
rename from gameplay/stages/phillyTrainErect/blood-pool/Animation.json
rename to gameplay/stages/phillyTrain/erect/cutscene/graphics/blood-pool/Animation.json
diff --git a/gameplay/stages/phillyTrainErect/blood-pool/spritemap1.json b/gameplay/stages/phillyTrain/erect/cutscene/graphics/blood-pool/spritemap1.json
similarity index 100%
rename from gameplay/stages/phillyTrainErect/blood-pool/spritemap1.json
rename to gameplay/stages/phillyTrain/erect/cutscene/graphics/blood-pool/spritemap1.json
diff --git a/gameplay/stages/phillyTrainErect/blood-pool/spritemap1.png b/gameplay/stages/phillyTrain/erect/cutscene/graphics/blood-pool/spritemap1.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/blood-pool/spritemap1.png
rename to gameplay/stages/phillyTrain/erect/cutscene/graphics/blood-pool/spritemap1.png
diff --git a/gameplay/stages/phillyTrainErect/pico-doppelganger/Animation.json b/gameplay/stages/phillyTrain/erect/cutscene/graphics/pico-doppelganger/Animation.json
similarity index 100%
rename from gameplay/stages/phillyTrainErect/pico-doppelganger/Animation.json
rename to gameplay/stages/phillyTrain/erect/cutscene/graphics/pico-doppelganger/Animation.json
diff --git a/gameplay/stages/phillyTrainErect/pico-doppelganger/spritemap1.json b/gameplay/stages/phillyTrain/erect/cutscene/graphics/pico-doppelganger/spritemap1.json
similarity index 100%
rename from gameplay/stages/phillyTrainErect/pico-doppelganger/spritemap1.json
rename to gameplay/stages/phillyTrain/erect/cutscene/graphics/pico-doppelganger/spritemap1.json
diff --git a/gameplay/stages/phillyTrainErect/pico-doppelganger/spritemap1.png b/gameplay/stages/phillyTrain/erect/cutscene/graphics/pico-doppelganger/spritemap1.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/pico-doppelganger/spritemap1.png
rename to gameplay/stages/phillyTrain/erect/cutscene/graphics/pico-doppelganger/spritemap1.png
diff --git a/gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene-metadata.json b/gameplay/stages/phillyTrain/erect/cutscene/music/cutscene-metadata.json
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene-metadata.json
rename to gameplay/stages/phillyTrain/erect/cutscene/music/cutscene-metadata.json
diff --git a/gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/music/cutscene.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/music/cutscene.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene.ogg b/gameplay/stages/phillyTrain/erect/cutscene/music/cutscene.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/music/cutscene.ogg
diff --git a/gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene2.mp3 b/gameplay/stages/phillyTrain/erect/cutscene/music/cutscene2.mp3
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene2.mp3
rename to gameplay/stages/phillyTrain/erect/cutscene/music/cutscene2.mp3
diff --git a/gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene2.ogg b/gameplay/stages/phillyTrain/erect/cutscene/music/cutscene2.ogg
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cutscene/cutscene/cutscene2.ogg
rename to gameplay/stages/phillyTrain/erect/cutscene/music/cutscene2.ogg
diff --git a/gameplay/stages/phillyTrainErect/behind-train.png b/gameplay/stages/phillyTrain/erect/graphics/behind-train.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/behind-train.png
rename to gameplay/stages/phillyTrain/erect/graphics/behind-train.png
diff --git a/gameplay/stages/phillyTrainErect/cigarette.png b/gameplay/stages/phillyTrain/erect/graphics/cigarette.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cigarette.png
rename to gameplay/stages/phillyTrain/erect/graphics/cigarette.png
diff --git a/gameplay/stages/phillyTrainErect/cigarette.xml b/gameplay/stages/phillyTrain/erect/graphics/cigarette.xml
similarity index 100%
rename from gameplay/stages/phillyTrainErect/cigarette.xml
rename to gameplay/stages/phillyTrain/erect/graphics/cigarette.xml
diff --git a/gameplay/stages/phillyTrainErect/city.png b/gameplay/stages/phillyTrain/erect/graphics/city.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/city.png
rename to gameplay/stages/phillyTrain/erect/graphics/city.png
diff --git a/gameplay/stages/phillyTrainErect/sky.png b/gameplay/stages/phillyTrain/erect/graphics/sky.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/sky.png
rename to gameplay/stages/phillyTrain/erect/graphics/sky.png
diff --git a/gameplay/stages/phillyTrainErect/street.png b/gameplay/stages/phillyTrain/erect/graphics/street.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/street.png
rename to gameplay/stages/phillyTrain/erect/graphics/street.png
diff --git a/gameplay/stages/phillyTrainErect/win0.png b/gameplay/stages/phillyTrain/erect/graphics/win0.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/win0.png
rename to gameplay/stages/phillyTrain/erect/graphics/win0.png
diff --git a/gameplay/stages/phillyTrainErect/win1.png b/gameplay/stages/phillyTrain/erect/graphics/win1.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/win1.png
rename to gameplay/stages/phillyTrain/erect/graphics/win1.png
diff --git a/gameplay/stages/phillyTrainErect/win2.png b/gameplay/stages/phillyTrain/erect/graphics/win2.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/win2.png
rename to gameplay/stages/phillyTrain/erect/graphics/win2.png
diff --git a/gameplay/stages/phillyTrainErect/win3.png b/gameplay/stages/phillyTrain/erect/graphics/win3.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/win3.png
rename to gameplay/stages/phillyTrain/erect/graphics/win3.png
diff --git a/gameplay/stages/phillyTrainErect/win4.png b/gameplay/stages/phillyTrain/erect/graphics/win4.png
similarity index 100%
rename from gameplay/stages/phillyTrainErect/win4.png
rename to gameplay/stages/phillyTrain/erect/graphics/win4.png
diff --git a/gameplay/stages/phillyTrainErect/phillyTrainErect.hxc b/gameplay/stages/phillyTrain/erect/phillyTrainErect.hxc
similarity index 100%
rename from gameplay/stages/phillyTrainErect/phillyTrainErect.hxc
rename to gameplay/stages/phillyTrain/erect/phillyTrainErect.hxc
diff --git a/gameplay/stages/phillyTrainErect/phillyTrainErect.json b/gameplay/stages/phillyTrain/erect/phillyTrainErect.json
similarity index 100%
rename from gameplay/stages/phillyTrainErect/phillyTrainErect.json
rename to gameplay/stages/phillyTrain/erect/phillyTrainErect.json
diff --git a/gameplay/stages/school/bg-freaks.png b/gameplay/stages/school/default/graphics/bg-freaks.png
similarity index 100%
rename from gameplay/stages/school/bg-freaks.png
rename to gameplay/stages/school/default/graphics/bg-freaks.png
diff --git a/gameplay/stages/school/bg-freaks.xml b/gameplay/stages/school/default/graphics/bg-freaks.xml
similarity index 100%
rename from gameplay/stages/school/bg-freaks.xml
rename to gameplay/stages/school/default/graphics/bg-freaks.xml
diff --git a/gameplay/stages/school/petals.png b/gameplay/stages/school/default/graphics/petals.png
similarity index 100%
rename from gameplay/stages/school/petals.png
rename to gameplay/stages/school/default/graphics/petals.png
diff --git a/gameplay/stages/school/petals.xml b/gameplay/stages/school/default/graphics/petals.xml
similarity index 100%
rename from gameplay/stages/school/petals.xml
rename to gameplay/stages/school/default/graphics/petals.xml
diff --git a/gameplay/stages/school/weeb-school.png b/gameplay/stages/school/default/graphics/weeb-school.png
similarity index 100%
rename from gameplay/stages/school/weeb-school.png
rename to gameplay/stages/school/default/graphics/weeb-school.png
diff --git a/gameplay/stages/school/weeb-sky.png b/gameplay/stages/school/default/graphics/weeb-sky.png
similarity index 100%
rename from gameplay/stages/school/weeb-sky.png
rename to gameplay/stages/school/default/graphics/weeb-sky.png
diff --git a/gameplay/stages/school/weeb-street.png b/gameplay/stages/school/default/graphics/weeb-street.png
similarity index 100%
rename from gameplay/stages/school/weeb-street.png
rename to gameplay/stages/school/default/graphics/weeb-street.png
diff --git a/gameplay/stages/school/weeb-trees-back.png b/gameplay/stages/school/default/graphics/weeb-trees-back.png
similarity index 100%
rename from gameplay/stages/school/weeb-trees-back.png
rename to gameplay/stages/school/default/graphics/weeb-trees-back.png
diff --git a/gameplay/stages/school/weeb-trees.png b/gameplay/stages/school/default/graphics/weeb-trees.png
similarity index 100%
rename from gameplay/stages/school/weeb-trees.png
rename to gameplay/stages/school/default/graphics/weeb-trees.png
diff --git a/gameplay/stages/school/weeb-trees.txt b/gameplay/stages/school/default/graphics/weeb-trees.txt
similarity index 100%
rename from gameplay/stages/school/weeb-trees.txt
rename to gameplay/stages/school/default/graphics/weeb-trees.txt
diff --git a/gameplay/stages/school/school.hxc b/gameplay/stages/school/default/school.hxc
similarity index 100%
rename from gameplay/stages/school/school.hxc
rename to gameplay/stages/school/default/school.hxc
diff --git a/gameplay/stages/school/school.json b/gameplay/stages/school/default/school.json
similarity index 100%
rename from gameplay/stages/school/school.json
rename to gameplay/stages/school/default/school.json
diff --git a/gameplay/stages/schoolEvil/evil-school-animated.png b/gameplay/stages/school/evil/graphics/evil-school-animated.png
similarity index 100%
rename from gameplay/stages/schoolEvil/evil-school-animated.png
rename to gameplay/stages/school/evil/graphics/evil-school-animated.png
diff --git a/gameplay/stages/schoolEvil/evil-school-animated.xml b/gameplay/stages/school/evil/graphics/evil-school-animated.xml
similarity index 100%
rename from gameplay/stages/schoolEvil/evil-school-animated.xml
rename to gameplay/stages/school/evil/graphics/evil-school-animated.xml
diff --git a/gameplay/stages/schoolEvil/evil-school-bg.png b/gameplay/stages/school/evil/graphics/evil-school-bg.png
similarity index 100%
rename from gameplay/stages/schoolEvil/evil-school-bg.png
rename to gameplay/stages/school/evil/graphics/evil-school-bg.png
diff --git a/gameplay/stages/schoolEvil/evil-school-fg.png b/gameplay/stages/school/evil/graphics/evil-school-fg.png
similarity index 100%
rename from gameplay/stages/schoolEvil/evil-school-fg.png
rename to gameplay/stages/school/evil/graphics/evil-school-fg.png
diff --git a/gameplay/stages/schoolEvil/schoolEvil.hxc b/gameplay/stages/school/evil/schoolEvil.hxc
similarity index 100%
rename from gameplay/stages/schoolEvil/schoolEvil.hxc
rename to gameplay/stages/school/evil/schoolEvil.hxc
diff --git a/gameplay/stages/schoolEvil/schoolEvil.json b/gameplay/stages/school/evil/schoolEvil.json
similarity index 100%
rename from gameplay/stages/schoolEvil/schoolEvil.json
rename to gameplay/stages/school/evil/schoolEvil.json
diff --git a/gameplay/stages/spookyMansion/halloween-bg.png b/gameplay/stages/spookyMansion/default/graphics/halloween-bg.png
similarity index 100%
rename from gameplay/stages/spookyMansion/halloween-bg.png
rename to gameplay/stages/spookyMansion/default/graphics/halloween-bg.png
diff --git a/gameplay/stages/spookyMansion/halloween-bg.xml b/gameplay/stages/spookyMansion/default/graphics/halloween-bg.xml
similarity index 100%
rename from gameplay/stages/spookyMansion/halloween-bg.xml
rename to gameplay/stages/spookyMansion/default/graphics/halloween-bg.xml
diff --git a/gameplay/stages/spookyMansion/sounds/thunder-1.mp3 b/gameplay/stages/spookyMansion/default/sounds/thunder-1.mp3
similarity index 100%
rename from gameplay/stages/spookyMansion/sounds/thunder-1.mp3
rename to gameplay/stages/spookyMansion/default/sounds/thunder-1.mp3
diff --git a/gameplay/stages/spookyMansion/sounds/thunder-1.ogg b/gameplay/stages/spookyMansion/default/sounds/thunder-1.ogg
similarity index 100%
rename from gameplay/stages/spookyMansion/sounds/thunder-1.ogg
rename to gameplay/stages/spookyMansion/default/sounds/thunder-1.ogg
diff --git a/gameplay/stages/spookyMansion/sounds/thunder-2.mp3 b/gameplay/stages/spookyMansion/default/sounds/thunder-2.mp3
similarity index 100%
rename from gameplay/stages/spookyMansion/sounds/thunder-2.mp3
rename to gameplay/stages/spookyMansion/default/sounds/thunder-2.mp3
diff --git a/gameplay/stages/spookyMansion/sounds/thunder-2.ogg b/gameplay/stages/spookyMansion/default/sounds/thunder-2.ogg
similarity index 100%
rename from gameplay/stages/spookyMansion/sounds/thunder-2.ogg
rename to gameplay/stages/spookyMansion/default/sounds/thunder-2.ogg
diff --git a/gameplay/stages/spookyMansion/spookyMansion.hxc b/gameplay/stages/spookyMansion/default/spookyMansion.hxc
similarity index 100%
rename from gameplay/stages/spookyMansion/spookyMansion.hxc
rename to gameplay/stages/spookyMansion/default/spookyMansion.hxc
diff --git a/gameplay/stages/spookyMansion/spookyMansion.json b/gameplay/stages/spookyMansion/default/spookyMansion.json
similarity index 100%
rename from gameplay/stages/spookyMansion/spookyMansion.json
rename to gameplay/stages/spookyMansion/default/spookyMansion.json
diff --git a/gameplay/stages/spookyMansionErect/bg-dark.png b/gameplay/stages/spookyMansion/erect/graphics/bg-dark.png
similarity index 100%
rename from gameplay/stages/spookyMansionErect/bg-dark.png
rename to gameplay/stages/spookyMansion/erect/graphics/bg-dark.png
diff --git a/gameplay/stages/spookyMansionErect/bg-light.png b/gameplay/stages/spookyMansion/erect/graphics/bg-light.png
similarity index 100%
rename from gameplay/stages/spookyMansionErect/bg-light.png
rename to gameplay/stages/spookyMansion/erect/graphics/bg-light.png
diff --git a/gameplay/stages/spookyMansionErect/bg-trees.png b/gameplay/stages/spookyMansion/erect/graphics/bg-trees.png
similarity index 100%
rename from gameplay/stages/spookyMansionErect/bg-trees.png
rename to gameplay/stages/spookyMansion/erect/graphics/bg-trees.png
diff --git a/gameplay/stages/spookyMansionErect/bg-trees.xml b/gameplay/stages/spookyMansion/erect/graphics/bg-trees.xml
similarity index 100%
rename from gameplay/stages/spookyMansionErect/bg-trees.xml
rename to gameplay/stages/spookyMansion/erect/graphics/bg-trees.xml
diff --git a/gameplay/stages/spookyMansionErect/stairs-dark.png b/gameplay/stages/spookyMansion/erect/graphics/stairs-dark.png
similarity index 100%
rename from gameplay/stages/spookyMansionErect/stairs-dark.png
rename to gameplay/stages/spookyMansion/erect/graphics/stairs-dark.png
diff --git a/gameplay/stages/spookyMansionErect/stairs-light.png b/gameplay/stages/spookyMansion/erect/graphics/stairs-light.png
similarity index 100%
rename from gameplay/stages/spookyMansionErect/stairs-light.png
rename to gameplay/stages/spookyMansion/erect/graphics/stairs-light.png
diff --git a/gameplay/stages/spookyMansionErect/spookyMansionErect.hxc b/gameplay/stages/spookyMansion/erect/spookyMansionErect.hxc
similarity index 100%
rename from gameplay/stages/spookyMansionErect/spookyMansionErect.hxc
rename to gameplay/stages/spookyMansion/erect/spookyMansionErect.hxc
diff --git a/gameplay/stages/spookyMansionErect/spookyMansionErect.json b/gameplay/stages/spookyMansion/erect/spookyMansionErect.json
similarity index 100%
rename from gameplay/stages/spookyMansionErect/spookyMansionErect.json
rename to gameplay/stages/spookyMansion/erect/spookyMansionErect.json
diff --git a/gameplay/stages/tankmanBattlefield/TankmanSprite.hxc b/gameplay/stages/tankmanBattlefield/graphics/scripts/TankmanSprite.hxc
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/TankmanSprite.hxc
rename to gameplay/stages/tankmanBattlefield/graphics/scripts/TankmanSprite.hxc
diff --git a/gameplay/stages/tankmanBattlefield/TankmanSpriteGroup.hxc b/gameplay/stages/tankmanBattlefield/graphics/scripts/TankmanSpriteGroup.hxc
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/TankmanSpriteGroup.hxc
rename to gameplay/stages/tankmanBattlefield/graphics/scripts/TankmanSpriteGroup.hxc
diff --git a/gameplay/stages/tankmanBattlefield/smoke-left.png b/gameplay/stages/tankmanBattlefield/graphics/smoke-left.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/smoke-left.png
rename to gameplay/stages/tankmanBattlefield/graphics/smoke-left.png
diff --git a/gameplay/stages/tankmanBattlefield/smoke-left.xml b/gameplay/stages/tankmanBattlefield/graphics/smoke-left.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/smoke-left.xml
rename to gameplay/stages/tankmanBattlefield/graphics/smoke-left.xml
diff --git a/gameplay/stages/tankmanBattlefield/smoke-right.png b/gameplay/stages/tankmanBattlefield/graphics/smoke-right.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/smoke-right.png
rename to gameplay/stages/tankmanBattlefield/graphics/smoke-right.png
diff --git a/gameplay/stages/tankmanBattlefield/smoke-right.xml b/gameplay/stages/tankmanBattlefield/graphics/smoke-right.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/smoke-right.xml
rename to gameplay/stages/tankmanBattlefield/graphics/smoke-right.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-0.png b/gameplay/stages/tankmanBattlefield/graphics/tank-0.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-0.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-0.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-0.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-0.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-0.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-0.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-1.png b/gameplay/stages/tankmanBattlefield/graphics/tank-1.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-1.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-1.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-1.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-1.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-1.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-1.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-2.png b/gameplay/stages/tankmanBattlefield/graphics/tank-2.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-2.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-2.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-2.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-2.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-2.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-2.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-3.png b/gameplay/stages/tankmanBattlefield/graphics/tank-3.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-3.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-3.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-3.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-3.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-3.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-3.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-4.png b/gameplay/stages/tankmanBattlefield/graphics/tank-4.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-4.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-4.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-4.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-4.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-4.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-4.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-5.png b/gameplay/stages/tankmanBattlefield/graphics/tank-5.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-5.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-5.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-5.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-5.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-5.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-5.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-buildings.png b/gameplay/stages/tankmanBattlefield/graphics/tank-buildings.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-buildings.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-buildings.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-clouds.png b/gameplay/stages/tankmanBattlefield/graphics/tank-clouds.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-clouds.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-clouds.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-ground.png b/gameplay/stages/tankmanBattlefield/graphics/tank-ground.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-ground.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-ground.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-mountains.png b/gameplay/stages/tankmanBattlefield/graphics/tank-mountains.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-mountains.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-mountains.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-rolling.png b/gameplay/stages/tankmanBattlefield/graphics/tank-rolling.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-rolling.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-rolling.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-rolling.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-rolling.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-rolling.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-rolling.xml
diff --git a/gameplay/stages/tankmanBattlefield/tank-ruins.png b/gameplay/stages/tankmanBattlefield/graphics/tank-ruins.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-ruins.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-ruins.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-sky.png b/gameplay/stages/tankmanBattlefield/graphics/tank-sky.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-sky.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-sky.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-watchtower.png b/gameplay/stages/tankmanBattlefield/graphics/tank-watchtower.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-watchtower.png
rename to gameplay/stages/tankmanBattlefield/graphics/tank-watchtower.png
diff --git a/gameplay/stages/tankmanBattlefield/tank-watchtower.xml b/gameplay/stages/tankmanBattlefield/graphics/tank-watchtower.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tank-watchtower.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tank-watchtower.xml
diff --git a/gameplay/stages/tankmanBattlefield/tankman-killed.png b/gameplay/stages/tankmanBattlefield/graphics/tankman-killed.png
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tankman-killed.png
rename to gameplay/stages/tankmanBattlefield/graphics/tankman-killed.png
diff --git a/gameplay/stages/tankmanBattlefield/tankman-killed.xml b/gameplay/stages/tankmanBattlefield/graphics/tankman-killed.xml
similarity index 100%
rename from gameplay/stages/tankmanBattlefield/tankman-killed.xml
rename to gameplay/stages/tankmanBattlefield/graphics/tankman-killed.xml
diff --git a/ui/animation-editor/offset-editor-view.xml b/ui/editors/animation-editor/offset-editor-view.xml
similarity index 100%
rename from ui/animation-editor/offset-editor-view.xml
rename to ui/editors/animation-editor/offset-editor-view.xml
diff --git a/ui/chart-editor/artistic-expression/artistic-expression-metadata.json b/ui/editors/chart-editor/artistic-expression/artistic-expression-metadata.json
similarity index 100%
rename from ui/chart-editor/artistic-expression/artistic-expression-metadata.json
rename to ui/editors/chart-editor/artistic-expression/artistic-expression-metadata.json
diff --git a/ui/chart-editor/artistic-expression/artistic-expression.mp3 b/ui/editors/chart-editor/artistic-expression/artistic-expression.mp3
similarity index 100%
rename from ui/chart-editor/artistic-expression/artistic-expression.mp3
rename to ui/editors/chart-editor/artistic-expression/artistic-expression.mp3
diff --git a/ui/chart-editor/artistic-expression/artistic-expression.ogg b/ui/editors/chart-editor/artistic-expression/artistic-expression.ogg
similarity index 100%
rename from ui/chart-editor/artistic-expression/artistic-expression.ogg
rename to ui/editors/chart-editor/artistic-expression/artistic-expression.ogg
diff --git a/ui/chart-editor/chartingSounds/click-down.mp3 b/ui/editors/chart-editor/chartingSounds/click-down.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/click-down.mp3
rename to ui/editors/chart-editor/chartingSounds/click-down.mp3
diff --git a/ui/chart-editor/chartingSounds/click-down.ogg b/ui/editors/chart-editor/chartingSounds/click-down.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/click-down.ogg
rename to ui/editors/chart-editor/chartingSounds/click-down.ogg
diff --git a/ui/chart-editor/chartingSounds/click-up.mp3 b/ui/editors/chart-editor/chartingSounds/click-up.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/click-up.mp3
rename to ui/editors/chart-editor/chartingSounds/click-up.mp3
diff --git a/ui/chart-editor/chartingSounds/click-up.ogg b/ui/editors/chart-editor/chartingSounds/click-up.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/click-up.ogg
rename to ui/editors/chart-editor/chartingSounds/click-up.ogg
diff --git a/ui/chart-editor/chartingSounds/hitsound-opponent.mp3 b/ui/editors/chart-editor/chartingSounds/hitsound-opponent.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/hitsound-opponent.mp3
rename to ui/editors/chart-editor/chartingSounds/hitsound-opponent.mp3
diff --git a/ui/chart-editor/chartingSounds/hitsound-opponent.ogg b/ui/editors/chart-editor/chartingSounds/hitsound-opponent.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/hitsound-opponent.ogg
rename to ui/editors/chart-editor/chartingSounds/hitsound-opponent.ogg
diff --git a/ui/chart-editor/chartingSounds/hitsound-player.mp3 b/ui/editors/chart-editor/chartingSounds/hitsound-player.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/hitsound-player.mp3
rename to ui/editors/chart-editor/chartingSounds/hitsound-player.mp3
diff --git a/ui/chart-editor/chartingSounds/hitsound-player.ogg b/ui/editors/chart-editor/chartingSounds/hitsound-player.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/hitsound-player.ogg
rename to ui/editors/chart-editor/chartingSounds/hitsound-player.ogg
diff --git a/ui/chart-editor/chartingSounds/keyboard-1.mp3 b/ui/editors/chart-editor/chartingSounds/keyboard-1.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/keyboard-1.mp3
rename to ui/editors/chart-editor/chartingSounds/keyboard-1.mp3
diff --git a/ui/chart-editor/chartingSounds/keyboard-1.ogg b/ui/editors/chart-editor/chartingSounds/keyboard-1.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/keyboard-1.ogg
rename to ui/editors/chart-editor/chartingSounds/keyboard-1.ogg
diff --git a/ui/chart-editor/chartingSounds/keyboard-2.mp3 b/ui/editors/chart-editor/chartingSounds/keyboard-2.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/keyboard-2.mp3
rename to ui/editors/chart-editor/chartingSounds/keyboard-2.mp3
diff --git a/ui/chart-editor/chartingSounds/keyboard-2.ogg b/ui/editors/chart-editor/chartingSounds/keyboard-2.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/keyboard-2.ogg
rename to ui/editors/chart-editor/chartingSounds/keyboard-2.ogg
diff --git a/ui/chart-editor/chartingSounds/keyboard-3.mp3 b/ui/editors/chart-editor/chartingSounds/keyboard-3.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/keyboard-3.mp3
rename to ui/editors/chart-editor/chartingSounds/keyboard-3.mp3
diff --git a/ui/chart-editor/chartingSounds/keyboard-3.ogg b/ui/editors/chart-editor/chartingSounds/keyboard-3.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/keyboard-3.ogg
rename to ui/editors/chart-editor/chartingSounds/keyboard-3.ogg
diff --git a/ui/chart-editor/chartingSounds/metronome-1.mp3 b/ui/editors/chart-editor/chartingSounds/metronome-1.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/metronome-1.mp3
rename to ui/editors/chart-editor/chartingSounds/metronome-1.mp3
diff --git a/ui/chart-editor/chartingSounds/metronome-1.ogg b/ui/editors/chart-editor/chartingSounds/metronome-1.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/metronome-1.ogg
rename to ui/editors/chart-editor/chartingSounds/metronome-1.ogg
diff --git a/ui/chart-editor/chartingSounds/metronome-2.mp3 b/ui/editors/chart-editor/chartingSounds/metronome-2.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/metronome-2.mp3
rename to ui/editors/chart-editor/chartingSounds/metronome-2.mp3
diff --git a/ui/chart-editor/chartingSounds/metronome-2.ogg b/ui/editors/chart-editor/chartingSounds/metronome-2.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/metronome-2.ogg
rename to ui/editors/chart-editor/chartingSounds/metronome-2.ogg
diff --git a/ui/chart-editor/chartingSounds/note-erase.mp3 b/ui/editors/chart-editor/chartingSounds/note-erase.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/note-erase.mp3
rename to ui/editors/chart-editor/chartingSounds/note-erase.mp3
diff --git a/ui/chart-editor/chartingSounds/note-erase.ogg b/ui/editors/chart-editor/chartingSounds/note-erase.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/note-erase.ogg
rename to ui/editors/chart-editor/chartingSounds/note-erase.ogg
diff --git a/ui/chart-editor/chartingSounds/note-place.mp3 b/ui/editors/chart-editor/chartingSounds/note-place.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/note-place.mp3
rename to ui/editors/chart-editor/chartingSounds/note-place.mp3
diff --git a/ui/chart-editor/chartingSounds/note-place.ogg b/ui/editors/chart-editor/chartingSounds/note-place.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/note-place.ogg
rename to ui/editors/chart-editor/chartingSounds/note-place.ogg
diff --git a/ui/chart-editor/chartingSounds/stretch-1.mp3 b/ui/editors/chart-editor/chartingSounds/stretch-1.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/stretch-1.mp3
rename to ui/editors/chart-editor/chartingSounds/stretch-1.mp3
diff --git a/ui/chart-editor/chartingSounds/stretch-1.ogg b/ui/editors/chart-editor/chartingSounds/stretch-1.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/stretch-1.ogg
rename to ui/editors/chart-editor/chartingSounds/stretch-1.ogg
diff --git a/ui/chart-editor/chartingSounds/stretch-2.mp3 b/ui/editors/chart-editor/chartingSounds/stretch-2.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/stretch-2.mp3
rename to ui/editors/chart-editor/chartingSounds/stretch-2.mp3
diff --git a/ui/chart-editor/chartingSounds/stretch-2.ogg b/ui/editors/chart-editor/chartingSounds/stretch-2.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/stretch-2.ogg
rename to ui/editors/chart-editor/chartingSounds/stretch-2.ogg
diff --git a/ui/chart-editor/chartingSounds/stretch-snap.mp3 b/ui/editors/chart-editor/chartingSounds/stretch-snap.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/stretch-snap.mp3
rename to ui/editors/chart-editor/chartingSounds/stretch-snap.mp3
diff --git a/ui/chart-editor/chartingSounds/stretch-snap.ogg b/ui/editors/chart-editor/chartingSounds/stretch-snap.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/stretch-snap.ogg
rename to ui/editors/chart-editor/chartingSounds/stretch-snap.ogg
diff --git a/ui/chart-editor/chartingSounds/undo.mp3 b/ui/editors/chart-editor/chartingSounds/undo.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/undo.mp3
rename to ui/editors/chart-editor/chartingSounds/undo.mp3
diff --git a/ui/chart-editor/chartingSounds/undo.ogg b/ui/editors/chart-editor/chartingSounds/undo.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/undo.ogg
rename to ui/editors/chart-editor/chartingSounds/undo.ogg
diff --git a/ui/chart-editor/chartingSounds/window-exit.mp3 b/ui/editors/chart-editor/chartingSounds/window-exit.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/window-exit.mp3
rename to ui/editors/chart-editor/chartingSounds/window-exit.mp3
diff --git a/ui/chart-editor/chartingSounds/window-exit.ogg b/ui/editors/chart-editor/chartingSounds/window-exit.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/window-exit.ogg
rename to ui/editors/chart-editor/chartingSounds/window-exit.ogg
diff --git a/ui/chart-editor/chartingSounds/window-open.mp3 b/ui/editors/chart-editor/chartingSounds/window-open.mp3
similarity index 100%
rename from ui/chart-editor/chartingSounds/window-open.mp3
rename to ui/editors/chart-editor/chartingSounds/window-open.mp3
diff --git a/ui/chart-editor/chartingSounds/window-open.ogg b/ui/editors/chart-editor/chartingSounds/window-open.ogg
similarity index 100%
rename from ui/chart-editor/chartingSounds/window-open.ogg
rename to ui/editors/chart-editor/chartingSounds/window-open.ogg
diff --git a/ui/chart-editor/dialogs/add-difficulty.xml b/ui/editors/chart-editor/dialogs/add-difficulty.xml
similarity index 100%
rename from ui/chart-editor/dialogs/add-difficulty.xml
rename to ui/editors/chart-editor/dialogs/add-difficulty.xml
diff --git a/ui/chart-editor/dialogs/add-variation.xml b/ui/editors/chart-editor/dialogs/add-variation.xml
similarity index 100%
rename from ui/chart-editor/dialogs/add-variation.xml
rename to ui/editors/chart-editor/dialogs/add-variation.xml
diff --git a/ui/chart-editor/dialogs/backup-available.xml b/ui/editors/chart-editor/dialogs/backup-available.xml
similarity index 100%
rename from ui/chart-editor/dialogs/backup-available.xml
rename to ui/editors/chart-editor/dialogs/backup-available.xml
diff --git a/ui/chart-editor/dialogs/import-chart.xml b/ui/editors/chart-editor/dialogs/import-chart.xml
similarity index 100%
rename from ui/chart-editor/dialogs/import-chart.xml
rename to ui/editors/chart-editor/dialogs/import-chart.xml
diff --git a/ui/chart-editor/dialogs/open-chart-parts-entry.xml b/ui/editors/chart-editor/dialogs/open-chart-parts-entry.xml
similarity index 100%
rename from ui/chart-editor/dialogs/open-chart-parts-entry.xml
rename to ui/editors/chart-editor/dialogs/open-chart-parts-entry.xml
diff --git a/ui/chart-editor/dialogs/open-chart-parts.xml b/ui/editors/chart-editor/dialogs/open-chart-parts.xml
similarity index 100%
rename from ui/chart-editor/dialogs/open-chart-parts.xml
rename to ui/editors/chart-editor/dialogs/open-chart-parts.xml
diff --git a/ui/chart-editor/dialogs/song-metadata.xml b/ui/editors/chart-editor/dialogs/song-metadata.xml
similarity index 100%
rename from ui/chart-editor/dialogs/song-metadata.xml
rename to ui/editors/chart-editor/dialogs/song-metadata.xml
diff --git a/ui/chart-editor/dialogs/upload-inst.xml b/ui/editors/chart-editor/dialogs/upload-inst.xml
similarity index 100%
rename from ui/chart-editor/dialogs/upload-inst.xml
rename to ui/editors/chart-editor/dialogs/upload-inst.xml
diff --git a/ui/chart-editor/dialogs/user-guide.xml b/ui/editors/chart-editor/dialogs/user-guide.xml
similarity index 100%
rename from ui/chart-editor/dialogs/user-guide.xml
rename to ui/editors/chart-editor/dialogs/user-guide.xml
diff --git a/ui/chart-editor/events/BPMChange.png b/ui/editors/chart-editor/events/BPMChange.png
similarity index 100%
rename from ui/chart-editor/events/BPMChange.png
rename to ui/editors/chart-editor/events/BPMChange.png
diff --git a/ui/chart-editor/events/BPMChange.xml b/ui/editors/chart-editor/events/BPMChange.xml
similarity index 100%
rename from ui/chart-editor/events/BPMChange.xml
rename to ui/editors/chart-editor/events/BPMChange.xml
diff --git a/ui/chart-editor/events/Default.png b/ui/editors/chart-editor/events/Default.png
similarity index 100%
rename from ui/chart-editor/events/Default.png
rename to ui/editors/chart-editor/events/Default.png
diff --git a/ui/chart-editor/events/Default.xml b/ui/editors/chart-editor/events/Default.xml
similarity index 100%
rename from ui/chart-editor/events/Default.xml
rename to ui/editors/chart-editor/events/Default.xml
diff --git a/ui/chart-editor/events/FocusCamera.png b/ui/editors/chart-editor/events/FocusCamera.png
similarity index 100%
rename from ui/chart-editor/events/FocusCamera.png
rename to ui/editors/chart-editor/events/FocusCamera.png
diff --git a/ui/chart-editor/events/FocusCamera.xml b/ui/editors/chart-editor/events/FocusCamera.xml
similarity index 100%
rename from ui/chart-editor/events/FocusCamera.xml
rename to ui/editors/chart-editor/events/FocusCamera.xml
diff --git a/ui/chart-editor/events/PlayAnimation.png b/ui/editors/chart-editor/events/PlayAnimation.png
similarity index 100%
rename from ui/chart-editor/events/PlayAnimation.png
rename to ui/editors/chart-editor/events/PlayAnimation.png
diff --git a/ui/chart-editor/events/PlayAnimation.xml b/ui/editors/chart-editor/events/PlayAnimation.xml
similarity index 100%
rename from ui/chart-editor/events/PlayAnimation.xml
rename to ui/editors/chart-editor/events/PlayAnimation.xml
diff --git a/ui/chart-editor/maximize.png b/ui/editors/chart-editor/maximize.png
similarity index 100%
rename from ui/chart-editor/maximize.png
rename to ui/editors/chart-editor/maximize.png
diff --git a/ui/chart-editor/minimize.png b/ui/editors/chart-editor/minimize.png
similarity index 100%
rename from ui/chart-editor/minimize.png
rename to ui/editors/chart-editor/minimize.png
diff --git a/ui/chart-editor/playbar-head.png b/ui/editors/chart-editor/playbar-head.png
similarity index 100%
rename from ui/chart-editor/playbar-head.png
rename to ui/editors/chart-editor/playbar-head.png
diff --git a/ui/chart-editor/toolbox/icon-selector.xml b/ui/editors/chart-editor/toolbox/icon-selector.xml
similarity index 100%
rename from ui/chart-editor/toolbox/icon-selector.xml
rename to ui/editors/chart-editor/toolbox/icon-selector.xml
diff --git a/ui/chart-editor/toolbox/opponent-preview.xml b/ui/editors/chart-editor/toolbox/opponent-preview.xml
similarity index 100%
rename from ui/chart-editor/toolbox/opponent-preview.xml
rename to ui/editors/chart-editor/toolbox/opponent-preview.xml
diff --git a/ui/chart-editor/toolbox/player-preview.xml b/ui/editors/chart-editor/toolbox/player-preview.xml
similarity index 100%
rename from ui/chart-editor/toolbox/player-preview.xml
rename to ui/editors/chart-editor/toolbox/player-preview.xml
diff --git a/ui/chart-editor/toolbox/playtest-properties.xml b/ui/editors/chart-editor/toolbox/playtest-properties.xml
similarity index 100%
rename from ui/chart-editor/toolbox/playtest-properties.xml
rename to ui/editors/chart-editor/toolbox/playtest-properties.xml
diff --git a/ui/chart-editor/toolbox/tools.xml b/ui/editors/chart-editor/toolbox/tools.xml
similarity index 100%
rename from ui/chart-editor/toolbox/tools.xml
rename to ui/editors/chart-editor/toolbox/tools.xml
diff --git a/ui/input-offsets/sound-test.mp3 b/ui/editors/input-offsets/sound-test.mp3
similarity index 100%
rename from ui/input-offsets/sound-test.mp3
rename to ui/editors/input-offsets/sound-test.mp3
diff --git a/ui/input-offsets/spimd=test.ogg b/ui/editors/input-offsets/spimd=test.ogg
similarity index 100%
rename from ui/input-offsets/spimd=test.ogg
rename to ui/editors/input-offsets/spimd=test.ogg
diff --git a/ui/stage-editor/components/layers.xml b/ui/editors/stage-editor/components/layers.xml
similarity index 100%
rename from ui/stage-editor/components/layers.xml
rename to ui/editors/stage-editor/components/layers.xml
diff --git a/ui/stage-editor/components/menubar.xml b/ui/editors/stage-editor/components/menubar.xml
similarity index 100%
rename from ui/stage-editor/components/menubar.xml
rename to ui/editors/stage-editor/components/menubar.xml
diff --git a/ui/stage-editor/cursor-grab.png b/ui/editors/stage-editor/cursor-grab.png
similarity index 100%
rename from ui/stage-editor/cursor-grab.png
rename to ui/editors/stage-editor/cursor-grab.png
diff --git a/ui/stage-editor/cursor-grabbing.png b/ui/editors/stage-editor/cursor-grabbing.png
similarity index 100%
rename from ui/stage-editor/cursor-grabbing.png
rename to ui/editors/stage-editor/cursor-grabbing.png
diff --git a/ui/stage-editor/cursor-select.png b/ui/editors/stage-editor/cursor-select.png
similarity index 100%
rename from ui/stage-editor/cursor-select.png
rename to ui/editors/stage-editor/cursor-select.png
diff --git a/ui/stage-editor/stage-editor-view.xml b/ui/editors/stage-editor/stage-editor-view.xml
similarity index 100%
rename from ui/stage-editor/stage-editor-view.xml
rename to ui/editors/stage-editor/stage-editor-view.xml
diff --git a/ui/stage-editor/stage-temp-img.png b/ui/editors/stage-editor/stage-temp-img.png
similarity index 100%
rename from ui/stage-editor/stage-temp-img.png
rename to ui/editors/stage-editor/stage-temp-img.png
diff --git a/ui/stage-editor/toolbar-bf.png b/ui/editors/stage-editor/toolbar-bf.png
similarity index 100%
rename from ui/stage-editor/toolbar-bf.png
rename to ui/editors/stage-editor/toolbar-bf.png
diff --git a/ui/credits/credits/credits-metadata.json b/ui/misc/credits/credits/credits-metadata.json
similarity index 100%
rename from ui/credits/credits/credits-metadata.json
rename to ui/misc/credits/credits/credits-metadata.json
diff --git a/ui/cursor/cursor-cell.png b/ui/misc/cursor/cursor-cell.png
similarity index 100%
rename from ui/cursor/cursor-cell.png
rename to ui/misc/cursor/cursor-cell.png
diff --git a/ui/cursor/cursor-cross.png b/ui/misc/cursor/cursor-cross.png
similarity index 100%
rename from ui/cursor/cursor-cross.png
rename to ui/misc/cursor/cursor-cross.png
diff --git a/ui/cursor/cursor-crosshair.png b/ui/misc/cursor/cursor-crosshair.png
similarity index 100%
rename from ui/cursor/cursor-crosshair.png
rename to ui/misc/cursor/cursor-crosshair.png
diff --git a/ui/cursor/cursor-default.png b/ui/misc/cursor/cursor-default.png
similarity index 100%
rename from ui/cursor/cursor-default.png
rename to ui/misc/cursor/cursor-default.png
diff --git a/ui/cursor/cursor-eraser.png b/ui/misc/cursor/cursor-eraser.png
similarity index 100%
rename from ui/cursor/cursor-eraser.png
rename to ui/misc/cursor/cursor-eraser.png
diff --git a/ui/cursor/cursor-grabbing.png b/ui/misc/cursor/cursor-grabbing.png
similarity index 100%
rename from ui/cursor/cursor-grabbing.png
rename to ui/misc/cursor/cursor-grabbing.png
diff --git a/ui/cursor/cursor-hourglass.png b/ui/misc/cursor/cursor-hourglass.png
similarity index 100%
rename from ui/cursor/cursor-hourglass.png
rename to ui/misc/cursor/cursor-hourglass.png
diff --git a/ui/cursor/cursor-pointer.png b/ui/misc/cursor/cursor-pointer.png
similarity index 100%
rename from ui/cursor/cursor-pointer.png
rename to ui/misc/cursor/cursor-pointer.png
diff --git a/ui/cursor/cursor-scroll.png b/ui/misc/cursor/cursor-scroll.png
similarity index 100%
rename from ui/cursor/cursor-scroll.png
rename to ui/misc/cursor/cursor-scroll.png
diff --git a/ui/cursor/cursor-text-vertical.png b/ui/misc/cursor/cursor-text-vertical.png
similarity index 100%
rename from ui/cursor/cursor-text-vertical.png
rename to ui/misc/cursor/cursor-text-vertical.png
diff --git a/ui/cursor/cursor-text.png b/ui/misc/cursor/cursor-text.png
similarity index 100%
rename from ui/cursor/cursor-text.png
rename to ui/misc/cursor/cursor-text.png
diff --git a/ui/cursor/cursor-zoom-in.png b/ui/misc/cursor/cursor-zoom-in.png
similarity index 100%
rename from ui/cursor/cursor-zoom-in.png
rename to ui/misc/cursor/cursor-zoom-in.png
diff --git a/ui/cursor/cursor-zoom-out.png b/ui/misc/cursor/cursor-zoom-out.png
similarity index 100%
rename from ui/cursor/cursor-zoom-out.png
rename to ui/misc/cursor/cursor-zoom-out.png
diff --git a/ui/fonts/5by7-bold.ttf b/ui/misc/fonts/5by7-bold.ttf
similarity index 100%
rename from ui/fonts/5by7-bold.ttf
rename to ui/misc/fonts/5by7-bold.ttf
diff --git a/ui/fonts/5by7.ttf b/ui/misc/fonts/5by7.ttf
similarity index 100%
rename from ui/fonts/5by7.ttf
rename to ui/misc/fonts/5by7.ttf
diff --git a/ui/fonts/bold.fla b/ui/misc/fonts/bold.fla
similarity index 100%
rename from ui/fonts/bold.fla
rename to ui/misc/fonts/bold.fla
diff --git a/ui/fonts/bold.png b/ui/misc/fonts/bold.png
similarity index 100%
rename from ui/fonts/bold.png
rename to ui/misc/fonts/bold.png
diff --git a/ui/fonts/bold.xml b/ui/misc/fonts/bold.xml
similarity index 100%
rename from ui/fonts/bold.xml
rename to ui/misc/fonts/bold.xml
diff --git a/ui/fonts/default.fla b/ui/misc/fonts/default.fla
similarity index 100%
rename from ui/fonts/default.fla
rename to ui/misc/fonts/default.fla
diff --git a/ui/fonts/default.png b/ui/misc/fonts/default.png
similarity index 100%
rename from ui/fonts/default.png
rename to ui/misc/fonts/default.png
diff --git a/ui/fonts/default.xml b/ui/misc/fonts/default.xml
similarity index 100%
rename from ui/fonts/default.xml
rename to ui/misc/fonts/default.xml
diff --git a/ui/fonts/ds-digital-bold.ttf b/ui/misc/fonts/ds-digital-bold.ttf
similarity index 100%
rename from ui/fonts/ds-digital-bold.ttf
rename to ui/misc/fonts/ds-digital-bold.ttf
diff --git a/ui/fonts/ds-digital-bolditalic.ttf b/ui/misc/fonts/ds-digital-bolditalic.ttf
similarity index 100%
rename from ui/fonts/ds-digital-bolditalic.ttf
rename to ui/misc/fonts/ds-digital-bolditalic.ttf
diff --git a/ui/fonts/ds-digital-italic.ttf b/ui/misc/fonts/ds-digital-italic.ttf
similarity index 100%
rename from ui/fonts/ds-digital-italic.ttf
rename to ui/misc/fonts/ds-digital-italic.ttf
diff --git a/ui/fonts/ds-digital.ttf b/ui/misc/fonts/ds-digital.ttf
similarity index 100%
rename from ui/fonts/ds-digital.ttf
rename to ui/misc/fonts/ds-digital.ttf
diff --git a/ui/fonts/freeplay-clear.png b/ui/misc/fonts/freeplay-clear.png
similarity index 100%
rename from ui/fonts/freeplay-clear.png
rename to ui/misc/fonts/freeplay-clear.png
diff --git a/ui/fonts/freeplay-clear.xml b/ui/misc/fonts/freeplay-clear.xml
similarity index 100%
rename from ui/fonts/freeplay-clear.xml
rename to ui/misc/fonts/freeplay-clear.xml
diff --git a/ui/fonts/inconsolata-black.ttf b/ui/misc/fonts/inconsolata-black.ttf
similarity index 100%
rename from ui/fonts/inconsolata-black.ttf
rename to ui/misc/fonts/inconsolata-black.ttf
diff --git a/ui/fonts/inconsolata-bold.ttf b/ui/misc/fonts/inconsolata-bold.ttf
similarity index 100%
rename from ui/fonts/inconsolata-bold.ttf
rename to ui/misc/fonts/inconsolata-bold.ttf
diff --git a/ui/fonts/inconsolata-extrabold.ttf b/ui/misc/fonts/inconsolata-extrabold.ttf
similarity index 100%
rename from ui/fonts/inconsolata-extrabold.ttf
rename to ui/misc/fonts/inconsolata-extrabold.ttf
diff --git a/ui/fonts/inconsolata-extralight.ttf b/ui/misc/fonts/inconsolata-extralight.ttf
similarity index 100%
rename from ui/fonts/inconsolata-extralight.ttf
rename to ui/misc/fonts/inconsolata-extralight.ttf
diff --git a/ui/fonts/inconsolata-medium.ttf b/ui/misc/fonts/inconsolata-medium.ttf
similarity index 100%
rename from ui/fonts/inconsolata-medium.ttf
rename to ui/misc/fonts/inconsolata-medium.ttf
diff --git a/ui/fonts/inconsolata-regular.ttf b/ui/misc/fonts/inconsolata-regular.ttf
similarity index 100%
rename from ui/fonts/inconsolata-regular.ttf
rename to ui/misc/fonts/inconsolata-regular.ttf
diff --git a/ui/fonts/inconsolata-semibold.ttf b/ui/misc/fonts/inconsolata-semibold.ttf
similarity index 100%
rename from ui/fonts/inconsolata-semibold.ttf
rename to ui/misc/fonts/inconsolata-semibold.ttf
diff --git a/ui/fonts/ofl.txt b/ui/misc/fonts/ofl.txt
similarity index 100%
rename from ui/fonts/ofl.txt
rename to ui/misc/fonts/ofl.txt
diff --git a/ui/fonts/pixel.otf b/ui/misc/fonts/pixel.otf
similarity index 100%
rename from ui/fonts/pixel.otf
rename to ui/misc/fonts/pixel.otf
diff --git a/ui/fonts/quantico-bold.ttf b/ui/misc/fonts/quantico-bold.ttf
similarity index 100%
rename from ui/fonts/quantico-bold.ttf
rename to ui/misc/fonts/quantico-bold.ttf
diff --git a/ui/fonts/quantico-bolditalic.ttf b/ui/misc/fonts/quantico-bolditalic.ttf
similarity index 100%
rename from ui/fonts/quantico-bolditalic.ttf
rename to ui/misc/fonts/quantico-bolditalic.ttf
diff --git a/ui/fonts/quantico-italic.ttf b/ui/misc/fonts/quantico-italic.ttf
similarity index 100%
rename from ui/fonts/quantico-italic.ttf
rename to ui/misc/fonts/quantico-italic.ttf
diff --git a/ui/fonts/quantico-regular.ttf b/ui/misc/fonts/quantico-regular.ttf
similarity index 100%
rename from ui/fonts/quantico-regular.ttf
rename to ui/misc/fonts/quantico-regular.ttf
diff --git a/ui/fonts/tardling.png b/ui/misc/fonts/tardling.png
similarity index 100%
rename from ui/fonts/tardling.png
rename to ui/misc/fonts/tardling.png
diff --git a/ui/fonts/vcr.ttf b/ui/misc/fonts/vcr.ttf
similarity index 100%
rename from ui/fonts/vcr.ttf
rename to ui/misc/fonts/vcr.ttf
diff --git a/ui/loading/funkay.png b/ui/misc/loading/funkay.png
similarity index 100%
rename from ui/loading/funkay.png
rename to ui/misc/loading/funkay.png
diff --git a/ui/loading/stickers/sounds/key-click-1.mp3 b/ui/misc/loading/stickers/sounds/key-click-1.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-1.mp3
rename to ui/misc/loading/stickers/sounds/key-click-1.mp3
diff --git a/ui/loading/stickers/sounds/key-click-1.ogg b/ui/misc/loading/stickers/sounds/key-click-1.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-1.ogg
rename to ui/misc/loading/stickers/sounds/key-click-1.ogg
diff --git a/ui/loading/stickers/sounds/key-click-2.mp3 b/ui/misc/loading/stickers/sounds/key-click-2.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-2.mp3
rename to ui/misc/loading/stickers/sounds/key-click-2.mp3
diff --git a/ui/loading/stickers/sounds/key-click-2.ogg b/ui/misc/loading/stickers/sounds/key-click-2.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-2.ogg
rename to ui/misc/loading/stickers/sounds/key-click-2.ogg
diff --git a/ui/loading/stickers/sounds/key-click-3.mp3 b/ui/misc/loading/stickers/sounds/key-click-3.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-3.mp3
rename to ui/misc/loading/stickers/sounds/key-click-3.mp3
diff --git a/ui/loading/stickers/sounds/key-click-3.ogg b/ui/misc/loading/stickers/sounds/key-click-3.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-3.ogg
rename to ui/misc/loading/stickers/sounds/key-click-3.ogg
diff --git a/ui/loading/stickers/sounds/key-click-4.mp3 b/ui/misc/loading/stickers/sounds/key-click-4.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-4.mp3
rename to ui/misc/loading/stickers/sounds/key-click-4.mp3
diff --git a/ui/loading/stickers/sounds/key-click-4.ogg b/ui/misc/loading/stickers/sounds/key-click-4.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-4.ogg
rename to ui/misc/loading/stickers/sounds/key-click-4.ogg
diff --git a/ui/loading/stickers/sounds/key-click-5.mp3 b/ui/misc/loading/stickers/sounds/key-click-5.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-5.mp3
rename to ui/misc/loading/stickers/sounds/key-click-5.mp3
diff --git a/ui/loading/stickers/sounds/key-click-5.ogg b/ui/misc/loading/stickers/sounds/key-click-5.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-5.ogg
rename to ui/misc/loading/stickers/sounds/key-click-5.ogg
diff --git a/ui/loading/stickers/sounds/key-click-6.mp3 b/ui/misc/loading/stickers/sounds/key-click-6.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-6.mp3
rename to ui/misc/loading/stickers/sounds/key-click-6.mp3
diff --git a/ui/loading/stickers/sounds/key-click-6.ogg b/ui/misc/loading/stickers/sounds/key-click-6.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-6.ogg
rename to ui/misc/loading/stickers/sounds/key-click-6.ogg
diff --git a/ui/loading/stickers/sounds/key-click-7.mp3 b/ui/misc/loading/stickers/sounds/key-click-7.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-7.mp3
rename to ui/misc/loading/stickers/sounds/key-click-7.mp3
diff --git a/ui/loading/stickers/sounds/key-click-7.ogg b/ui/misc/loading/stickers/sounds/key-click-7.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-7.ogg
rename to ui/misc/loading/stickers/sounds/key-click-7.ogg
diff --git a/ui/loading/stickers/sounds/key-click-8.mp3 b/ui/misc/loading/stickers/sounds/key-click-8.mp3
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-8.mp3
rename to ui/misc/loading/stickers/sounds/key-click-8.mp3
diff --git a/ui/loading/stickers/sounds/key-click-8.ogg b/ui/misc/loading/stickers/sounds/key-click-8.ogg
similarity index 100%
rename from ui/loading/stickers/sounds/key-click-8.ogg
rename to ui/misc/loading/stickers/sounds/key-click-8.ogg
diff --git a/ui/loading/stickers/stickers-set-1/sticker-bf-1.png b/ui/misc/loading/stickers/stickers-set-1/sticker-bf-1.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-bf-1.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-bf-1.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-bf-2.png b/ui/misc/loading/stickers/stickers-set-1/sticker-bf-2.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-bf-2.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-bf-2.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-bf-3.png b/ui/misc/loading/stickers/stickers-set-1/sticker-bf-3.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-bf-3.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-bf-3.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-dad-1.png b/ui/misc/loading/stickers/stickers-set-1/sticker-dad-1.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-dad-1.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-dad-1.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-dad-2.png b/ui/misc/loading/stickers/stickers-set-1/sticker-dad-2.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-dad-2.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-dad-2.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-dad-3.png b/ui/misc/loading/stickers/stickers-set-1/sticker-dad-3.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-dad-3.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-dad-3.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-gf-1.png b/ui/misc/loading/stickers/stickers-set-1/sticker-gf-1.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-gf-1.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-gf-1.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-gf-2.png b/ui/misc/loading/stickers/stickers-set-1/sticker-gf-2.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-gf-2.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-gf-2.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-gf-3.png b/ui/misc/loading/stickers/stickers-set-1/sticker-gf-3.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-gf-3.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-gf-3.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-mom-1.png b/ui/misc/loading/stickers/stickers-set-1/sticker-mom-1.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-mom-1.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-mom-1.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-mom-2.png b/ui/misc/loading/stickers/stickers-set-1/sticker-mom-2.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-mom-2.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-mom-2.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-mom-3.png b/ui/misc/loading/stickers/stickers-set-1/sticker-mom-3.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-mom-3.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-mom-3.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-monster-1.png b/ui/misc/loading/stickers/stickers-set-1/sticker-monster-1.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-monster-1.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-monster-1.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-monster-2.png b/ui/misc/loading/stickers/stickers-set-1/sticker-monster-2.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-monster-2.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-monster-2.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-monster-3.png b/ui/misc/loading/stickers/stickers-set-1/sticker-monster-3.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-monster-3.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-monster-3.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-pico-1.png b/ui/misc/loading/stickers/stickers-set-1/sticker-pico-1.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-pico-1.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-pico-1.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-pico-2.png b/ui/misc/loading/stickers/stickers-set-1/sticker-pico-2.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-pico-2.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-pico-2.png
diff --git a/ui/loading/stickers/stickers-set-1/sticker-pico-3.png b/ui/misc/loading/stickers/stickers-set-1/sticker-pico-3.png
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/sticker-pico-3.png
rename to ui/misc/loading/stickers/stickers-set-1/sticker-pico-3.png
diff --git a/ui/loading/stickers/stickers-set-1/stickers.json b/ui/misc/loading/stickers/stickers-set-1/stickers.json
similarity index 100%
rename from ui/loading/stickers/stickers-set-1/stickers.json
rename to ui/misc/loading/stickers/stickers-set-1/stickers.json
diff --git a/ui/shaders/AddColorShader.hxc b/ui/misc/shaders/AddColorShader.hxc
similarity index 100%
rename from ui/shaders/AddColorShader.hxc
rename to ui/misc/shaders/AddColorShader.hxc
diff --git a/ui/shaders/BuildingEffectShader.hxc b/ui/misc/shaders/BuildingEffectShader.hxc
similarity index 100%
rename from ui/shaders/BuildingEffectShader.hxc
rename to ui/misc/shaders/BuildingEffectShader.hxc
diff --git a/ui/shaders/DarkenColorShader.hxc b/ui/misc/shaders/DarkenColorShader.hxc
similarity index 100%
rename from ui/shaders/DarkenColorShader.hxc
rename to ui/misc/shaders/DarkenColorShader.hxc
diff --git a/ui/shaders/InvertColorShader.hxc b/ui/misc/shaders/InvertColorShader.hxc
similarity index 100%
rename from ui/shaders/InvertColorShader.hxc
rename to ui/misc/shaders/InvertColorShader.hxc
diff --git a/ui/shaders/MultiplyColorShader.hxc b/ui/misc/shaders/MultiplyColorShader.hxc
similarity index 100%
rename from ui/shaders/MultiplyColorShader.hxc
rename to ui/misc/shaders/MultiplyColorShader.hxc
diff --git a/ui/shaders/SubtractColorShader.hxc b/ui/misc/shaders/SubtractColorShader.hxc
similarity index 100%
rename from ui/shaders/SubtractColorShader.hxc
rename to ui/misc/shaders/SubtractColorShader.hxc
diff --git a/ui/shaders/add-color.frag b/ui/misc/shaders/add-color.frag
similarity index 100%
rename from ui/shaders/add-color.frag
rename to ui/misc/shaders/add-color.frag
diff --git a/ui/shaders/adjust-color.frag b/ui/misc/shaders/adjust-color.frag
similarity index 100%
rename from ui/shaders/adjust-color.frag
rename to ui/misc/shaders/adjust-color.frag
diff --git a/ui/shaders/blend-modes.frag b/ui/misc/shaders/blend-modes.frag
similarity index 100%
rename from ui/shaders/blend-modes.frag
rename to ui/misc/shaders/blend-modes.frag
diff --git a/ui/shaders/building.frag b/ui/misc/shaders/building.frag
similarity index 100%
rename from ui/shaders/building.frag
rename to ui/misc/shaders/building.frag
diff --git a/ui/shaders/custom-blend.frag b/ui/misc/shaders/custom-blend.frag
similarity index 100%
rename from ui/shaders/custom-blend.frag
rename to ui/misc/shaders/custom-blend.frag
diff --git a/ui/shaders/darken-color.frag b/ui/misc/shaders/darken-color.frag
similarity index 100%
rename from ui/shaders/darken-color.frag
rename to ui/misc/shaders/darken-color.frag
diff --git a/ui/shaders/grayscale.frag b/ui/misc/shaders/grayscale.frag
similarity index 100%
rename from ui/shaders/grayscale.frag
rename to ui/misc/shaders/grayscale.frag
diff --git a/ui/shaders/guassian-blur.frag b/ui/misc/shaders/guassian-blur.frag
similarity index 100%
rename from ui/shaders/guassian-blur.frag
rename to ui/misc/shaders/guassian-blur.frag
diff --git a/ui/shaders/hsv.frag b/ui/misc/shaders/hsv.frag
similarity index 100%
rename from ui/shaders/hsv.frag
rename to ui/misc/shaders/hsv.frag
diff --git a/ui/shaders/inverse-dots.frag b/ui/misc/shaders/inverse-dots.frag
similarity index 100%
rename from ui/shaders/inverse-dots.frag
rename to ui/misc/shaders/inverse-dots.frag
diff --git a/ui/shaders/invert-color.frag b/ui/misc/shaders/invert-color.frag
similarity index 100%
rename from ui/shaders/invert-color.frag
rename to ui/misc/shaders/invert-color.frag
diff --git a/ui/shaders/mosaic.frag b/ui/misc/shaders/mosaic.frag
similarity index 100%
rename from ui/shaders/mosaic.frag
rename to ui/misc/shaders/mosaic.frag
diff --git a/ui/shaders/multiply-color.frag b/ui/misc/shaders/multiply-color.frag
similarity index 100%
rename from ui/shaders/multiply-color.frag
rename to ui/misc/shaders/multiply-color.frag
diff --git a/ui/shaders/pixel.frag b/ui/misc/shaders/pixel.frag
similarity index 100%
rename from ui/shaders/pixel.frag
rename to ui/misc/shaders/pixel.frag
diff --git a/ui/shaders/puddle.frag b/ui/misc/shaders/puddle.frag
similarity index 100%
rename from ui/shaders/puddle.frag
rename to ui/misc/shaders/puddle.frag
diff --git a/ui/shaders/rain.frag b/ui/misc/shaders/rain.frag
similarity index 100%
rename from ui/shaders/rain.frag
rename to ui/misc/shaders/rain.frag
diff --git a/ui/shaders/sepia.frag b/ui/misc/shaders/sepia.frag
similarity index 100%
rename from ui/shaders/sepia.frag
rename to ui/misc/shaders/sepia.frag
diff --git a/ui/shaders/subtract-color.frag b/ui/misc/shaders/subtract-color.frag
similarity index 100%
rename from ui/shaders/subtract-color.frag
rename to ui/misc/shaders/subtract-color.frag
diff --git a/ui/shaders/wiggle.frag b/ui/misc/shaders/wiggle.frag
similarity index 100%
rename from ui/shaders/wiggle.frag
rename to ui/misc/shaders/wiggle.frag
diff --git a/ui/soundtray/bars-01.png b/ui/misc/soundtray/bars-01.png
similarity index 100%
rename from ui/soundtray/bars-01.png
rename to ui/misc/soundtray/bars-01.png
diff --git a/ui/soundtray/bars-02.png b/ui/misc/soundtray/bars-02.png
similarity index 100%
rename from ui/soundtray/bars-02.png
rename to ui/misc/soundtray/bars-02.png
diff --git a/ui/soundtray/bars-03.png b/ui/misc/soundtray/bars-03.png
similarity index 100%
rename from ui/soundtray/bars-03.png
rename to ui/misc/soundtray/bars-03.png
diff --git a/ui/soundtray/bars-04.png b/ui/misc/soundtray/bars-04.png
similarity index 100%
rename from ui/soundtray/bars-04.png
rename to ui/misc/soundtray/bars-04.png
diff --git a/ui/soundtray/bars-05.png b/ui/misc/soundtray/bars-05.png
similarity index 100%
rename from ui/soundtray/bars-05.png
rename to ui/misc/soundtray/bars-05.png
diff --git a/ui/soundtray/bars-06.png b/ui/misc/soundtray/bars-06.png
similarity index 100%
rename from ui/soundtray/bars-06.png
rename to ui/misc/soundtray/bars-06.png
diff --git a/ui/soundtray/bars-07.png b/ui/misc/soundtray/bars-07.png
similarity index 100%
rename from ui/soundtray/bars-07.png
rename to ui/misc/soundtray/bars-07.png
diff --git a/ui/soundtray/bars-08.png b/ui/misc/soundtray/bars-08.png
similarity index 100%
rename from ui/soundtray/bars-08.png
rename to ui/misc/soundtray/bars-08.png
diff --git a/ui/soundtray/bars-09.png b/ui/misc/soundtray/bars-09.png
similarity index 100%
rename from ui/soundtray/bars-09.png
rename to ui/misc/soundtray/bars-09.png
diff --git a/ui/soundtray/bars-10.png b/ui/misc/soundtray/bars-10.png
similarity index 100%
rename from ui/soundtray/bars-10.png
rename to ui/misc/soundtray/bars-10.png
diff --git a/ui/soundtray/volume-box.png b/ui/misc/soundtray/volume-box.png
similarity index 100%
rename from ui/soundtray/volume-box.png
rename to ui/misc/soundtray/volume-box.png
diff --git a/ui/soundtray/volume-down.mp3 b/ui/misc/soundtray/volume-down.mp3
similarity index 100%
rename from ui/soundtray/volume-down.mp3
rename to ui/misc/soundtray/volume-down.mp3
diff --git a/ui/soundtray/volume-down.ogg b/ui/misc/soundtray/volume-down.ogg
similarity index 100%
rename from ui/soundtray/volume-down.ogg
rename to ui/misc/soundtray/volume-down.ogg
diff --git a/ui/soundtray/volume-max.mp3 b/ui/misc/soundtray/volume-max.mp3
similarity index 100%
rename from ui/soundtray/volume-max.mp3
rename to ui/misc/soundtray/volume-max.mp3
diff --git a/ui/soundtray/volume-max.ogg b/ui/misc/soundtray/volume-max.ogg
similarity index 100%
rename from ui/soundtray/volume-max.ogg
rename to ui/misc/soundtray/volume-max.ogg
diff --git a/ui/soundtray/volume-up.mp3 b/ui/misc/soundtray/volume-up.mp3
similarity index 100%
rename from ui/soundtray/volume-up.mp3
rename to ui/misc/soundtray/volume-up.mp3
diff --git a/ui/soundtray/volume-up.ogg b/ui/misc/soundtray/volume-up.ogg
similarity index 100%
rename from ui/soundtray/volume-up.ogg
rename to ui/misc/soundtray/volume-up.ogg
diff --git a/ui/character-select/characters/bf/Animation.json b/ui/states/character-select/characters/bf/Animation.json
similarity index 100%
rename from ui/character-select/characters/bf/Animation.json
rename to ui/states/character-select/characters/bf/Animation.json
diff --git a/ui/character-select/characters/bf/spritemap1.json b/ui/states/character-select/characters/bf/spritemap1.json
similarity index 100%
rename from ui/character-select/characters/bf/spritemap1.json
rename to ui/states/character-select/characters/bf/spritemap1.json
diff --git a/ui/character-select/characters/bf/spritemap1.png b/ui/states/character-select/characters/bf/spritemap1.png
similarity index 100%
rename from ui/character-select/characters/bf/spritemap1.png
rename to ui/states/character-select/characters/bf/spritemap1.png
diff --git a/ui/character-select/characters/gf/Animation.json b/ui/states/character-select/characters/gf/Animation.json
similarity index 100%
rename from ui/character-select/characters/gf/Animation.json
rename to ui/states/character-select/characters/gf/Animation.json
diff --git a/ui/character-select/characters/gf/In.txt b/ui/states/character-select/characters/gf/In.txt
similarity index 100%
rename from ui/character-select/characters/gf/In.txt
rename to ui/states/character-select/characters/gf/In.txt
diff --git a/ui/character-select/characters/gf/Out.txt b/ui/states/character-select/characters/gf/Out.txt
similarity index 100%
rename from ui/character-select/characters/gf/Out.txt
rename to ui/states/character-select/characters/gf/Out.txt
diff --git a/ui/character-select/characters/gf/spritemap1.json b/ui/states/character-select/characters/gf/spritemap1.json
similarity index 100%
rename from ui/character-select/characters/gf/spritemap1.json
rename to ui/states/character-select/characters/gf/spritemap1.json
diff --git a/ui/character-select/characters/gf/spritemap1.png b/ui/states/character-select/characters/gf/spritemap1.png
similarity index 100%
rename from ui/character-select/characters/gf/spritemap1.png
rename to ui/states/character-select/characters/gf/spritemap1.png
diff --git a/ui/character-select/characters/locked/Animation.json b/ui/states/character-select/characters/locked/Animation.json
similarity index 100%
rename from ui/character-select/characters/locked/Animation.json
rename to ui/states/character-select/characters/locked/Animation.json
diff --git a/ui/character-select/characters/locked/spritemap1.json b/ui/states/character-select/characters/locked/spritemap1.json
similarity index 100%
rename from ui/character-select/characters/locked/spritemap1.json
rename to ui/states/character-select/characters/locked/spritemap1.json
diff --git a/ui/character-select/characters/locked/spritemap1.png b/ui/states/character-select/characters/locked/spritemap1.png
similarity index 100%
rename from ui/character-select/characters/locked/spritemap1.png
rename to ui/states/character-select/characters/locked/spritemap1.png
diff --git a/ui/character-select/characters/nametag-bf.png b/ui/states/character-select/characters/nametag-bf.png
similarity index 100%
rename from ui/character-select/characters/nametag-bf.png
rename to ui/states/character-select/characters/nametag-bf.png
diff --git a/ui/character-select/characters/nametag-locked.png b/ui/states/character-select/characters/nametag-locked.png
similarity index 100%
rename from ui/character-select/characters/nametag-locked.png
rename to ui/states/character-select/characters/nametag-locked.png
diff --git a/ui/character-select/characters/nametag-pico.png b/ui/states/character-select/characters/nametag-pico.png
similarity index 100%
rename from ui/character-select/characters/nametag-pico.png
rename to ui/states/character-select/characters/nametag-pico.png
diff --git a/ui/character-select/characters/nene/Animation.json b/ui/states/character-select/characters/nene/Animation.json
similarity index 100%
rename from ui/character-select/characters/nene/Animation.json
rename to ui/states/character-select/characters/nene/Animation.json
diff --git a/ui/character-select/characters/nene/In.txt b/ui/states/character-select/characters/nene/In.txt
similarity index 100%
rename from ui/character-select/characters/nene/In.txt
rename to ui/states/character-select/characters/nene/In.txt
diff --git a/ui/character-select/characters/nene/Out.txt b/ui/states/character-select/characters/nene/Out.txt
similarity index 100%
rename from ui/character-select/characters/nene/Out.txt
rename to ui/states/character-select/characters/nene/Out.txt
diff --git a/ui/character-select/characters/nene/spritemap1.json b/ui/states/character-select/characters/nene/spritemap1.json
similarity index 100%
rename from ui/character-select/characters/nene/spritemap1.json
rename to ui/states/character-select/characters/nene/spritemap1.json
diff --git a/ui/character-select/characters/nene/spritemap1.png b/ui/states/character-select/characters/nene/spritemap1.png
similarity index 100%
rename from ui/character-select/characters/nene/spritemap1.png
rename to ui/states/character-select/characters/nene/spritemap1.png
diff --git a/ui/character-select/characters/pico/Animation.json b/ui/states/character-select/characters/pico/Animation.json
similarity index 100%
rename from ui/character-select/characters/pico/Animation.json
rename to ui/states/character-select/characters/pico/Animation.json
diff --git a/ui/character-select/characters/pico/spritemap1.json b/ui/states/character-select/characters/pico/spritemap1.json
similarity index 100%
rename from ui/character-select/characters/pico/spritemap1.json
rename to ui/states/character-select/characters/pico/spritemap1.json
diff --git a/ui/character-select/characters/pico/spritemap1.png b/ui/states/character-select/characters/pico/spritemap1.png
similarity index 100%
rename from ui/character-select/characters/pico/spritemap1.png
rename to ui/states/character-select/characters/pico/spritemap1.png
diff --git a/ui/character-select/interface/bar-thing/Animation.json b/ui/states/character-select/interface/bar-thing/Animation.json
similarity index 100%
rename from ui/character-select/interface/bar-thing/Animation.json
rename to ui/states/character-select/interface/bar-thing/Animation.json
diff --git a/ui/character-select/interface/bar-thing/spritemap1.json b/ui/states/character-select/interface/bar-thing/spritemap1.json
similarity index 100%
rename from ui/character-select/interface/bar-thing/spritemap1.json
rename to ui/states/character-select/interface/bar-thing/spritemap1.json
diff --git a/ui/character-select/interface/bar-thing/spritemap1.png b/ui/states/character-select/interface/bar-thing/spritemap1.png
similarity index 100%
rename from ui/character-select/interface/bar-thing/spritemap1.png
rename to ui/states/character-select/interface/bar-thing/spritemap1.png
diff --git a/ui/character-select/interface/char-light.png b/ui/states/character-select/interface/char-light.png
similarity index 100%
rename from ui/character-select/interface/char-light.png
rename to ui/states/character-select/interface/char-light.png
diff --git a/ui/character-select/interface/char-select-bg.png b/ui/states/character-select/interface/char-select-bg.png
similarity index 100%
rename from ui/character-select/interface/char-select-bg.png
rename to ui/states/character-select/interface/char-select-bg.png
diff --git a/ui/character-select/interface/char-select-stage.png b/ui/states/character-select/interface/char-select-stage.png
similarity index 100%
rename from ui/character-select/interface/char-select-stage.png
rename to ui/states/character-select/interface/char-select-stage.png
diff --git a/ui/character-select/interface/char-select-stage.xml b/ui/states/character-select/interface/char-select-stage.xml
similarity index 100%
rename from ui/character-select/interface/char-select-stage.xml
rename to ui/states/character-select/interface/char-select-stage.xml
diff --git a/ui/character-select/interface/char-selector-confirm.png b/ui/states/character-select/interface/char-selector-confirm.png
similarity index 100%
rename from ui/character-select/interface/char-selector-confirm.png
rename to ui/states/character-select/interface/char-selector-confirm.png
diff --git a/ui/character-select/interface/char-selector-confirm.xml b/ui/states/character-select/interface/char-selector-confirm.xml
similarity index 100%
rename from ui/character-select/interface/char-selector-confirm.xml
rename to ui/states/character-select/interface/char-selector-confirm.xml
diff --git a/ui/character-select/interface/char-selector-denied.png b/ui/states/character-select/interface/char-selector-denied.png
similarity index 100%
rename from ui/character-select/interface/char-selector-denied.png
rename to ui/states/character-select/interface/char-selector-denied.png
diff --git a/ui/character-select/interface/char-selector-denied.xml b/ui/states/character-select/interface/char-selector-denied.xml
similarity index 100%
rename from ui/character-select/interface/char-selector-denied.xml
rename to ui/states/character-select/interface/char-selector-denied.xml
diff --git a/ui/character-select/interface/char-selector.png b/ui/states/character-select/interface/char-selector.png
similarity index 100%
rename from ui/character-select/interface/char-selector.png
rename to ui/states/character-select/interface/char-selector.png
diff --git a/ui/character-select/interface/choose-your-dipshit.png b/ui/states/character-select/interface/choose-your-dipshit.png
similarity index 100%
rename from ui/character-select/interface/choose-your-dipshit.png
rename to ui/states/character-select/interface/choose-your-dipshit.png
diff --git a/ui/character-select/interface/crowd/Animation.json b/ui/states/character-select/interface/crowd/Animation.json
similarity index 100%
rename from ui/character-select/interface/crowd/Animation.json
rename to ui/states/character-select/interface/crowd/Animation.json
diff --git a/ui/character-select/interface/crowd/spritemap1.json b/ui/states/character-select/interface/crowd/spritemap1.json
similarity index 100%
rename from ui/character-select/interface/crowd/spritemap1.json
rename to ui/states/character-select/interface/crowd/spritemap1.json
diff --git a/ui/character-select/interface/crowd/spritemap1.png b/ui/states/character-select/interface/crowd/spritemap1.png
similarity index 100%
rename from ui/character-select/interface/crowd/spritemap1.png
rename to ui/states/character-select/interface/crowd/spritemap1.png
diff --git a/ui/character-select/interface/curtains.png b/ui/states/character-select/interface/curtains.png
similarity index 100%
rename from ui/character-select/interface/curtains.png
rename to ui/states/character-select/interface/curtains.png
diff --git a/ui/character-select/interface/dipshit-backing.png b/ui/states/character-select/interface/dipshit-backing.png
similarity index 100%
rename from ui/character-select/interface/dipshit-backing.png
rename to ui/states/character-select/interface/dipshit-backing.png
diff --git a/ui/character-select/interface/dipshit-backing.xml b/ui/states/character-select/interface/dipshit-backing.xml
similarity index 100%
rename from ui/character-select/interface/dipshit-backing.xml
rename to ui/states/character-select/interface/dipshit-backing.xml
diff --git a/ui/character-select/interface/dipshit-blur.png b/ui/states/character-select/interface/dipshit-blur.png
similarity index 100%
rename from ui/character-select/interface/dipshit-blur.png
rename to ui/states/character-select/interface/dipshit-blur.png
diff --git a/ui/character-select/interface/dipshit-blur.xml b/ui/states/character-select/interface/dipshit-blur.xml
similarity index 100%
rename from ui/character-select/interface/dipshit-blur.xml
rename to ui/states/character-select/interface/dipshit-blur.xml
diff --git a/ui/character-select/interface/foreground-blur.png b/ui/states/character-select/interface/foreground-blur.png
similarity index 100%
rename from ui/character-select/interface/foreground-blur.png
rename to ui/states/character-select/interface/foreground-blur.png
diff --git a/ui/character-select/interface/icon-bop/iconBopInfo.txt b/ui/states/character-select/interface/icon-bop/iconBopInfo.txt
similarity index 100%
rename from ui/character-select/interface/icon-bop/iconBopInfo.txt
rename to ui/states/character-select/interface/icon-bop/iconBopInfo.txt
diff --git a/ui/character-select/interface/lock/Animation.json b/ui/states/character-select/interface/lock/Animation.json
similarity index 100%
rename from ui/character-select/interface/lock/Animation.json
rename to ui/states/character-select/interface/lock/Animation.json
diff --git a/ui/character-select/interface/lock/spritemap1.json b/ui/states/character-select/interface/lock/spritemap1.json
similarity index 100%
rename from ui/character-select/interface/lock/spritemap1.json
rename to ui/states/character-select/interface/lock/spritemap1.json
diff --git a/ui/character-select/interface/lock/spritemap1.png b/ui/states/character-select/interface/lock/spritemap1.png
similarity index 100%
rename from ui/character-select/interface/lock/spritemap1.png
rename to ui/states/character-select/interface/lock/spritemap1.png
diff --git a/ui/character-select/interface/locks.png b/ui/states/character-select/interface/locks.png
similarity index 100%
rename from ui/character-select/interface/locks.png
rename to ui/states/character-select/interface/locks.png
diff --git a/ui/character-select/interface/locks.xml b/ui/states/character-select/interface/locks.xml
similarity index 100%
rename from ui/character-select/interface/locks.xml
rename to ui/states/character-select/interface/locks.xml
diff --git a/ui/character-select/interface/speakers/Animation.json b/ui/states/character-select/interface/speakers/Animation.json
similarity index 100%
rename from ui/character-select/interface/speakers/Animation.json
rename to ui/states/character-select/interface/speakers/Animation.json
diff --git a/ui/character-select/interface/speakers/spritemap1.json b/ui/states/character-select/interface/speakers/spritemap1.json
similarity index 100%
rename from ui/character-select/interface/speakers/spritemap1.json
rename to ui/states/character-select/interface/speakers/spritemap1.json
diff --git a/ui/character-select/interface/speakers/spritemap1.png b/ui/states/character-select/interface/speakers/spritemap1.png
similarity index 100%
rename from ui/character-select/interface/speakers/spritemap1.png
rename to ui/states/character-select/interface/speakers/spritemap1.png
diff --git a/ui/character-select/intro.mp4 b/ui/states/character-select/intro.mp4
similarity index 100%
rename from ui/character-select/intro.mp4
rename to ui/states/character-select/intro.mp4
diff --git a/ui/character-select/sounds/confirm.mp3 b/ui/states/character-select/sounds/confirm.mp3
similarity index 100%
rename from ui/character-select/sounds/confirm.mp3
rename to ui/states/character-select/sounds/confirm.mp3
diff --git a/ui/character-select/sounds/confirm.ogg b/ui/states/character-select/sounds/confirm.ogg
similarity index 100%
rename from ui/character-select/sounds/confirm.ogg
rename to ui/states/character-select/sounds/confirm.ogg
diff --git a/ui/character-select/sounds/hihat.mp3 b/ui/states/character-select/sounds/hihat.mp3
similarity index 100%
rename from ui/character-select/sounds/hihat.mp3
rename to ui/states/character-select/sounds/hihat.mp3
diff --git a/ui/character-select/sounds/hihat.ogg b/ui/states/character-select/sounds/hihat.ogg
similarity index 100%
rename from ui/character-select/sounds/hihat.ogg
rename to ui/states/character-select/sounds/hihat.ogg
diff --git a/ui/character-select/sounds/lights.mp3 b/ui/states/character-select/sounds/lights.mp3
similarity index 100%
rename from ui/character-select/sounds/lights.mp3
rename to ui/states/character-select/sounds/lights.mp3
diff --git a/ui/character-select/sounds/lights.ogg b/ui/states/character-select/sounds/lights.ogg
similarity index 100%
rename from ui/character-select/sounds/lights.ogg
rename to ui/states/character-select/sounds/lights.ogg
diff --git a/ui/character-select/sounds/locked.mp3 b/ui/states/character-select/sounds/locked.mp3
similarity index 100%
rename from ui/character-select/sounds/locked.mp3
rename to ui/states/character-select/sounds/locked.mp3
diff --git a/ui/character-select/sounds/locked.ogg b/ui/states/character-select/sounds/locked.ogg
similarity index 100%
rename from ui/character-select/sounds/locked.ogg
rename to ui/states/character-select/sounds/locked.ogg
diff --git a/ui/character-select/sounds/select.mp3 b/ui/states/character-select/sounds/select.mp3
similarity index 100%
rename from ui/character-select/sounds/select.mp3
rename to ui/states/character-select/sounds/select.mp3
diff --git a/ui/character-select/sounds/select.ogg b/ui/states/character-select/sounds/select.ogg
similarity index 100%
rename from ui/character-select/sounds/select.ogg
rename to ui/states/character-select/sounds/select.ogg
diff --git a/ui/character-select/sounds/static.mp3 b/ui/states/character-select/sounds/static.mp3
similarity index 100%
rename from ui/character-select/sounds/static.mp3
rename to ui/states/character-select/sounds/static.mp3
diff --git a/ui/character-select/sounds/static.ogg b/ui/states/character-select/sounds/static.ogg
similarity index 100%
rename from ui/character-select/sounds/static.ogg
rename to ui/states/character-select/sounds/static.ogg
diff --git a/ui/character-select/sounds/unlock.mp3 b/ui/states/character-select/sounds/unlock.mp3
similarity index 100%
rename from ui/character-select/sounds/unlock.mp3
rename to ui/states/character-select/sounds/unlock.mp3
diff --git a/ui/character-select/sounds/unlock.ogg b/ui/states/character-select/sounds/unlock.ogg
similarity index 100%
rename from ui/character-select/sounds/unlock.ogg
rename to ui/states/character-select/sounds/unlock.ogg
diff --git a/ui/character-select/stay-funky/stay-funky-intro.mp3 b/ui/states/character-select/stay-funky/stay-funky-intro.mp3
similarity index 100%
rename from ui/character-select/stay-funky/stay-funky-intro.mp3
rename to ui/states/character-select/stay-funky/stay-funky-intro.mp3
diff --git a/ui/character-select/stay-funky/stay-funky-intro.ogg b/ui/states/character-select/stay-funky/stay-funky-intro.ogg
similarity index 100%
rename from ui/character-select/stay-funky/stay-funky-intro.ogg
rename to ui/states/character-select/stay-funky/stay-funky-intro.ogg
diff --git a/ui/character-select/stay-funky/stay-funky-metadata.json b/ui/states/character-select/stay-funky/stay-funky-metadata.json
similarity index 100%
rename from ui/character-select/stay-funky/stay-funky-metadata.json
rename to ui/states/character-select/stay-funky/stay-funky-metadata.json
diff --git a/ui/character-select/stay-funky/stay-funky.mp3 b/ui/states/character-select/stay-funky/stay-funky.mp3
similarity index 100%
rename from ui/character-select/stay-funky/stay-funky.mp3
rename to ui/states/character-select/stay-funky/stay-funky.mp3
diff --git a/ui/character-select/stay-funky/stay-funky.ogg b/ui/states/character-select/stay-funky/stay-funky.ogg
similarity index 100%
rename from ui/character-select/stay-funky/stay-funky.ogg
rename to ui/states/character-select/stay-funky/stay-funky.ogg
diff --git a/ui/freeplay/albums/expansion1-text.png b/ui/states/freeplay/albums/expansion1-text.png
similarity index 100%
rename from ui/freeplay/albums/expansion1-text.png
rename to ui/states/freeplay/albums/expansion1-text.png
diff --git a/ui/freeplay/albums/expansion1-text.xml b/ui/states/freeplay/albums/expansion1-text.xml
similarity index 100%
rename from ui/freeplay/albums/expansion1-text.xml
rename to ui/states/freeplay/albums/expansion1-text.xml
diff --git a/ui/freeplay/albums/expansion1.json b/ui/states/freeplay/albums/expansion1.json
similarity index 100%
rename from ui/freeplay/albums/expansion1.json
rename to ui/states/freeplay/albums/expansion1.json
diff --git a/ui/freeplay/albums/expansion1.png b/ui/states/freeplay/albums/expansion1.png
similarity index 100%
rename from ui/freeplay/albums/expansion1.png
rename to ui/states/freeplay/albums/expansion1.png
diff --git a/ui/freeplay/albums/expansion2-text.png b/ui/states/freeplay/albums/expansion2-text.png
similarity index 100%
rename from ui/freeplay/albums/expansion2-text.png
rename to ui/states/freeplay/albums/expansion2-text.png
diff --git a/ui/freeplay/albums/expansion2-text.xml b/ui/states/freeplay/albums/expansion2-text.xml
similarity index 100%
rename from ui/freeplay/albums/expansion2-text.xml
rename to ui/states/freeplay/albums/expansion2-text.xml
diff --git a/ui/freeplay/albums/expansion2.json b/ui/states/freeplay/albums/expansion2.json
similarity index 100%
rename from ui/freeplay/albums/expansion2.json
rename to ui/states/freeplay/albums/expansion2.json
diff --git a/ui/freeplay/albums/expansion2.png b/ui/states/freeplay/albums/expansion2.png
similarity index 100%
rename from ui/freeplay/albums/expansion2.png
rename to ui/states/freeplay/albums/expansion2.png
diff --git a/ui/freeplay/albums/volume1-text.png b/ui/states/freeplay/albums/volume1-text.png
similarity index 100%
rename from ui/freeplay/albums/volume1-text.png
rename to ui/states/freeplay/albums/volume1-text.png
diff --git a/ui/freeplay/albums/volume1-text.xml b/ui/states/freeplay/albums/volume1-text.xml
similarity index 100%
rename from ui/freeplay/albums/volume1-text.xml
rename to ui/states/freeplay/albums/volume1-text.xml
diff --git a/ui/freeplay/albums/volume1.json b/ui/states/freeplay/albums/volume1.json
similarity index 100%
rename from ui/freeplay/albums/volume1.json
rename to ui/states/freeplay/albums/volume1.json
diff --git a/ui/freeplay/albums/volume1.png b/ui/states/freeplay/albums/volume1.png
similarity index 100%
rename from ui/freeplay/albums/volume1.png
rename to ui/states/freeplay/albums/volume1.png
diff --git a/ui/freeplay/albums/volume2-text.png b/ui/states/freeplay/albums/volume2-text.png
similarity index 100%
rename from ui/freeplay/albums/volume2-text.png
rename to ui/states/freeplay/albums/volume2-text.png
diff --git a/ui/freeplay/albums/volume2-text.xml b/ui/states/freeplay/albums/volume2-text.xml
similarity index 100%
rename from ui/freeplay/albums/volume2-text.xml
rename to ui/states/freeplay/albums/volume2-text.xml
diff --git a/ui/freeplay/albums/volume2.json b/ui/states/freeplay/albums/volume2.json
similarity index 100%
rename from ui/freeplay/albums/volume2.json
rename to ui/states/freeplay/albums/volume2.json
diff --git a/ui/freeplay/albums/volume2.png b/ui/states/freeplay/albums/volume2.png
similarity index 100%
rename from ui/freeplay/albums/volume2.png
rename to ui/states/freeplay/albums/volume2.png
diff --git a/ui/freeplay/albums/volume3-text.png b/ui/states/freeplay/albums/volume3-text.png
similarity index 100%
rename from ui/freeplay/albums/volume3-text.png
rename to ui/states/freeplay/albums/volume3-text.png
diff --git a/ui/freeplay/albums/volume3-text.xml b/ui/states/freeplay/albums/volume3-text.xml
similarity index 100%
rename from ui/freeplay/albums/volume3-text.xml
rename to ui/states/freeplay/albums/volume3-text.xml
diff --git a/ui/freeplay/albums/volume3.json b/ui/states/freeplay/albums/volume3.json
similarity index 100%
rename from ui/freeplay/albums/volume3.json
rename to ui/states/freeplay/albums/volume3.json
diff --git a/ui/freeplay/albums/volume3.png b/ui/states/freeplay/albums/volume3.png
similarity index 100%
rename from ui/freeplay/albums/volume3.png
rename to ui/states/freeplay/albums/volume3.png
diff --git a/ui/freeplay/characters/bf.png b/ui/states/freeplay/characters/bf.png
similarity index 100%
rename from ui/freeplay/characters/bf.png
rename to ui/states/freeplay/characters/bf.png
diff --git a/ui/freeplay/characters/bf.xml b/ui/states/freeplay/characters/bf.xml
similarity index 100%
rename from ui/freeplay/characters/bf.xml
rename to ui/states/freeplay/characters/bf.xml
diff --git a/ui/freeplay/characters/dad.png b/ui/states/freeplay/characters/dad.png
similarity index 100%
rename from ui/freeplay/characters/dad.png
rename to ui/states/freeplay/characters/dad.png
diff --git a/ui/freeplay/characters/dad.xml b/ui/states/freeplay/characters/dad.xml
similarity index 100%
rename from ui/freeplay/characters/dad.xml
rename to ui/states/freeplay/characters/dad.xml
diff --git a/ui/freeplay/characters/darnell.png b/ui/states/freeplay/characters/darnell.png
similarity index 100%
rename from ui/freeplay/characters/darnell.png
rename to ui/states/freeplay/characters/darnell.png
diff --git a/ui/freeplay/characters/darnell.xml b/ui/states/freeplay/characters/darnell.xml
similarity index 100%
rename from ui/freeplay/characters/darnell.xml
rename to ui/states/freeplay/characters/darnell.xml
diff --git a/ui/freeplay/characters/gf.png b/ui/states/freeplay/characters/gf.png
similarity index 100%
rename from ui/freeplay/characters/gf.png
rename to ui/states/freeplay/characters/gf.png
diff --git a/ui/freeplay/characters/gf.xml b/ui/states/freeplay/characters/gf.xml
similarity index 100%
rename from ui/freeplay/characters/gf.xml
rename to ui/states/freeplay/characters/gf.xml
diff --git a/ui/freeplay/characters/mom.png b/ui/states/freeplay/characters/mom.png
similarity index 100%
rename from ui/freeplay/characters/mom.png
rename to ui/states/freeplay/characters/mom.png
diff --git a/ui/freeplay/characters/mom.xml b/ui/states/freeplay/characters/mom.xml
similarity index 100%
rename from ui/freeplay/characters/mom.xml
rename to ui/states/freeplay/characters/mom.xml
diff --git a/ui/freeplay/characters/monster.png b/ui/states/freeplay/characters/monster.png
similarity index 100%
rename from ui/freeplay/characters/monster.png
rename to ui/states/freeplay/characters/monster.png
diff --git a/ui/freeplay/characters/monster.xml b/ui/states/freeplay/characters/monster.xml
similarity index 100%
rename from ui/freeplay/characters/monster.xml
rename to ui/states/freeplay/characters/monster.xml
diff --git a/ui/freeplay/characters/parents-christmas.png b/ui/states/freeplay/characters/parents-christmas.png
similarity index 100%
rename from ui/freeplay/characters/parents-christmas.png
rename to ui/states/freeplay/characters/parents-christmas.png
diff --git a/ui/freeplay/characters/parents-christmas.xml b/ui/states/freeplay/characters/parents-christmas.xml
similarity index 100%
rename from ui/freeplay/characters/parents-christmas.xml
rename to ui/states/freeplay/characters/parents-christmas.xml
diff --git a/ui/freeplay/characters/pico.png b/ui/states/freeplay/characters/pico.png
similarity index 100%
rename from ui/freeplay/characters/pico.png
rename to ui/states/freeplay/characters/pico.png
diff --git a/ui/freeplay/characters/pico.xml b/ui/states/freeplay/characters/pico.xml
similarity index 100%
rename from ui/freeplay/characters/pico.xml
rename to ui/states/freeplay/characters/pico.xml
diff --git a/ui/freeplay/characters/senpai.png b/ui/states/freeplay/characters/senpai.png
similarity index 100%
rename from ui/freeplay/characters/senpai.png
rename to ui/states/freeplay/characters/senpai.png
diff --git a/ui/freeplay/characters/senpai.xml b/ui/states/freeplay/characters/senpai.xml
similarity index 100%
rename from ui/freeplay/characters/senpai.xml
rename to ui/states/freeplay/characters/senpai.xml
diff --git a/ui/freeplay/characters/spirit.png b/ui/states/freeplay/characters/spirit.png
similarity index 100%
rename from ui/freeplay/characters/spirit.png
rename to ui/states/freeplay/characters/spirit.png
diff --git a/ui/freeplay/characters/spirit.xml b/ui/states/freeplay/characters/spirit.xml
similarity index 100%
rename from ui/freeplay/characters/spirit.xml
rename to ui/states/freeplay/characters/spirit.xml
diff --git a/ui/freeplay/characters/spooky.png b/ui/states/freeplay/characters/spooky.png
similarity index 100%
rename from ui/freeplay/characters/spooky.png
rename to ui/states/freeplay/characters/spooky.png
diff --git a/ui/freeplay/characters/spooky.xml b/ui/states/freeplay/characters/spooky.xml
similarity index 100%
rename from ui/freeplay/characters/spooky.xml
rename to ui/states/freeplay/characters/spooky.xml
diff --git a/ui/freeplay/characters/tankman.png b/ui/states/freeplay/characters/tankman.png
similarity index 100%
rename from ui/freeplay/characters/tankman.png
rename to ui/states/freeplay/characters/tankman.png
diff --git a/ui/freeplay/characters/tankman.xml b/ui/states/freeplay/characters/tankman.xml
similarity index 100%
rename from ui/freeplay/characters/tankman.xml
rename to ui/states/freeplay/characters/tankman.xml
diff --git a/ui/freeplay/difficulty/easy.png b/ui/states/freeplay/difficulty/easy.png
similarity index 100%
rename from ui/freeplay/difficulty/easy.png
rename to ui/states/freeplay/difficulty/easy.png
diff --git a/ui/freeplay/difficulty/erect.png b/ui/states/freeplay/difficulty/erect.png
similarity index 100%
rename from ui/freeplay/difficulty/erect.png
rename to ui/states/freeplay/difficulty/erect.png
diff --git a/ui/freeplay/difficulty/freeplay-flame.png b/ui/states/freeplay/difficulty/freeplay-flame.png
similarity index 100%
rename from ui/freeplay/difficulty/freeplay-flame.png
rename to ui/states/freeplay/difficulty/freeplay-flame.png
diff --git a/ui/freeplay/difficulty/freeplay-flame.xml b/ui/states/freeplay/difficulty/freeplay-flame.xml
similarity index 100%
rename from ui/freeplay/difficulty/freeplay-flame.xml
rename to ui/states/freeplay/difficulty/freeplay-flame.xml
diff --git a/ui/freeplay/difficulty/freeplay-stars/Animation.json b/ui/states/freeplay/difficulty/freeplay-stars/Animation.json
similarity index 100%
rename from ui/freeplay/difficulty/freeplay-stars/Animation.json
rename to ui/states/freeplay/difficulty/freeplay-stars/Animation.json
diff --git a/ui/freeplay/difficulty/freeplay-stars/spritemap1.json b/ui/states/freeplay/difficulty/freeplay-stars/spritemap1.json
similarity index 100%
rename from ui/freeplay/difficulty/freeplay-stars/spritemap1.json
rename to ui/states/freeplay/difficulty/freeplay-stars/spritemap1.json
diff --git a/ui/freeplay/difficulty/freeplay-stars/spritemap1.png b/ui/states/freeplay/difficulty/freeplay-stars/spritemap1.png
similarity index 100%
rename from ui/freeplay/difficulty/freeplay-stars/spritemap1.png
rename to ui/states/freeplay/difficulty/freeplay-stars/spritemap1.png
diff --git a/ui/freeplay/difficulty/hard.png b/ui/states/freeplay/difficulty/hard.png
similarity index 100%
rename from ui/freeplay/difficulty/hard.png
rename to ui/states/freeplay/difficulty/hard.png
diff --git a/ui/freeplay/difficulty/nightmare.png b/ui/states/freeplay/difficulty/nightmare.png
similarity index 100%
rename from ui/freeplay/difficulty/nightmare.png
rename to ui/states/freeplay/difficulty/nightmare.png
diff --git a/ui/freeplay/difficulty/nightmare.xml b/ui/states/freeplay/difficulty/nightmare.xml
similarity index 100%
rename from ui/freeplay/difficulty/nightmare.xml
rename to ui/states/freeplay/difficulty/nightmare.xml
diff --git a/ui/freeplay/difficulty/normal.png b/ui/states/freeplay/difficulty/normal.png
similarity index 100%
rename from ui/freeplay/difficulty/normal.png
rename to ui/states/freeplay/difficulty/normal.png
diff --git a/ui/freeplay/dj/bf/cartoons/191815.ogg b/ui/states/freeplay/dj/bf/cartoons/191815.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/191815.ogg
rename to ui/states/freeplay/dj/bf/cartoons/191815.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/376197.mp3 b/ui/states/freeplay/dj/bf/cartoons/376197.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/376197.mp3
rename to ui/states/freeplay/dj/bf/cartoons/376197.mp3
diff --git a/ui/freeplay/dj/bf/cartoons/376197.ogg b/ui/states/freeplay/dj/bf/cartoons/376197.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/376197.ogg
rename to ui/states/freeplay/dj/bf/cartoons/376197.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/402450.ogg b/ui/states/freeplay/dj/bf/cartoons/402450.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/402450.ogg
rename to ui/states/freeplay/dj/bf/cartoons/402450.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/420994.ogg b/ui/states/freeplay/dj/bf/cartoons/420994.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/420994.ogg
rename to ui/states/freeplay/dj/bf/cartoons/420994.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/436786.ogg b/ui/states/freeplay/dj/bf/cartoons/436786.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/436786.ogg
rename to ui/states/freeplay/dj/bf/cartoons/436786.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/445123.mp3 b/ui/states/freeplay/dj/bf/cartoons/445123.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/445123.mp3
rename to ui/states/freeplay/dj/bf/cartoons/445123.mp3
diff --git a/ui/freeplay/dj/bf/cartoons/445123.ogg b/ui/states/freeplay/dj/bf/cartoons/445123.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/445123.ogg
rename to ui/states/freeplay/dj/bf/cartoons/445123.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/455919.ogg b/ui/states/freeplay/dj/bf/cartoons/455919.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/455919.ogg
rename to ui/states/freeplay/dj/bf/cartoons/455919.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/460535.ogg b/ui/states/freeplay/dj/bf/cartoons/460535.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/460535.ogg
rename to ui/states/freeplay/dj/bf/cartoons/460535.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/527474.mp3 b/ui/states/freeplay/dj/bf/cartoons/527474.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/527474.mp3
rename to ui/states/freeplay/dj/bf/cartoons/527474.mp3
diff --git a/ui/freeplay/dj/bf/cartoons/527474.ogg b/ui/states/freeplay/dj/bf/cartoons/527474.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/527474.ogg
rename to ui/states/freeplay/dj/bf/cartoons/527474.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/530334.ogg b/ui/states/freeplay/dj/bf/cartoons/530334.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/530334.ogg
rename to ui/states/freeplay/dj/bf/cartoons/530334.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/544919.mp3 b/ui/states/freeplay/dj/bf/cartoons/544919.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/544919.mp3
rename to ui/states/freeplay/dj/bf/cartoons/544919.mp3
diff --git a/ui/freeplay/dj/bf/cartoons/544919.ogg b/ui/states/freeplay/dj/bf/cartoons/544919.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/544919.ogg
rename to ui/states/freeplay/dj/bf/cartoons/544919.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/604642.ogg b/ui/states/freeplay/dj/bf/cartoons/604642.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/604642.ogg
rename to ui/states/freeplay/dj/bf/cartoons/604642.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/614710.ogg b/ui/states/freeplay/dj/bf/cartoons/614710.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/614710.ogg
rename to ui/states/freeplay/dj/bf/cartoons/614710.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/665671.ogg b/ui/states/freeplay/dj/bf/cartoons/665671.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/665671.ogg
rename to ui/states/freeplay/dj/bf/cartoons/665671.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/673103.ogg b/ui/states/freeplay/dj/bf/cartoons/673103.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/673103.ogg
rename to ui/states/freeplay/dj/bf/cartoons/673103.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/674980.ogg b/ui/states/freeplay/dj/bf/cartoons/674980.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/674980.ogg
rename to ui/states/freeplay/dj/bf/cartoons/674980.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/681102.ogg b/ui/states/freeplay/dj/bf/cartoons/681102.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/681102.ogg
rename to ui/states/freeplay/dj/bf/cartoons/681102.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/694697.ogg b/ui/states/freeplay/dj/bf/cartoons/694697.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/694697.ogg
rename to ui/states/freeplay/dj/bf/cartoons/694697.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/717986.mp3 b/ui/states/freeplay/dj/bf/cartoons/717986.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/717986.mp3
rename to ui/states/freeplay/dj/bf/cartoons/717986.mp3
diff --git a/ui/freeplay/dj/bf/cartoons/717986.ogg b/ui/states/freeplay/dj/bf/cartoons/717986.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/717986.ogg
rename to ui/states/freeplay/dj/bf/cartoons/717986.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/719366.ogg b/ui/states/freeplay/dj/bf/cartoons/719366.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/719366.ogg
rename to ui/states/freeplay/dj/bf/cartoons/719366.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/758136.ogg b/ui/states/freeplay/dj/bf/cartoons/758136.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/758136.ogg
rename to ui/states/freeplay/dj/bf/cartoons/758136.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/760595.ogg b/ui/states/freeplay/dj/bf/cartoons/760595.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/760595.ogg
rename to ui/states/freeplay/dj/bf/cartoons/760595.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/776249.ogg b/ui/states/freeplay/dj/bf/cartoons/776249.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/776249.ogg
rename to ui/states/freeplay/dj/bf/cartoons/776249.ogg
diff --git a/ui/freeplay/dj/bf/cartoons/790104.ogg b/ui/states/freeplay/dj/bf/cartoons/790104.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/cartoons/790104.ogg
rename to ui/states/freeplay/dj/bf/cartoons/790104.ogg
diff --git a/ui/freeplay/dj/bf/channel-switch.mp3 b/ui/states/freeplay/dj/bf/channel-switch.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/channel-switch.mp3
rename to ui/states/freeplay/dj/bf/channel-switch.mp3
diff --git a/ui/freeplay/dj/bf/channel-switch.ogg b/ui/states/freeplay/dj/bf/channel-switch.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/channel-switch.ogg
rename to ui/states/freeplay/dj/bf/channel-switch.ogg
diff --git a/ui/freeplay/dj/bf/freeplay-boyfriend/Animation.json b/ui/states/freeplay/dj/bf/freeplay-boyfriend/Animation.json
similarity index 100%
rename from ui/freeplay/dj/bf/freeplay-boyfriend/Animation.json
rename to ui/states/freeplay/dj/bf/freeplay-boyfriend/Animation.json
diff --git a/ui/freeplay/dj/bf/freeplay-boyfriend/spritemap1.json b/ui/states/freeplay/dj/bf/freeplay-boyfriend/spritemap1.json
similarity index 100%
rename from ui/freeplay/dj/bf/freeplay-boyfriend/spritemap1.json
rename to ui/states/freeplay/dj/bf/freeplay-boyfriend/spritemap1.json
diff --git a/ui/freeplay/dj/bf/freeplay-boyfriend/spritemap1.png b/ui/states/freeplay/dj/bf/freeplay-boyfriend/spritemap1.png
similarity index 100%
rename from ui/freeplay/dj/bf/freeplay-boyfriend/spritemap1.png
rename to ui/states/freeplay/dj/bf/freeplay-boyfriend/spritemap1.png
diff --git a/ui/freeplay/dj/bf/remote-click.mp3 b/ui/states/freeplay/dj/bf/remote-click.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/remote-click.mp3
rename to ui/states/freeplay/dj/bf/remote-click.mp3
diff --git a/ui/freeplay/dj/bf/remote-click.ogg b/ui/states/freeplay/dj/bf/remote-click.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/remote-click.ogg
rename to ui/states/freeplay/dj/bf/remote-click.ogg
diff --git a/ui/freeplay/dj/bf/tv-on.mp3 b/ui/states/freeplay/dj/bf/tv-on.mp3
similarity index 100%
rename from ui/freeplay/dj/bf/tv-on.mp3
rename to ui/states/freeplay/dj/bf/tv-on.mp3
diff --git a/ui/freeplay/dj/bf/tv-on.ogg b/ui/states/freeplay/dj/bf/tv-on.ogg
similarity index 100%
rename from ui/freeplay/dj/bf/tv-on.ogg
rename to ui/states/freeplay/dj/bf/tv-on.ogg
diff --git a/ui/freeplay/dj/pico/freeplay-pico/Animation.json b/ui/states/freeplay/dj/pico/freeplay-pico/Animation.json
similarity index 100%
rename from ui/freeplay/dj/pico/freeplay-pico/Animation.json
rename to ui/states/freeplay/dj/pico/freeplay-pico/Animation.json
diff --git a/ui/freeplay/dj/pico/freeplay-pico/spritemap1.json b/ui/states/freeplay/dj/pico/freeplay-pico/spritemap1.json
similarity index 100%
rename from ui/freeplay/dj/pico/freeplay-pico/spritemap1.json
rename to ui/states/freeplay/dj/pico/freeplay-pico/spritemap1.json
diff --git a/ui/freeplay/dj/pico/freeplay-pico/spritemap1.png b/ui/states/freeplay/dj/pico/freeplay-pico/spritemap1.png
similarity index 100%
rename from ui/freeplay/dj/pico/freeplay-pico/spritemap1.png
rename to ui/states/freeplay/dj/pico/freeplay-pico/spritemap1.png
diff --git a/ui/freeplay/fav.mp3 b/ui/states/freeplay/fav.mp3
similarity index 100%
rename from ui/freeplay/fav.mp3
rename to ui/states/freeplay/fav.mp3
diff --git a/ui/freeplay/fav.ogg b/ui/states/freeplay/fav.ogg
similarity index 100%
rename from ui/freeplay/fav.ogg
rename to ui/states/freeplay/fav.ogg
diff --git a/ui/freeplay/freeplay-random/freeplay-random-metadata.json b/ui/states/freeplay/freeplay-random/freeplay-random-metadata.json
similarity index 100%
rename from ui/freeplay/freeplay-random/freeplay-random-metadata.json
rename to ui/states/freeplay/freeplay-random/freeplay-random-metadata.json
diff --git a/ui/freeplay/freeplay-random/freeplay-random.mp3 b/ui/states/freeplay/freeplay-random/freeplay-random.mp3
similarity index 100%
rename from ui/freeplay/freeplay-random/freeplay-random.mp3
rename to ui/states/freeplay/freeplay-random/freeplay-random.mp3
diff --git a/ui/freeplay/freeplay-random/freeplay-random.ogg b/ui/states/freeplay/freeplay-random/freeplay-random.ogg
similarity index 100%
rename from ui/freeplay/freeplay-random/freeplay-random.ogg
rename to ui/states/freeplay/freeplay-random/freeplay-random.ogg
diff --git a/ui/freeplay/interface/beatdark.png b/ui/states/freeplay/interface/beatdark.png
similarity index 100%
rename from ui/freeplay/interface/beatdark.png
rename to ui/states/freeplay/interface/beatdark.png
diff --git a/ui/freeplay/interface/beatglow.png b/ui/states/freeplay/interface/beatglow.png
similarity index 100%
rename from ui/freeplay/interface/beatglow.png
rename to ui/states/freeplay/interface/beatglow.png
diff --git a/ui/freeplay/interface/cardGlow.png b/ui/states/freeplay/interface/cardGlow.png
similarity index 100%
rename from ui/freeplay/interface/cardGlow.png
rename to ui/states/freeplay/interface/cardGlow.png
diff --git a/ui/freeplay/interface/clearBox.png b/ui/states/freeplay/interface/clearBox.png
similarity index 100%
rename from ui/freeplay/interface/clearBox.png
rename to ui/states/freeplay/interface/clearBox.png
diff --git a/ui/freeplay/interface/confirmGlow.png b/ui/states/freeplay/interface/confirmGlow.png
similarity index 100%
rename from ui/freeplay/interface/confirmGlow.png
rename to ui/states/freeplay/interface/confirmGlow.png
diff --git a/ui/freeplay/interface/confirmGlow2.png b/ui/states/freeplay/interface/confirmGlow2.png
similarity index 100%
rename from ui/freeplay/interface/confirmGlow2.png
rename to ui/states/freeplay/interface/confirmGlow2.png
diff --git a/ui/freeplay/interface/difficulty-selector/freeplaySelector.png b/ui/states/freeplay/interface/difficulty-selector/freeplaySelector.png
similarity index 100%
rename from ui/freeplay/interface/difficulty-selector/freeplaySelector.png
rename to ui/states/freeplay/interface/difficulty-selector/freeplaySelector.png
diff --git a/ui/freeplay/interface/difficulty-selector/freeplaySelector.xml b/ui/states/freeplay/interface/difficulty-selector/freeplaySelector.xml
similarity index 100%
rename from ui/freeplay/interface/difficulty-selector/freeplaySelector.xml
rename to ui/states/freeplay/interface/difficulty-selector/freeplaySelector.xml
diff --git a/ui/freeplay/interface/favHeart.png b/ui/states/freeplay/interface/favHeart.png
similarity index 100%
rename from ui/freeplay/interface/favHeart.png
rename to ui/states/freeplay/interface/favHeart.png
diff --git a/ui/freeplay/interface/favHeart.xml b/ui/states/freeplay/interface/favHeart.xml
similarity index 100%
rename from ui/freeplay/interface/favHeart.xml
rename to ui/states/freeplay/interface/favHeart.xml
diff --git a/ui/freeplay/interface/freeplay-album/Animation.json b/ui/states/freeplay/interface/freeplay-album/Animation.json
similarity index 100%
rename from ui/freeplay/interface/freeplay-album/Animation.json
rename to ui/states/freeplay/interface/freeplay-album/Animation.json
diff --git a/ui/freeplay/interface/freeplay-album/spritemap1.json b/ui/states/freeplay/interface/freeplay-album/spritemap1.json
similarity index 100%
rename from ui/freeplay/interface/freeplay-album/spritemap1.json
rename to ui/states/freeplay/interface/freeplay-album/spritemap1.json
diff --git a/ui/freeplay/interface/freeplay-album/spritemap1.png b/ui/states/freeplay/interface/freeplay-album/spritemap1.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-album/spritemap1.png
rename to ui/states/freeplay/interface/freeplay-album/spritemap1.png
diff --git a/ui/freeplay/interface/freeplay-capsule/bignumbers.png b/ui/states/freeplay/interface/freeplay-capsule/bignumbers.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/bignumbers.png
rename to ui/states/freeplay/interface/freeplay-capsule/bignumbers.png
diff --git a/ui/freeplay/interface/freeplay-capsule/bignumbers.xml b/ui/states/freeplay/interface/freeplay-capsule/bignumbers.xml
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/bignumbers.xml
rename to ui/states/freeplay/interface/freeplay-capsule/bignumbers.xml
diff --git a/ui/freeplay/interface/freeplay-capsule/bpmtext.png b/ui/states/freeplay/interface/freeplay-capsule/bpmtext.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/bpmtext.png
rename to ui/states/freeplay/interface/freeplay-capsule/bpmtext.png
diff --git a/ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.png b/ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.png
rename to ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.png
diff --git a/ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.xml b/ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.xml
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.xml
rename to ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule.xml
diff --git a/ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.png b/ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.png
rename to ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.png
diff --git a/ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.xml b/ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.xml
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.xml
rename to ui/states/freeplay/interface/freeplay-capsule/capsule/freeplayCapsule_pico.xml
diff --git a/ui/freeplay/interface/freeplay-capsule/difficultytext.png b/ui/states/freeplay/interface/freeplay-capsule/difficultytext.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/difficultytext.png
rename to ui/states/freeplay/interface/freeplay-capsule/difficultytext.png
diff --git a/ui/freeplay/interface/freeplay-capsule/new.png b/ui/states/freeplay/interface/freeplay-capsule/new.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/new.png
rename to ui/states/freeplay/interface/freeplay-capsule/new.png
diff --git a/ui/freeplay/interface/freeplay-capsule/new.xml b/ui/states/freeplay/interface/freeplay-capsule/new.xml
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/new.xml
rename to ui/states/freeplay/interface/freeplay-capsule/new.xml
diff --git a/ui/freeplay/interface/freeplay-capsule/smallnumbers.png b/ui/states/freeplay/interface/freeplay-capsule/smallnumbers.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/smallnumbers.png
rename to ui/states/freeplay/interface/freeplay-capsule/smallnumbers.png
diff --git a/ui/freeplay/interface/freeplay-capsule/smallnumbers.xml b/ui/states/freeplay/interface/freeplay-capsule/smallnumbers.xml
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/smallnumbers.xml
rename to ui/states/freeplay/interface/freeplay-capsule/smallnumbers.xml
diff --git a/ui/freeplay/interface/freeplay-capsule/weektypes.png b/ui/states/freeplay/interface/freeplay-capsule/weektypes.png
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/weektypes.png
rename to ui/states/freeplay/interface/freeplay-capsule/weektypes.png
diff --git a/ui/freeplay/interface/freeplay-capsule/weektypes.xml b/ui/states/freeplay/interface/freeplay-capsule/weektypes.xml
similarity index 100%
rename from ui/freeplay/interface/freeplay-capsule/weektypes.xml
rename to ui/states/freeplay/interface/freeplay-capsule/weektypes.xml
diff --git a/ui/freeplay/interface/freeplaySelector.png b/ui/states/freeplay/interface/freeplaySelector.png
similarity index 100%
rename from ui/freeplay/interface/freeplaySelector.png
rename to ui/states/freeplay/interface/freeplaySelector.png
diff --git a/ui/freeplay/interface/freeplaySelector.xml b/ui/states/freeplay/interface/freeplaySelector.xml
similarity index 100%
rename from ui/freeplay/interface/freeplaySelector.xml
rename to ui/states/freeplay/interface/freeplaySelector.xml
diff --git a/ui/freeplay/interface/glowingText.png b/ui/states/freeplay/interface/glowingText.png
similarity index 100%
rename from ui/freeplay/interface/glowingText.png
rename to ui/states/freeplay/interface/glowingText.png
diff --git a/ui/freeplay/interface/highscore.png b/ui/states/freeplay/interface/highscore.png
similarity index 100%
rename from ui/freeplay/interface/highscore.png
rename to ui/states/freeplay/interface/highscore.png
diff --git a/ui/freeplay/interface/highscore.xml b/ui/states/freeplay/interface/highscore.xml
similarity index 100%
rename from ui/freeplay/interface/highscore.xml
rename to ui/states/freeplay/interface/highscore.xml
diff --git a/ui/freeplay/interface/instBox/instBox.png b/ui/states/freeplay/interface/instBox/instBox.png
similarity index 100%
rename from ui/freeplay/interface/instBox/instBox.png
rename to ui/states/freeplay/interface/instBox/instBox.png
diff --git a/ui/freeplay/interface/instBox/instBox.xml b/ui/states/freeplay/interface/instBox/instBox.xml
similarity index 100%
rename from ui/freeplay/interface/instBox/instBox.xml
rename to ui/states/freeplay/interface/instBox/instBox.xml
diff --git a/ui/freeplay/interface/letterStuff.png b/ui/states/freeplay/interface/letterStuff.png
similarity index 100%
rename from ui/freeplay/interface/letterStuff.png
rename to ui/states/freeplay/interface/letterStuff.png
diff --git a/ui/freeplay/interface/letterStuff.xml b/ui/states/freeplay/interface/letterStuff.xml
similarity index 100%
rename from ui/freeplay/interface/letterStuff.xml
rename to ui/states/freeplay/interface/letterStuff.xml
diff --git a/ui/freeplay/interface/miniArrow.png b/ui/states/freeplay/interface/miniArrow.png
similarity index 100%
rename from ui/freeplay/interface/miniArrow.png
rename to ui/states/freeplay/interface/miniArrow.png
diff --git a/ui/freeplay/interface/pinkBack.png b/ui/states/freeplay/interface/pinkBack.png
similarity index 100%
rename from ui/freeplay/interface/pinkBack.png
rename to ui/states/freeplay/interface/pinkBack.png
diff --git a/ui/freeplay/interface/rankVignette.png b/ui/states/freeplay/interface/rankVignette.png
similarity index 100%
rename from ui/freeplay/interface/rankVignette.png
rename to ui/states/freeplay/interface/rankVignette.png
diff --git a/ui/freeplay/interface/rankbadges.png b/ui/states/freeplay/interface/rankbadges.png
similarity index 100%
rename from ui/freeplay/interface/rankbadges.png
rename to ui/states/freeplay/interface/rankbadges.png
diff --git a/ui/freeplay/interface/rankbadges.xml b/ui/states/freeplay/interface/rankbadges.xml
similarity index 100%
rename from ui/freeplay/interface/rankbadges.xml
rename to ui/states/freeplay/interface/rankbadges.xml
diff --git a/ui/freeplay/interface/seperator.png b/ui/states/freeplay/interface/seperator.png
similarity index 100%
rename from ui/freeplay/interface/seperator.png
rename to ui/states/freeplay/interface/seperator.png
diff --git a/ui/freeplay/interface/sortedLetters/Animation.json b/ui/states/freeplay/interface/sortedLetters/Animation.json
similarity index 100%
rename from ui/freeplay/interface/sortedLetters/Animation.json
rename to ui/states/freeplay/interface/sortedLetters/Animation.json
diff --git a/ui/freeplay/interface/sortedLetters/spritemap1.json b/ui/states/freeplay/interface/sortedLetters/spritemap1.json
similarity index 100%
rename from ui/freeplay/interface/sortedLetters/spritemap1.json
rename to ui/states/freeplay/interface/sortedLetters/spritemap1.json
diff --git a/ui/freeplay/interface/sortedLetters/spritemap1.png b/ui/states/freeplay/interface/sortedLetters/spritemap1.png
similarity index 100%
rename from ui/freeplay/interface/sortedLetters/spritemap1.png
rename to ui/states/freeplay/interface/sortedLetters/spritemap1.png
diff --git a/ui/freeplay/interface/sparkle.png b/ui/states/freeplay/interface/sparkle.png
similarity index 100%
rename from ui/freeplay/interface/sparkle.png
rename to ui/states/freeplay/interface/sparkle.png
diff --git a/ui/freeplay/interface/sparkle.xml b/ui/states/freeplay/interface/sparkle.xml
similarity index 100%
rename from ui/freeplay/interface/sparkle.xml
rename to ui/states/freeplay/interface/sparkle.xml
diff --git a/ui/freeplay/interface/sparks.png b/ui/states/freeplay/interface/sparks.png
similarity index 100%
rename from ui/freeplay/interface/sparks.png
rename to ui/states/freeplay/interface/sparks.png
diff --git a/ui/freeplay/interface/sparks.xml b/ui/states/freeplay/interface/sparks.xml
similarity index 100%
rename from ui/freeplay/interface/sparks.xml
rename to ui/states/freeplay/interface/sparks.xml
diff --git a/ui/freeplay/interface/sparksadd.png b/ui/states/freeplay/interface/sparksadd.png
similarity index 100%
rename from ui/freeplay/interface/sparksadd.png
rename to ui/states/freeplay/interface/sparksadd.png
diff --git a/ui/freeplay/interface/sparksadd.xml b/ui/states/freeplay/interface/sparksadd.xml
similarity index 100%
rename from ui/freeplay/interface/sparksadd.xml
rename to ui/states/freeplay/interface/sparksadd.xml
diff --git a/ui/freeplay/interface/transitionGradient.png b/ui/states/freeplay/interface/transitionGradient.png
similarity index 100%
rename from ui/freeplay/interface/transitionGradient.png
rename to ui/states/freeplay/interface/transitionGradient.png
diff --git a/ui/freeplay/ranks/excellent.mp3 b/ui/states/freeplay/ranks/excellent.mp3
similarity index 100%
rename from ui/freeplay/ranks/excellent.mp3
rename to ui/states/freeplay/ranks/excellent.mp3
diff --git a/ui/freeplay/ranks/excellent.ogg b/ui/states/freeplay/ranks/excellent.ogg
similarity index 100%
rename from ui/freeplay/ranks/excellent.ogg
rename to ui/states/freeplay/ranks/excellent.ogg
diff --git a/ui/freeplay/ranks/good.mp3 b/ui/states/freeplay/ranks/good.mp3
similarity index 100%
rename from ui/freeplay/ranks/good.mp3
rename to ui/states/freeplay/ranks/good.mp3
diff --git a/ui/freeplay/ranks/good.ogg b/ui/states/freeplay/ranks/good.ogg
similarity index 100%
rename from ui/freeplay/ranks/good.ogg
rename to ui/states/freeplay/ranks/good.ogg
diff --git a/ui/freeplay/ranks/great.mp3 b/ui/states/freeplay/ranks/great.mp3
similarity index 100%
rename from ui/freeplay/ranks/great.mp3
rename to ui/states/freeplay/ranks/great.mp3
diff --git a/ui/freeplay/ranks/great.ogg b/ui/states/freeplay/ranks/great.ogg
similarity index 100%
rename from ui/freeplay/ranks/great.ogg
rename to ui/states/freeplay/ranks/great.ogg
diff --git a/ui/freeplay/ranks/loss.mp3 b/ui/states/freeplay/ranks/loss.mp3
similarity index 100%
rename from ui/freeplay/ranks/loss.mp3
rename to ui/states/freeplay/ranks/loss.mp3
diff --git a/ui/freeplay/ranks/loss.ogg b/ui/states/freeplay/ranks/loss.ogg
similarity index 100%
rename from ui/freeplay/ranks/loss.ogg
rename to ui/states/freeplay/ranks/loss.ogg
diff --git a/ui/freeplay/ranks/perfect.mp3 b/ui/states/freeplay/ranks/perfect.mp3
similarity index 100%
rename from ui/freeplay/ranks/perfect.mp3
rename to ui/states/freeplay/ranks/perfect.mp3
diff --git a/ui/freeplay/ranks/perfect.ogg b/ui/states/freeplay/ranks/perfect.ogg
similarity index 100%
rename from ui/freeplay/ranks/perfect.ogg
rename to ui/states/freeplay/ranks/perfect.ogg
diff --git a/ui/freeplay/ranks/rankinbad.mp3 b/ui/states/freeplay/ranks/rankinbad.mp3
similarity index 100%
rename from ui/freeplay/ranks/rankinbad.mp3
rename to ui/states/freeplay/ranks/rankinbad.mp3
diff --git a/ui/freeplay/ranks/rankinbad.ogg b/ui/states/freeplay/ranks/rankinbad.ogg
similarity index 100%
rename from ui/freeplay/ranks/rankinbad.ogg
rename to ui/states/freeplay/ranks/rankinbad.ogg
diff --git a/ui/freeplay/ranks/rankinnormal.mp3 b/ui/states/freeplay/ranks/rankinnormal.mp3
similarity index 100%
rename from ui/freeplay/ranks/rankinnormal.mp3
rename to ui/states/freeplay/ranks/rankinnormal.mp3
diff --git a/ui/freeplay/ranks/rankinnormal.ogg b/ui/states/freeplay/ranks/rankinnormal.ogg
similarity index 100%
rename from ui/freeplay/ranks/rankinnormal.ogg
rename to ui/states/freeplay/ranks/rankinnormal.ogg
diff --git a/ui/freeplay/ranks/rankinperfect.mp3 b/ui/states/freeplay/ranks/rankinperfect.mp3
similarity index 100%
rename from ui/freeplay/ranks/rankinperfect.mp3
rename to ui/states/freeplay/ranks/rankinperfect.mp3
diff --git a/ui/freeplay/ranks/rankinperfect.ogg b/ui/states/freeplay/ranks/rankinperfect.ogg
similarity index 100%
rename from ui/freeplay/ranks/rankinperfect.ogg
rename to ui/states/freeplay/ranks/rankinperfect.ogg
diff --git a/ui/freeplay/styles/bf/background-dad.png b/ui/states/freeplay/styles/bf/background-dad.png
similarity index 100%
rename from ui/freeplay/styles/bf/background-dad.png
rename to ui/states/freeplay/styles/bf/background-dad.png
diff --git a/ui/freeplay/styles/bf/backing-card/Animation.json b/ui/states/freeplay/styles/bf/backing-card/Animation.json
similarity index 100%
rename from ui/freeplay/styles/bf/backing-card/Animation.json
rename to ui/states/freeplay/styles/bf/backing-card/Animation.json
diff --git a/ui/freeplay/styles/bf/backing-card/spritemap1.json b/ui/states/freeplay/styles/bf/backing-card/spritemap1.json
similarity index 100%
rename from ui/freeplay/styles/bf/backing-card/spritemap1.json
rename to ui/states/freeplay/styles/bf/backing-card/spritemap1.json
diff --git a/ui/freeplay/styles/bf/backing-card/spritemap1.png b/ui/states/freeplay/styles/bf/backing-card/spritemap1.png
similarity index 100%
rename from ui/freeplay/styles/bf/backing-card/spritemap1.png
rename to ui/states/freeplay/styles/bf/backing-card/spritemap1.png
diff --git a/ui/freeplay/styles/bf/bf.json b/ui/states/freeplay/styles/bf/bf.json
similarity index 100%
rename from ui/freeplay/styles/bf/bf.json
rename to ui/states/freeplay/styles/bf/bf.json
diff --git a/ui/freeplay/styles/bf/digital-numbers.png b/ui/states/freeplay/styles/bf/digital-numbers.png
similarity index 100%
rename from ui/freeplay/styles/bf/digital-numbers.png
rename to ui/states/freeplay/styles/bf/digital-numbers.png
diff --git a/ui/freeplay/styles/bf/digital-numbers.xml b/ui/states/freeplay/styles/bf/digital-numbers.xml
similarity index 100%
rename from ui/freeplay/styles/bf/digital-numbers.xml
rename to ui/states/freeplay/styles/bf/digital-numbers.xml
diff --git a/ui/freeplay/styles/pico/background-dad.png b/ui/states/freeplay/styles/pico/background-dad.png
similarity index 100%
rename from ui/freeplay/styles/pico/background-dad.png
rename to ui/states/freeplay/styles/pico/background-dad.png
diff --git a/ui/freeplay/styles/pico/backing-card/blue-bar.png b/ui/states/freeplay/styles/pico/backing-card/blue-bar.png
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/blue-bar.png
rename to ui/states/freeplay/styles/pico/backing-card/blue-bar.png
diff --git a/ui/freeplay/styles/pico/backing-card/glow.png b/ui/states/freeplay/styles/pico/backing-card/glow.png
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/glow.png
rename to ui/states/freeplay/styles/pico/backing-card/glow.png
diff --git a/ui/freeplay/styles/pico/backing-card/lower-loop.png b/ui/states/freeplay/styles/pico/backing-card/lower-loop.png
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/lower-loop.png
rename to ui/states/freeplay/styles/pico/backing-card/lower-loop.png
diff --git a/ui/freeplay/styles/pico/backing-card/middle-loop.png b/ui/states/freeplay/styles/pico/backing-card/middle-loop.png
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/middle-loop.png
rename to ui/states/freeplay/styles/pico/backing-card/middle-loop.png
diff --git a/ui/freeplay/styles/pico/backing-card/pico-confirm/Animation.json b/ui/states/freeplay/styles/pico/backing-card/pico-confirm/Animation.json
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/pico-confirm/Animation.json
rename to ui/states/freeplay/styles/pico/backing-card/pico-confirm/Animation.json
diff --git a/ui/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.json b/ui/states/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.json
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.json
rename to ui/states/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.json
diff --git a/ui/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.png b/ui/states/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.png
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.png
rename to ui/states/freeplay/styles/pico/backing-card/pico-confirm/spritemap1.png
diff --git a/ui/freeplay/styles/pico/backing-card/top-loop.png b/ui/states/freeplay/styles/pico/backing-card/top-loop.png
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/top-loop.png
rename to ui/states/freeplay/styles/pico/backing-card/top-loop.png
diff --git a/ui/freeplay/styles/pico/backing-card/top-loop.xml b/ui/states/freeplay/styles/pico/backing-card/top-loop.xml
similarity index 100%
rename from ui/freeplay/styles/pico/backing-card/top-loop.xml
rename to ui/states/freeplay/styles/pico/backing-card/top-loop.xml
diff --git a/ui/freeplay/styles/pico/difficulty-selector.png b/ui/states/freeplay/styles/pico/difficulty-selector.png
similarity index 100%
rename from ui/freeplay/styles/pico/difficulty-selector.png
rename to ui/states/freeplay/styles/pico/difficulty-selector.png
diff --git a/ui/freeplay/styles/pico/difficulty-selector.xml b/ui/states/freeplay/styles/pico/difficulty-selector.xml
similarity index 100%
rename from ui/freeplay/styles/pico/difficulty-selector.xml
rename to ui/states/freeplay/styles/pico/difficulty-selector.xml
diff --git a/ui/freeplay/styles/pico/digital-numbers.png b/ui/states/freeplay/styles/pico/digital-numbers.png
similarity index 100%
rename from ui/freeplay/styles/pico/digital-numbers.png
rename to ui/states/freeplay/styles/pico/digital-numbers.png
diff --git a/ui/freeplay/styles/pico/digital-numbers.xml b/ui/states/freeplay/styles/pico/digital-numbers.xml
similarity index 100%
rename from ui/freeplay/styles/pico/digital-numbers.xml
rename to ui/states/freeplay/styles/pico/digital-numbers.xml
diff --git a/ui/freeplay/styles/pico/pico.json b/ui/states/freeplay/styles/pico/pico.json
similarity index 100%
rename from ui/freeplay/styles/pico/pico.json
rename to ui/states/freeplay/styles/pico/pico.json
diff --git a/ui/freeplay/styles/unlock/backing-card/darkback.png b/ui/states/freeplay/styles/unlock/backing-card/darkback.png
similarity index 100%
rename from ui/freeplay/styles/unlock/backing-card/darkback.png
rename to ui/states/freeplay/styles/unlock/backing-card/darkback.png
diff --git a/ui/freeplay/styles/unlock/backing-card/multiplyBar.png b/ui/states/freeplay/styles/unlock/backing-card/multiplyBar.png
similarity index 100%
rename from ui/freeplay/styles/unlock/backing-card/multiplyBar.png
rename to ui/states/freeplay/styles/unlock/backing-card/multiplyBar.png
diff --git a/ui/freeplay/styles/unlock/backing-card/orange gradient.png b/ui/states/freeplay/styles/unlock/backing-card/orange gradient.png
similarity index 100%
rename from ui/freeplay/styles/unlock/backing-card/orange gradient.png
rename to ui/states/freeplay/styles/unlock/backing-card/orange gradient.png
diff --git a/ui/freeplay/styles/unlock/backing-card/red gradient.png b/ui/states/freeplay/styles/unlock/backing-card/red gradient.png
similarity index 100%
rename from ui/freeplay/styles/unlock/backing-card/red gradient.png
rename to ui/states/freeplay/styles/unlock/backing-card/red gradient.png
diff --git a/ui/freeplay/styles/unlock/backing-card/red.png b/ui/states/freeplay/styles/unlock/backing-card/red.png
similarity index 100%
rename from ui/freeplay/styles/unlock/backing-card/red.png
rename to ui/states/freeplay/styles/unlock/backing-card/red.png
diff --git a/ui/freeplay/styles/unlock/backing-card/yellow bg piece.png b/ui/states/freeplay/styles/unlock/backing-card/yellow bg piece.png
similarity index 100%
rename from ui/freeplay/styles/unlock/backing-card/yellow bg piece.png
rename to ui/states/freeplay/styles/unlock/backing-card/yellow bg piece.png
diff --git a/ui/freeplay/unfav.mp3 b/ui/states/freeplay/unfav.mp3
similarity index 100%
rename from ui/freeplay/unfav.mp3
rename to ui/states/freeplay/unfav.mp3
diff --git a/ui/freeplay/unfav.ogg b/ui/states/freeplay/unfav.ogg
similarity index 100%
rename from ui/freeplay/unfav.ogg
rename to ui/states/freeplay/unfav.ogg
diff --git a/ui/main-menu/cancel-menu.mp3 b/ui/states/main-menu/cancel-menu.mp3
similarity index 100%
rename from ui/main-menu/cancel-menu.mp3
rename to ui/states/main-menu/cancel-menu.mp3
diff --git a/ui/main-menu/cancel-menu.ogg b/ui/states/main-menu/cancel-menu.ogg
similarity index 100%
rename from ui/main-menu/cancel-menu.ogg
rename to ui/states/main-menu/cancel-menu.ogg
diff --git a/ui/main-menu/confirm-menu.mp3 b/ui/states/main-menu/confirm-menu.mp3
similarity index 100%
rename from ui/main-menu/confirm-menu.mp3
rename to ui/states/main-menu/confirm-menu.mp3
diff --git a/ui/main-menu/confirm-menu.ogg b/ui/states/main-menu/confirm-menu.ogg
similarity index 100%
rename from ui/main-menu/confirm-menu.ogg
rename to ui/states/main-menu/confirm-menu.ogg
diff --git a/ui/main-menu/freaky-menu/freaky-menu-metadata.json b/ui/states/main-menu/freaky-menu/freaky-menu-metadata.json
similarity index 100%
rename from ui/main-menu/freaky-menu/freaky-menu-metadata.json
rename to ui/states/main-menu/freaky-menu/freaky-menu-metadata.json
diff --git a/ui/main-menu/freaky-menu/freaky-menu.mp3 b/ui/states/main-menu/freaky-menu/freaky-menu.mp3
similarity index 100%
rename from ui/main-menu/freaky-menu/freaky-menu.mp3
rename to ui/states/main-menu/freaky-menu/freaky-menu.mp3
diff --git a/ui/main-menu/freaky-menu/freaky-menu.ogg b/ui/states/main-menu/freaky-menu/freaky-menu.ogg
similarity index 100%
rename from ui/main-menu/freaky-menu/freaky-menu.ogg
rename to ui/states/main-menu/freaky-menu/freaky-menu.ogg
diff --git a/ui/main-menu/items/credits.png b/ui/states/main-menu/items/credits.png
similarity index 100%
rename from ui/main-menu/items/credits.png
rename to ui/states/main-menu/items/credits.png
diff --git a/ui/main-menu/items/credits.xml b/ui/states/main-menu/items/credits.xml
similarity index 100%
rename from ui/main-menu/items/credits.xml
rename to ui/states/main-menu/items/credits.xml
diff --git a/ui/main-menu/items/freeplay.png b/ui/states/main-menu/items/freeplay.png
similarity index 100%
rename from ui/main-menu/items/freeplay.png
rename to ui/states/main-menu/items/freeplay.png
diff --git a/ui/main-menu/items/freeplay.xml b/ui/states/main-menu/items/freeplay.xml
similarity index 100%
rename from ui/main-menu/items/freeplay.xml
rename to ui/states/main-menu/items/freeplay.xml
diff --git a/ui/main-menu/items/merch.png b/ui/states/main-menu/items/merch.png
similarity index 100%
rename from ui/main-menu/items/merch.png
rename to ui/states/main-menu/items/merch.png
diff --git a/ui/main-menu/items/merch.xml b/ui/states/main-menu/items/merch.xml
similarity index 100%
rename from ui/main-menu/items/merch.xml
rename to ui/states/main-menu/items/merch.xml
diff --git a/ui/main-menu/items/options.png b/ui/states/main-menu/items/options.png
similarity index 100%
rename from ui/main-menu/items/options.png
rename to ui/states/main-menu/items/options.png
diff --git a/ui/main-menu/items/options.xml b/ui/states/main-menu/items/options.xml
similarity index 100%
rename from ui/main-menu/items/options.xml
rename to ui/states/main-menu/items/options.xml
diff --git a/ui/main-menu/items/story-mode.png b/ui/states/main-menu/items/story-mode.png
similarity index 100%
rename from ui/main-menu/items/story-mode.png
rename to ui/states/main-menu/items/story-mode.png
diff --git a/ui/main-menu/items/story-mode.xml b/ui/states/main-menu/items/story-mode.xml
similarity index 100%
rename from ui/main-menu/items/story-mode.xml
rename to ui/states/main-menu/items/story-mode.xml
diff --git a/ui/main-menu/menu-bg-magenta.png b/ui/states/main-menu/menu-bg-magenta.png
similarity index 100%
rename from ui/main-menu/menu-bg-magenta.png
rename to ui/states/main-menu/menu-bg-magenta.png
diff --git a/ui/main-menu/menu-bg.png b/ui/states/main-menu/menu-bg.png
similarity index 100%
rename from ui/main-menu/menu-bg.png
rename to ui/states/main-menu/menu-bg.png
diff --git a/ui/main-menu/menu-desat.png b/ui/states/main-menu/menu-desat.png
similarity index 100%
rename from ui/main-menu/menu-desat.png
rename to ui/states/main-menu/menu-desat.png
diff --git a/ui/main-menu/screenshot.mp3 b/ui/states/main-menu/screenshot.mp3
similarity index 100%
rename from ui/main-menu/screenshot.mp3
rename to ui/states/main-menu/screenshot.mp3
diff --git a/ui/main-menu/screenshot.ogg b/ui/states/main-menu/screenshot.ogg
similarity index 100%
rename from ui/main-menu/screenshot.ogg
rename to ui/states/main-menu/screenshot.ogg
diff --git a/ui/main-menu/scroll-menu.mp3 b/ui/states/main-menu/scroll-menu.mp3
similarity index 100%
rename from ui/main-menu/scroll-menu.mp3
rename to ui/states/main-menu/scroll-menu.mp3
diff --git a/ui/main-menu/scroll-menu.ogg b/ui/states/main-menu/scroll-menu.ogg
similarity index 100%
rename from ui/main-menu/scroll-menu.ogg
rename to ui/states/main-menu/scroll-menu.ogg
diff --git a/ui/options/alphabet.png b/ui/states/options/alphabet.png
similarity index 100%
rename from ui/options/alphabet.png
rename to ui/states/options/alphabet.png
diff --git a/ui/options/alphabet.xml b/ui/states/options/alphabet.xml
similarity index 100%
rename from ui/options/alphabet.xml
rename to ui/states/options/alphabet.xml
diff --git a/ui/options/checkbox.png b/ui/states/options/checkbox.png
similarity index 100%
rename from ui/options/checkbox.png
rename to ui/states/options/checkbox.png
diff --git a/ui/options/checkbox.xml b/ui/states/options/checkbox.xml
similarity index 100%
rename from ui/options/checkbox.xml
rename to ui/states/options/checkbox.xml
diff --git a/ui/pause/music/alternate/bf-lol.png b/ui/states/pause/music/alternate/bf-lol.png
similarity index 100%
rename from ui/pause/music/alternate/bf-lol.png
rename to ui/states/pause/music/alternate/bf-lol.png
diff --git a/ui/pause/music/alternate/bf-lol.xml b/ui/states/pause/music/alternate/bf-lol.xml
similarity index 100%
rename from ui/pause/music/alternate/bf-lol.xml
rename to ui/states/pause/music/alternate/bf-lol.xml
diff --git a/ui/pause/music/alternate/pause-bg.png b/ui/states/pause/music/alternate/pause-bg.png
similarity index 100%
rename from ui/pause/music/alternate/pause-bg.png
rename to ui/states/pause/music/alternate/pause-bg.png
diff --git a/ui/pause/music/alternate/pause-ui.png b/ui/states/pause/music/alternate/pause-ui.png
similarity index 100%
rename from ui/pause/music/alternate/pause-ui.png
rename to ui/states/pause/music/alternate/pause-ui.png
diff --git a/ui/pause/music/alternate/pause-ui.xml b/ui/states/pause/music/alternate/pause-ui.xml
similarity index 100%
rename from ui/pause/music/alternate/pause-ui.xml
rename to ui/states/pause/music/alternate/pause-ui.xml
diff --git a/ui/pause/music/breakfast-pico/breakfast-pico-metadata.json b/ui/states/pause/music/breakfast-pico/breakfast-pico-metadata.json
similarity index 100%
rename from ui/pause/music/breakfast-pico/breakfast-pico-metadata.json
rename to ui/states/pause/music/breakfast-pico/breakfast-pico-metadata.json
diff --git a/ui/pause/music/breakfast-pico/breakfast-pico.mp3 b/ui/states/pause/music/breakfast-pico/breakfast-pico.mp3
similarity index 100%
rename from ui/pause/music/breakfast-pico/breakfast-pico.mp3
rename to ui/states/pause/music/breakfast-pico/breakfast-pico.mp3
diff --git a/ui/pause/music/breakfast-pico/breakfast-pico.ogg b/ui/states/pause/music/breakfast-pico/breakfast-pico.ogg
similarity index 100%
rename from ui/pause/music/breakfast-pico/breakfast-pico.ogg
rename to ui/states/pause/music/breakfast-pico/breakfast-pico.ogg
diff --git a/ui/pause/music/breakfast-pixel/breakfast-pixel-metadata.json b/ui/states/pause/music/breakfast-pixel/breakfast-pixel-metadata.json
similarity index 100%
rename from ui/pause/music/breakfast-pixel/breakfast-pixel-metadata.json
rename to ui/states/pause/music/breakfast-pixel/breakfast-pixel-metadata.json
diff --git a/ui/pause/music/breakfast-pixel/breakfast-pixel.mp3 b/ui/states/pause/music/breakfast-pixel/breakfast-pixel.mp3
similarity index 100%
rename from ui/pause/music/breakfast-pixel/breakfast-pixel.mp3
rename to ui/states/pause/music/breakfast-pixel/breakfast-pixel.mp3
diff --git a/ui/pause/music/breakfast-pixel/breakfast-pixel.ogg b/ui/states/pause/music/breakfast-pixel/breakfast-pixel.ogg
similarity index 100%
rename from ui/pause/music/breakfast-pixel/breakfast-pixel.ogg
rename to ui/states/pause/music/breakfast-pixel/breakfast-pixel.ogg
diff --git a/ui/pause/music/breakfast/breakfast-metadata.json b/ui/states/pause/music/breakfast/breakfast-metadata.json
similarity index 100%
rename from ui/pause/music/breakfast/breakfast-metadata.json
rename to ui/states/pause/music/breakfast/breakfast-metadata.json
diff --git a/ui/pause/music/breakfast/breakfast.mp3 b/ui/states/pause/music/breakfast/breakfast.mp3
similarity index 100%
rename from ui/pause/music/breakfast/breakfast.mp3
rename to ui/states/pause/music/breakfast/breakfast.mp3
diff --git a/ui/pause/music/breakfast/breakfast.ogg b/ui/states/pause/music/breakfast/breakfast.ogg
similarity index 100%
rename from ui/pause/music/breakfast/breakfast.ogg
rename to ui/states/pause/music/breakfast/breakfast.ogg
diff --git a/ui/results/clear-percent/number-left.png b/ui/states/results/clear-percent/number-left.png
similarity index 100%
rename from ui/results/clear-percent/number-left.png
rename to ui/states/results/clear-percent/number-left.png
diff --git a/ui/results/clear-percent/number-left.xml b/ui/states/results/clear-percent/number-left.xml
similarity index 100%
rename from ui/results/clear-percent/number-left.xml
rename to ui/states/results/clear-percent/number-left.xml
diff --git a/ui/results/clear-percent/number-right.png b/ui/states/results/clear-percent/number-right.png
similarity index 100%
rename from ui/results/clear-percent/number-right.png
rename to ui/states/results/clear-percent/number-right.png
diff --git a/ui/results/clear-percent/number-right.xml b/ui/states/results/clear-percent/number-right.xml
similarity index 100%
rename from ui/results/clear-percent/number-right.xml
rename to ui/states/results/clear-percent/number-right.xml
diff --git a/ui/results/clear-percent/number-small.png b/ui/states/results/clear-percent/number-small.png
similarity index 100%
rename from ui/results/clear-percent/number-small.png
rename to ui/states/results/clear-percent/number-small.png
diff --git a/ui/results/clear-percent/number-small.xml b/ui/states/results/clear-percent/number-small.xml
similarity index 100%
rename from ui/results/clear-percent/number-small.xml
rename to ui/states/results/clear-percent/number-small.xml
diff --git a/ui/results/clear-percent/percent-small.png b/ui/states/results/clear-percent/percent-small.png
similarity index 100%
rename from ui/results/clear-percent/percent-small.png
rename to ui/states/results/clear-percent/percent-small.png
diff --git a/ui/results/clear-percent/percent.png b/ui/states/results/clear-percent/percent.png
similarity index 100%
rename from ui/results/clear-percent/percent.png
rename to ui/states/results/clear-percent/percent.png
diff --git a/ui/results/difficulty/easy.png b/ui/states/results/difficulty/easy.png
similarity index 100%
rename from ui/results/difficulty/easy.png
rename to ui/states/results/difficulty/easy.png
diff --git a/ui/results/difficulty/erect.png b/ui/states/results/difficulty/erect.png
similarity index 100%
rename from ui/results/difficulty/erect.png
rename to ui/states/results/difficulty/erect.png
diff --git a/ui/results/difficulty/hard.png b/ui/states/results/difficulty/hard.png
similarity index 100%
rename from ui/results/difficulty/hard.png
rename to ui/states/results/difficulty/hard.png
diff --git a/ui/results/difficulty/nightmare.png b/ui/states/results/difficulty/nightmare.png
similarity index 100%
rename from ui/results/difficulty/nightmare.png
rename to ui/states/results/difficulty/nightmare.png
diff --git a/ui/results/difficulty/normal.png b/ui/states/results/difficulty/normal.png
similarity index 100%
rename from ui/results/difficulty/normal.png
rename to ui/states/results/difficulty/normal.png
diff --git a/ui/results/interface/highscore-new.png b/ui/states/results/interface/highscore-new.png
similarity index 100%
rename from ui/results/interface/highscore-new.png
rename to ui/states/results/interface/highscore-new.png
diff --git a/ui/results/interface/highscore-new.xml b/ui/states/results/interface/highscore-new.xml
similarity index 100%
rename from ui/results/interface/highscore-new.xml
rename to ui/states/results/interface/highscore-new.xml
diff --git a/ui/results/interface/ratings-popin.png b/ui/states/results/interface/ratings-popin.png
similarity index 100%
rename from ui/results/interface/ratings-popin.png
rename to ui/states/results/interface/ratings-popin.png
diff --git a/ui/results/interface/ratings-popin.xml b/ui/states/results/interface/ratings-popin.xml
similarity index 100%
rename from ui/results/interface/ratings-popin.xml
rename to ui/states/results/interface/ratings-popin.xml
diff --git a/ui/results/interface/results.png b/ui/states/results/interface/results.png
similarity index 100%
rename from ui/results/interface/results.png
rename to ui/states/results/interface/results.png
diff --git a/ui/results/interface/results.xml b/ui/states/results/interface/results.xml
similarity index 100%
rename from ui/results/interface/results.xml
rename to ui/states/results/interface/results.xml
diff --git a/ui/results/interface/score-digital-numbers.png b/ui/states/results/interface/score-digital-numbers.png
similarity index 100%
rename from ui/results/interface/score-digital-numbers.png
rename to ui/states/results/interface/score-digital-numbers.png
diff --git a/ui/results/interface/score-digital-numbers.xml b/ui/states/results/interface/score-digital-numbers.xml
similarity index 100%
rename from ui/results/interface/score-digital-numbers.xml
rename to ui/states/results/interface/score-digital-numbers.xml
diff --git a/ui/results/interface/score-popin.png b/ui/states/results/interface/score-popin.png
similarity index 100%
rename from ui/results/interface/score-popin.png
rename to ui/states/results/interface/score-popin.png
diff --git a/ui/results/interface/score-popin.xml b/ui/states/results/interface/score-popin.xml
similarity index 100%
rename from ui/results/interface/score-popin.xml
rename to ui/states/results/interface/score-popin.xml
diff --git a/ui/results/interface/sound-system.png b/ui/states/results/interface/sound-system.png
similarity index 100%
rename from ui/results/interface/sound-system.png
rename to ui/states/results/interface/sound-system.png
diff --git a/ui/results/interface/sound-system.xml b/ui/states/results/interface/sound-system.xml
similarity index 100%
rename from ui/results/interface/sound-system.xml
rename to ui/states/results/interface/sound-system.xml
diff --git a/ui/results/interface/tallie-number.png b/ui/states/results/interface/tallie-number.png
similarity index 100%
rename from ui/results/interface/tallie-number.png
rename to ui/states/results/interface/tallie-number.png
diff --git a/ui/results/interface/tallie-number.xml b/ui/states/results/interface/tallie-number.xml
similarity index 100%
rename from ui/results/interface/tallie-number.xml
rename to ui/states/results/interface/tallie-number.xml
diff --git a/ui/results/interface/top-bar-black.png b/ui/states/results/interface/top-bar-black.png
similarity index 100%
rename from ui/results/interface/top-bar-black.png
rename to ui/states/results/interface/top-bar-black.png
diff --git a/ui/results/rank-text/scroll-excellent.png b/ui/states/results/rank-text/scroll-excellent.png
similarity index 100%
rename from ui/results/rank-text/scroll-excellent.png
rename to ui/states/results/rank-text/scroll-excellent.png
diff --git a/ui/results/rank-text/scroll-good.png b/ui/states/results/rank-text/scroll-good.png
similarity index 100%
rename from ui/results/rank-text/scroll-good.png
rename to ui/states/results/rank-text/scroll-good.png
diff --git a/ui/results/rank-text/scroll-great.png b/ui/states/results/rank-text/scroll-great.png
similarity index 100%
rename from ui/results/rank-text/scroll-great.png
rename to ui/states/results/rank-text/scroll-great.png
diff --git a/ui/results/rank-text/scroll-loss.png b/ui/states/results/rank-text/scroll-loss.png
similarity index 100%
rename from ui/results/rank-text/scroll-loss.png
rename to ui/states/results/rank-text/scroll-loss.png
diff --git a/ui/results/rank-text/scroll-perfect.png b/ui/states/results/rank-text/scroll-perfect.png
similarity index 100%
rename from ui/results/rank-text/scroll-perfect.png
rename to ui/states/results/rank-text/scroll-perfect.png
diff --git a/ui/results/rank-text/text-excellent.png b/ui/states/results/rank-text/text-excellent.png
similarity index 100%
rename from ui/results/rank-text/text-excellent.png
rename to ui/states/results/rank-text/text-excellent.png
diff --git a/ui/results/rank-text/text-good.png b/ui/states/results/rank-text/text-good.png
similarity index 100%
rename from ui/results/rank-text/text-good.png
rename to ui/states/results/rank-text/text-good.png
diff --git a/ui/results/rank-text/text-great.png b/ui/states/results/rank-text/text-great.png
similarity index 100%
rename from ui/results/rank-text/text-great.png
rename to ui/states/results/rank-text/text-great.png
diff --git a/ui/results/rank-text/text-loss.png b/ui/states/results/rank-text/text-loss.png
similarity index 100%
rename from ui/results/rank-text/text-loss.png
rename to ui/states/results/rank-text/text-loss.png
diff --git a/ui/results/rank-text/text-perfect.png b/ui/states/results/rank-text/text-perfect.png
similarity index 100%
rename from ui/results/rank-text/text-perfect.png
rename to ui/states/results/rank-text/text-perfect.png
diff --git a/ui/story-mode/arrows.png b/ui/states/story-mode/arrows.png
similarity index 100%
rename from ui/story-mode/arrows.png
rename to ui/states/story-mode/arrows.png
diff --git a/ui/story-mode/arrows.xml b/ui/states/story-mode/arrows.xml
similarity index 100%
rename from ui/story-mode/arrows.xml
rename to ui/states/story-mode/arrows.xml
diff --git a/ui/story-mode/difficulties/easy.png b/ui/states/story-mode/difficulties/easy.png
similarity index 100%
rename from ui/story-mode/difficulties/easy.png
rename to ui/states/story-mode/difficulties/easy.png
diff --git a/ui/story-mode/difficulties/erect.png b/ui/states/story-mode/difficulties/erect.png
similarity index 100%
rename from ui/story-mode/difficulties/erect.png
rename to ui/states/story-mode/difficulties/erect.png
diff --git a/ui/story-mode/difficulties/hard.png b/ui/states/story-mode/difficulties/hard.png
similarity index 100%
rename from ui/story-mode/difficulties/hard.png
rename to ui/states/story-mode/difficulties/hard.png
diff --git a/ui/story-mode/difficulties/nightmare.png b/ui/states/story-mode/difficulties/nightmare.png
similarity index 100%
rename from ui/story-mode/difficulties/nightmare.png
rename to ui/states/story-mode/difficulties/nightmare.png
diff --git a/ui/story-mode/difficulties/nightmare.xml b/ui/states/story-mode/difficulties/nightmare.xml
similarity index 100%
rename from ui/story-mode/difficulties/nightmare.xml
rename to ui/states/story-mode/difficulties/nightmare.xml
diff --git a/ui/story-mode/difficulties/normal.png b/ui/states/story-mode/difficulties/normal.png
similarity index 100%
rename from ui/story-mode/difficulties/normal.png
rename to ui/states/story-mode/difficulties/normal.png
diff --git a/ui/story-mode/levels/tutorial.json b/ui/states/story-mode/levels/tutorial.json
similarity index 100%
rename from ui/story-mode/levels/tutorial.json
rename to ui/states/story-mode/levels/tutorial.json
diff --git a/ui/story-mode/levels/tutorial.png b/ui/states/story-mode/levels/tutorial.png
similarity index 100%
rename from ui/story-mode/levels/tutorial.png
rename to ui/states/story-mode/levels/tutorial.png
diff --git a/ui/story-mode/levels/week1.json b/ui/states/story-mode/levels/week1.json
similarity index 100%
rename from ui/story-mode/levels/week1.json
rename to ui/states/story-mode/levels/week1.json
diff --git a/ui/story-mode/levels/week1.png b/ui/states/story-mode/levels/week1.png
similarity index 100%
rename from ui/story-mode/levels/week1.png
rename to ui/states/story-mode/levels/week1.png
diff --git a/ui/story-mode/levels/week2.json b/ui/states/story-mode/levels/week2.json
similarity index 100%
rename from ui/story-mode/levels/week2.json
rename to ui/states/story-mode/levels/week2.json
diff --git a/ui/story-mode/levels/week2.png b/ui/states/story-mode/levels/week2.png
similarity index 100%
rename from ui/story-mode/levels/week2.png
rename to ui/states/story-mode/levels/week2.png
diff --git a/ui/story-mode/levels/week3.json b/ui/states/story-mode/levels/week3.json
similarity index 100%
rename from ui/story-mode/levels/week3.json
rename to ui/states/story-mode/levels/week3.json
diff --git a/ui/story-mode/levels/week3.png b/ui/states/story-mode/levels/week3.png
similarity index 100%
rename from ui/story-mode/levels/week3.png
rename to ui/states/story-mode/levels/week3.png
diff --git a/ui/story-mode/levels/week4.json b/ui/states/story-mode/levels/week4.json
similarity index 100%
rename from ui/story-mode/levels/week4.json
rename to ui/states/story-mode/levels/week4.json
diff --git a/ui/story-mode/levels/week4.png b/ui/states/story-mode/levels/week4.png
similarity index 100%
rename from ui/story-mode/levels/week4.png
rename to ui/states/story-mode/levels/week4.png
diff --git a/ui/story-mode/levels/week5.json b/ui/states/story-mode/levels/week5.json
similarity index 100%
rename from ui/story-mode/levels/week5.json
rename to ui/states/story-mode/levels/week5.json
diff --git a/ui/story-mode/levels/week5.png b/ui/states/story-mode/levels/week5.png
similarity index 100%
rename from ui/story-mode/levels/week5.png
rename to ui/states/story-mode/levels/week5.png
diff --git a/ui/story-mode/levels/week6.json b/ui/states/story-mode/levels/week6.json
similarity index 100%
rename from ui/story-mode/levels/week6.json
rename to ui/states/story-mode/levels/week6.json
diff --git a/ui/story-mode/levels/week6.png b/ui/states/story-mode/levels/week6.png
similarity index 100%
rename from ui/story-mode/levels/week6.png
rename to ui/states/story-mode/levels/week6.png
diff --git a/ui/story-mode/levels/week7.json b/ui/states/story-mode/levels/week7.json
similarity index 100%
rename from ui/story-mode/levels/week7.json
rename to ui/states/story-mode/levels/week7.json
diff --git a/ui/story-mode/levels/week7.png b/ui/states/story-mode/levels/week7.png
similarity index 100%
rename from ui/story-mode/levels/week7.png
rename to ui/states/story-mode/levels/week7.png
diff --git a/ui/story-mode/levels/weekend1.hxc b/ui/states/story-mode/levels/weekend1.hxc
similarity index 100%
rename from ui/story-mode/levels/weekend1.hxc
rename to ui/states/story-mode/levels/weekend1.hxc
diff --git a/ui/story-mode/levels/weekend1.json b/ui/states/story-mode/levels/weekend1.json
similarity index 100%
rename from ui/story-mode/levels/weekend1.json
rename to ui/states/story-mode/levels/weekend1.json
diff --git a/ui/story-mode/levels/weekend1.png b/ui/states/story-mode/levels/weekend1.png
similarity index 100%
rename from ui/story-mode/levels/weekend1.png
rename to ui/states/story-mode/levels/weekend1.png
diff --git a/ui/story-mode/lock.png b/ui/states/story-mode/lock.png
similarity index 100%
rename from ui/story-mode/lock.png
rename to ui/states/story-mode/lock.png
diff --git a/ui/story-mode/props/bf.png b/ui/states/story-mode/props/bf.png
similarity index 100%
rename from ui/story-mode/props/bf.png
rename to ui/states/story-mode/props/bf.png
diff --git a/ui/story-mode/props/bf.xml b/ui/states/story-mode/props/bf.xml
similarity index 100%
rename from ui/story-mode/props/bf.xml
rename to ui/states/story-mode/props/bf.xml
diff --git a/ui/story-mode/props/dad.png b/ui/states/story-mode/props/dad.png
similarity index 100%
rename from ui/story-mode/props/dad.png
rename to ui/states/story-mode/props/dad.png
diff --git a/ui/story-mode/props/dad.xml b/ui/states/story-mode/props/dad.xml
similarity index 100%
rename from ui/story-mode/props/dad.xml
rename to ui/states/story-mode/props/dad.xml
diff --git a/ui/story-mode/props/darnell.png b/ui/states/story-mode/props/darnell.png
similarity index 100%
rename from ui/story-mode/props/darnell.png
rename to ui/states/story-mode/props/darnell.png
diff --git a/ui/story-mode/props/darnell.xml b/ui/states/story-mode/props/darnell.xml
similarity index 100%
rename from ui/story-mode/props/darnell.xml
rename to ui/states/story-mode/props/darnell.xml
diff --git a/ui/story-mode/props/gf.png b/ui/states/story-mode/props/gf.png
similarity index 100%
rename from ui/story-mode/props/gf.png
rename to ui/states/story-mode/props/gf.png
diff --git a/ui/story-mode/props/gf.xml b/ui/states/story-mode/props/gf.xml
similarity index 100%
rename from ui/story-mode/props/gf.xml
rename to ui/states/story-mode/props/gf.xml
diff --git a/ui/story-mode/props/mom.png b/ui/states/story-mode/props/mom.png
similarity index 100%
rename from ui/story-mode/props/mom.png
rename to ui/states/story-mode/props/mom.png
diff --git a/ui/story-mode/props/mom.xml b/ui/states/story-mode/props/mom.xml
similarity index 100%
rename from ui/story-mode/props/mom.xml
rename to ui/states/story-mode/props/mom.xml
diff --git a/ui/story-mode/props/nene.png b/ui/states/story-mode/props/nene.png
similarity index 100%
rename from ui/story-mode/props/nene.png
rename to ui/states/story-mode/props/nene.png
diff --git a/ui/story-mode/props/nene.xml b/ui/states/story-mode/props/nene.xml
similarity index 100%
rename from ui/story-mode/props/nene.xml
rename to ui/states/story-mode/props/nene.xml
diff --git a/ui/story-mode/props/parents-xmas.png b/ui/states/story-mode/props/parents-xmas.png
similarity index 100%
rename from ui/story-mode/props/parents-xmas.png
rename to ui/states/story-mode/props/parents-xmas.png
diff --git a/ui/story-mode/props/parents-xmas.xml b/ui/states/story-mode/props/parents-xmas.xml
similarity index 100%
rename from ui/story-mode/props/parents-xmas.xml
rename to ui/states/story-mode/props/parents-xmas.xml
diff --git a/ui/story-mode/props/pico-player.png b/ui/states/story-mode/props/pico-player.png
similarity index 100%
rename from ui/story-mode/props/pico-player.png
rename to ui/states/story-mode/props/pico-player.png
diff --git a/ui/story-mode/props/pico-player.xml b/ui/states/story-mode/props/pico-player.xml
similarity index 100%
rename from ui/story-mode/props/pico-player.xml
rename to ui/states/story-mode/props/pico-player.xml
diff --git a/ui/story-mode/props/pico.png b/ui/states/story-mode/props/pico.png
similarity index 100%
rename from ui/story-mode/props/pico.png
rename to ui/states/story-mode/props/pico.png
diff --git a/ui/story-mode/props/pico.xml b/ui/states/story-mode/props/pico.xml
similarity index 100%
rename from ui/story-mode/props/pico.xml
rename to ui/states/story-mode/props/pico.xml
diff --git a/ui/story-mode/props/senpai.png b/ui/states/story-mode/props/senpai.png
similarity index 100%
rename from ui/story-mode/props/senpai.png
rename to ui/states/story-mode/props/senpai.png
diff --git a/ui/story-mode/props/senpai.xml b/ui/states/story-mode/props/senpai.xml
similarity index 100%
rename from ui/story-mode/props/senpai.xml
rename to ui/states/story-mode/props/senpai.xml
diff --git a/ui/story-mode/props/spooky.png b/ui/states/story-mode/props/spooky.png
similarity index 100%
rename from ui/story-mode/props/spooky.png
rename to ui/states/story-mode/props/spooky.png
diff --git a/ui/story-mode/props/spooky.xml b/ui/states/story-mode/props/spooky.xml
similarity index 100%
rename from ui/story-mode/props/spooky.xml
rename to ui/states/story-mode/props/spooky.xml
diff --git a/ui/story-mode/props/tankman.png b/ui/states/story-mode/props/tankman.png
similarity index 100%
rename from ui/story-mode/props/tankman.png
rename to ui/states/story-mode/props/tankman.png
diff --git a/ui/story-mode/props/tankman.xml b/ui/states/story-mode/props/tankman.xml
similarity index 100%
rename from ui/story-mode/props/tankman.xml
rename to ui/states/story-mode/props/tankman.xml
diff --git a/ui/title/gf-dance-title.png b/ui/states/title/gf-dance-title.png
similarity index 100%
rename from ui/title/gf-dance-title.png
rename to ui/states/title/gf-dance-title.png
diff --git a/ui/title/gf-dance-title.xml b/ui/states/title/gf-dance-title.xml
similarity index 100%
rename from ui/title/gf-dance-title.xml
rename to ui/states/title/gf-dance-title.xml
diff --git a/ui/title/girlfriends-ringtone/girlfriends-ringtone-metadata.json b/ui/states/title/girlfriends-ringtone/girlfriends-ringtone-metadata.json
similarity index 100%
rename from ui/title/girlfriends-ringtone/girlfriends-ringtone-metadata.json
rename to ui/states/title/girlfriends-ringtone/girlfriends-ringtone-metadata.json
diff --git a/ui/title/girlfriends-ringtone/girlfriends-ringtone.mp3 b/ui/states/title/girlfriends-ringtone/girlfriends-ringtone.mp3
similarity index 100%
rename from ui/title/girlfriends-ringtone/girlfriends-ringtone.mp3
rename to ui/states/title/girlfriends-ringtone/girlfriends-ringtone.mp3
diff --git a/ui/title/girlfriends-ringtone/girlfriends-ringtone.ogg b/ui/states/title/girlfriends-ringtone/girlfriends-ringtone.ogg
similarity index 100%
rename from ui/title/girlfriends-ringtone/girlfriends-ringtone.ogg
rename to ui/states/title/girlfriends-ringtone/girlfriends-ringtone.ogg
diff --git a/ui/title/intro-text.txt b/ui/states/title/intro-text.txt
similarity index 100%
rename from ui/title/intro-text.txt
rename to ui/states/title/intro-text.txt
diff --git a/ui/title/logo-bumpin.png b/ui/states/title/logo-bumpin.png
similarity index 100%
rename from ui/title/logo-bumpin.png
rename to ui/states/title/logo-bumpin.png
diff --git a/ui/title/logo-bumpin.xml b/ui/states/title/logo-bumpin.xml
similarity index 100%
rename from ui/title/logo-bumpin.xml
rename to ui/states/title/logo-bumpin.xml
diff --git a/ui/title/newgrounds-logo-animated.png b/ui/states/title/newgrounds-logo-animated.png
similarity index 100%
rename from ui/title/newgrounds-logo-animated.png
rename to ui/states/title/newgrounds-logo-animated.png
diff --git a/ui/title/newgrounds-logo-classic.png b/ui/states/title/newgrounds-logo-classic.png
similarity index 100%
rename from ui/title/newgrounds-logo-classic.png
rename to ui/states/title/newgrounds-logo-classic.png
diff --git a/ui/title/newgrounds-logo.png b/ui/states/title/newgrounds-logo.png
similarity index 100%
rename from ui/title/newgrounds-logo.png
rename to ui/states/title/newgrounds-logo.png
diff --git a/ui/title/title-enter.png b/ui/states/title/title-enter.png
similarity index 100%
rename from ui/title/title-enter.png
rename to ui/states/title/title-enter.png
diff --git a/ui/title/title-enter.xml b/ui/states/title/title-enter.xml
similarity index 100%
rename from ui/title/title-enter.xml
rename to ui/states/title/title-enter.xml
diff --git a/ui/title/toy-commercial.mp4 b/ui/states/title/toy-commercial.mp4
similarity index 100%
rename from ui/title/toy-commercial.mp4
rename to ui/states/title/toy-commercial.mp4