diff --git a/assets/config/alphabet.xml b/assets/data/alphabet.xml similarity index 100% rename from assets/config/alphabet.xml rename to assets/data/alphabet.xml diff --git a/assets/characters/bf-car/meta.xml b/assets/data/characters/bf-car.xml similarity index 100% rename from assets/characters/bf-car/meta.xml rename to assets/data/characters/bf-car.xml diff --git a/assets/characters/bf-christmas/meta.xml b/assets/data/characters/bf-christmas.xml similarity index 100% rename from assets/characters/bf-christmas/meta.xml rename to assets/data/characters/bf-christmas.xml diff --git a/assets/characters/bf-dead/meta.xml b/assets/data/characters/bf-dead.xml similarity index 100% rename from assets/characters/bf-dead/meta.xml rename to assets/data/characters/bf-dead.xml diff --git a/assets/characters/bf-holding-gf/meta.xml b/assets/data/characters/bf-holding-gf.xml similarity index 100% rename from assets/characters/bf-holding-gf/meta.xml rename to assets/data/characters/bf-holding-gf.xml diff --git a/assets/characters/bf-pixel/meta.xml b/assets/data/characters/bf-pixel.xml similarity index 100% rename from assets/characters/bf-pixel/meta.xml rename to assets/data/characters/bf-pixel.xml diff --git a/assets/characters/bf/meta.xml b/assets/data/characters/bf.xml similarity index 100% rename from assets/characters/bf/meta.xml rename to assets/data/characters/bf.xml diff --git a/assets/characters/da/meta.xml b/assets/data/characters/da.xml similarity index 100% rename from assets/characters/da/meta.xml rename to assets/data/characters/da.xml diff --git a/assets/characters/dad/meta.xml b/assets/data/characters/dad.xml similarity index 100% rename from assets/characters/dad/meta.xml rename to assets/data/characters/dad.xml diff --git a/assets/characters/gf-car/meta.xml b/assets/data/characters/gf-car.xml similarity index 100% rename from assets/characters/gf-car/meta.xml rename to assets/data/characters/gf-car.xml diff --git a/assets/characters/gf-christmas/meta.xml b/assets/data/characters/gf-christmas.xml similarity index 100% rename from assets/characters/gf-christmas/meta.xml rename to assets/data/characters/gf-christmas.xml diff --git a/assets/characters/gf-pixel/meta.xml b/assets/data/characters/gf-pixel.xml similarity index 100% rename from assets/characters/gf-pixel/meta.xml rename to assets/data/characters/gf-pixel.xml diff --git a/assets/characters/gf-tankmen/meta.xml b/assets/data/characters/gf-tankmen.xml similarity index 100% rename from assets/characters/gf-tankmen/meta.xml rename to assets/data/characters/gf-tankmen.xml diff --git a/assets/characters/gf/meta.xml b/assets/data/characters/gf.xml similarity index 100% rename from assets/characters/gf/meta.xml rename to assets/data/characters/gf.xml diff --git a/assets/characters/mom-car/meta.xml b/assets/data/characters/mom-car.xml similarity index 100% rename from assets/characters/mom-car/meta.xml rename to assets/data/characters/mom-car.xml diff --git a/assets/characters/mom/meta.xml b/assets/data/characters/mom.xml similarity index 100% rename from assets/characters/mom/meta.xml rename to assets/data/characters/mom.xml diff --git a/assets/characters/monster-christmas/meta.xml b/assets/data/characters/monster-christmas.xml similarity index 100% rename from assets/characters/monster-christmas/meta.xml rename to assets/data/characters/monster-christmas.xml diff --git a/assets/characters/monster/meta.xml b/assets/data/characters/monster.xml similarity index 100% rename from assets/characters/monster/meta.xml rename to assets/data/characters/monster.xml diff --git a/assets/characters/parents-christmas/meta.xml b/assets/data/characters/parents-christmas.xml similarity index 100% rename from assets/characters/parents-christmas/meta.xml rename to assets/data/characters/parents-christmas.xml diff --git a/assets/characters/pico-speakers/scripts/pico-speakers.hx b/assets/data/characters/pico-speakers.hx similarity index 100% rename from assets/characters/pico-speakers/scripts/pico-speakers.hx rename to assets/data/characters/pico-speakers.hx diff --git a/assets/characters/pico-speakers/meta.xml b/assets/data/characters/pico-speakers.xml similarity index 100% rename from assets/characters/pico-speakers/meta.xml rename to assets/data/characters/pico-speakers.xml diff --git a/assets/characters/pico/meta.xml b/assets/data/characters/pico.xml similarity index 100% rename from assets/characters/pico/meta.xml rename to assets/data/characters/pico.xml diff --git a/assets/characters/senpai-angry/meta.xml b/assets/data/characters/senpai-angry.xml similarity index 100% rename from assets/characters/senpai-angry/meta.xml rename to assets/data/characters/senpai-angry.xml diff --git a/assets/characters/senpai/meta.xml b/assets/data/characters/senpai.xml similarity index 100% rename from assets/characters/senpai/meta.xml rename to assets/data/characters/senpai.xml diff --git a/assets/characters/spirit/meta.xml b/assets/data/characters/spirit.xml similarity index 100% rename from assets/characters/spirit/meta.xml rename to assets/data/characters/spirit.xml diff --git a/assets/characters/spooky/meta.xml b/assets/data/characters/spooky.xml similarity index 100% rename from assets/characters/spooky/meta.xml rename to assets/data/characters/spooky.xml diff --git a/assets/characters/tankman/meta.xml b/assets/data/characters/tankman.xml similarity index 100% rename from assets/characters/tankman/meta.xml rename to assets/data/characters/tankman.xml diff --git a/assets/config/discord.json b/assets/data/config/discord.json similarity index 100% rename from assets/config/discord.json rename to assets/data/config/discord.json diff --git a/assets/config/menuItems.txt b/assets/data/config/menuItems.txt similarity index 100% rename from assets/config/menuItems.txt rename to assets/data/config/menuItems.txt diff --git a/assets/config/options.xml b/assets/data/config/options.xml similarity index 100% rename from assets/config/options.xml rename to assets/data/config/options.xml diff --git a/assets/game/dialogue/boxes/default.xml b/assets/data/dialogue/boxes/default.xml similarity index 100% rename from assets/game/dialogue/boxes/default.xml rename to assets/data/dialogue/boxes/default.xml diff --git a/assets/game/dialogue/characters/boyfriend.xml b/assets/data/dialogue/characters/boyfriend.xml similarity index 100% rename from assets/game/dialogue/characters/boyfriend.xml rename to assets/data/dialogue/characters/boyfriend.xml diff --git a/assets/game/dialogue/characters/dad.xml b/assets/data/dialogue/characters/dad.xml similarity index 100% rename from assets/game/dialogue/characters/dad.xml rename to assets/data/dialogue/characters/dad.xml diff --git a/assets/game/dialogue/characters/niko.xml b/assets/data/dialogue/characters/niko.xml similarity index 100% rename from assets/game/dialogue/characters/niko.xml rename to assets/data/dialogue/characters/niko.xml diff --git a/assets/songs/songs.txt b/assets/data/freeplaySonglist.txt similarity index 100% rename from assets/songs/songs.txt rename to assets/data/freeplaySonglist.txt diff --git a/assets/scripting/global.hx b/assets/data/global.hx similarity index 100% rename from assets/scripting/global.hx rename to assets/data/global.hx diff --git a/assets/scripting/scripts/pixel.hx b/assets/data/scripts/pixel.hx similarity index 100% rename from assets/scripting/scripts/pixel.hx rename to assets/data/scripts/pixel.hx diff --git a/assets/scripting/scripts/week6-pause.hx b/assets/data/scripts/week6-pause.hx similarity index 100% rename from assets/scripting/scripts/week6-pause.hx rename to assets/data/scripts/week6-pause.hx diff --git a/assets/specialThanks.txt b/assets/data/specialThanks.txt similarity index 100% rename from assets/specialThanks.txt rename to assets/data/specialThanks.txt diff --git a/assets/game/splashes/default.xml b/assets/data/splashes/default.xml similarity index 100% rename from assets/game/splashes/default.xml rename to assets/data/splashes/default.xml diff --git a/assets/game/splashes/secret.xml b/assets/data/splashes/secret.xml similarity index 100% rename from assets/game/splashes/secret.xml rename to assets/data/splashes/secret.xml diff --git a/assets/stages/limo/script/stage.hx b/assets/data/stages/limo.hx similarity index 100% rename from assets/stages/limo/script/stage.hx rename to assets/data/stages/limo.hx diff --git a/assets/stages/limo/stage.xml b/assets/data/stages/limo.xml similarity index 100% rename from assets/stages/limo/stage.xml rename to assets/data/stages/limo.xml diff --git a/assets/stages/mall-evil/stage.xml b/assets/data/stages/mall-evil.xml similarity index 100% rename from assets/stages/mall-evil/stage.xml rename to assets/data/stages/mall-evil.xml diff --git a/assets/stages/mall/stage.xml b/assets/data/stages/mall.xml similarity index 100% rename from assets/stages/mall/stage.xml rename to assets/data/stages/mall.xml diff --git a/assets/stages/philly/scripts/stage.hx b/assets/data/stages/philly.hx similarity index 100% rename from assets/stages/philly/scripts/stage.hx rename to assets/data/stages/philly.hx diff --git a/assets/stages/philly/stage.xml b/assets/data/stages/philly.xml similarity index 100% rename from assets/stages/philly/stage.xml rename to assets/data/stages/philly.xml diff --git a/assets/stages/school-evil/scripts/stage.hx b/assets/data/stages/school-evil.hx similarity index 100% rename from assets/stages/school-evil/scripts/stage.hx rename to assets/data/stages/school-evil.hx diff --git a/assets/stages/school-evil/stage.xml b/assets/data/stages/school-evil.xml similarity index 75% rename from assets/stages/school-evil/stage.xml rename to assets/data/stages/school-evil.xml index e4593eac..63203ecf 100644 --- a/assets/stages/school-evil/stage.xml +++ b/assets/data/stages/school-evil.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/assets/stages/school/scripts/school.hx b/assets/data/stages/school.hx similarity index 100% rename from assets/stages/school/scripts/school.hx rename to assets/data/stages/school.hx diff --git a/assets/stages/school/stage.xml b/assets/data/stages/school.xml similarity index 100% rename from assets/stages/school/stage.xml rename to assets/data/stages/school.xml diff --git a/assets/stages/spooky/scripts/spooky.hx b/assets/data/stages/spooky.hx similarity index 100% rename from assets/stages/spooky/scripts/spooky.hx rename to assets/data/stages/spooky.hx diff --git a/assets/stages/spooky/spooky.xml b/assets/data/stages/spooky.xml similarity index 100% rename from assets/stages/spooky/spooky.xml rename to assets/data/stages/spooky.xml diff --git a/assets/stages/stage/stage.xml b/assets/data/stages/stage.xml similarity index 100% rename from assets/stages/stage/stage.xml rename to assets/data/stages/stage.xml diff --git a/assets/stages/tank/scripts/tank.hx b/assets/data/stages/tank.hx similarity index 100% rename from assets/stages/tank/scripts/tank.hx rename to assets/data/stages/tank.hx diff --git a/assets/stages/tank/tank.xml b/assets/data/stages/tank.xml similarity index 100% rename from assets/stages/tank/tank.xml rename to assets/data/stages/tank.xml diff --git a/assets/config/introText.txt b/assets/data/titlescreen/introText.txt similarity index 100% rename from assets/config/introText.txt rename to assets/data/titlescreen/introText.txt diff --git a/assets/config/titlescreen.xml b/assets/data/titlescreen/titlescreen.xml similarity index 100% rename from assets/config/titlescreen.xml rename to assets/data/titlescreen/titlescreen.xml diff --git a/assets/weeks/characters/bf.xml b/assets/data/weeks/characters/bf.xml similarity index 100% rename from assets/weeks/characters/bf.xml rename to assets/data/weeks/characters/bf.xml diff --git a/assets/weeks/characters/dad.xml b/assets/data/weeks/characters/dad.xml similarity index 100% rename from assets/weeks/characters/dad.xml rename to assets/data/weeks/characters/dad.xml diff --git a/assets/weeks/characters/gf.xml b/assets/data/weeks/characters/gf.xml similarity index 100% rename from assets/weeks/characters/gf.xml rename to assets/data/weeks/characters/gf.xml diff --git a/assets/weeks/characters/mom.xml b/assets/data/weeks/characters/mom.xml similarity index 100% rename from assets/weeks/characters/mom.xml rename to assets/data/weeks/characters/mom.xml diff --git a/assets/weeks/characters/parents-christmas.xml b/assets/data/weeks/characters/parents-christmas.xml similarity index 100% rename from assets/weeks/characters/parents-christmas.xml rename to assets/data/weeks/characters/parents-christmas.xml diff --git a/assets/weeks/characters/pico.xml b/assets/data/weeks/characters/pico.xml similarity index 100% rename from assets/weeks/characters/pico.xml rename to assets/data/weeks/characters/pico.xml diff --git a/assets/weeks/characters/senpai.xml b/assets/data/weeks/characters/senpai.xml similarity index 100% rename from assets/weeks/characters/senpai.xml rename to assets/data/weeks/characters/senpai.xml diff --git a/assets/weeks/characters/spooky.xml b/assets/data/weeks/characters/spooky.xml similarity index 100% rename from assets/weeks/characters/spooky.xml rename to assets/data/weeks/characters/spooky.xml diff --git a/assets/weeks/characters/tankman.xml b/assets/data/weeks/characters/tankman.xml similarity index 100% rename from assets/weeks/characters/tankman.xml rename to assets/data/weeks/characters/tankman.xml diff --git a/assets/weeks/weeks.txt b/assets/data/weeks/weeks.txt similarity index 100% rename from assets/weeks/weeks.txt rename to assets/data/weeks/weeks.txt diff --git a/assets/weeks/weeks/tutorial.xml b/assets/data/weeks/weeks/tutorial.xml similarity index 100% rename from assets/weeks/weeks/tutorial.xml rename to assets/data/weeks/weeks/tutorial.xml diff --git a/assets/weeks/weeks/week1.xml b/assets/data/weeks/weeks/week1.xml similarity index 100% rename from assets/weeks/weeks/week1.xml rename to assets/data/weeks/weeks/week1.xml diff --git a/assets/weeks/weeks/week2.xml b/assets/data/weeks/weeks/week2.xml similarity index 100% rename from assets/weeks/weeks/week2.xml rename to assets/data/weeks/weeks/week2.xml diff --git a/assets/weeks/weeks/week3.xml b/assets/data/weeks/weeks/week3.xml similarity index 100% rename from assets/weeks/weeks/week3.xml rename to assets/data/weeks/weeks/week3.xml diff --git a/assets/weeks/weeks/week4.xml b/assets/data/weeks/weeks/week4.xml similarity index 100% rename from assets/weeks/weeks/week4.xml rename to assets/data/weeks/weeks/week4.xml diff --git a/assets/weeks/weeks/week5.xml b/assets/data/weeks/weeks/week5.xml similarity index 100% rename from assets/weeks/weeks/week5.xml rename to assets/data/weeks/weeks/week5.xml diff --git a/assets/weeks/weeks/week6.xml b/assets/data/weeks/weeks/week6.xml similarity index 100% rename from assets/weeks/weeks/week6.xml rename to assets/data/weeks/weeks/week6.xml diff --git a/assets/weeks/weeks/week7.xml b/assets/data/weeks/weeks/week7.xml similarity index 100% rename from assets/weeks/weeks/week7.xml rename to assets/data/weeks/weeks/week7.xml diff --git a/assets_old/fonts/pixel.otf b/assets/fonts/pixel.otf similarity index 100% rename from assets_old/fonts/pixel.otf rename to assets/fonts/pixel.otf diff --git a/assets_old/fonts/vcr.ttf b/assets/fonts/vcr.ttf similarity index 100% rename from assets_old/fonts/vcr.ttf rename to assets/fonts/vcr.ttf diff --git a/assets/characters/bf-car/sprite.png b/assets/images/characters/bf-car.png similarity index 100% rename from assets/characters/bf-car/sprite.png rename to assets/images/characters/bf-car.png diff --git a/assets/characters/bf-car/sprite.xml b/assets/images/characters/bf-car.xml similarity index 100% rename from assets/characters/bf-car/sprite.xml rename to assets/images/characters/bf-car.xml diff --git a/assets/characters/bf-christmas/sprite.png b/assets/images/characters/bf-christmas.png similarity index 100% rename from assets/characters/bf-christmas/sprite.png rename to assets/images/characters/bf-christmas.png diff --git a/assets/characters/bf-christmas/sprite.xml b/assets/images/characters/bf-christmas.xml similarity index 100% rename from assets/characters/bf-christmas/sprite.xml rename to assets/images/characters/bf-christmas.xml diff --git a/assets/characters/bf-dead/sprite.png b/assets/images/characters/bf-dead.png similarity index 100% rename from assets/characters/bf-dead/sprite.png rename to assets/images/characters/bf-dead.png diff --git a/assets/characters/bf-dead/sprite.xml b/assets/images/characters/bf-dead.xml similarity index 100% rename from assets/characters/bf-dead/sprite.xml rename to assets/images/characters/bf-dead.xml diff --git a/assets/characters/bf-holding-gf/sprite.png b/assets/images/characters/bf-holding-gf.png similarity index 100% rename from assets/characters/bf-holding-gf/sprite.png rename to assets/images/characters/bf-holding-gf.png diff --git a/assets/characters/bf-holding-gf/sprite.xml b/assets/images/characters/bf-holding-gf.xml similarity index 100% rename from assets/characters/bf-holding-gf/sprite.xml rename to assets/images/characters/bf-holding-gf.xml diff --git a/assets/characters/bf-pixel/sprite.png b/assets/images/characters/bf-pixel.png similarity index 100% rename from assets/characters/bf-pixel/sprite.png rename to assets/images/characters/bf-pixel.png diff --git a/assets/characters/bf-pixel/sprite.xml b/assets/images/characters/bf-pixel.xml similarity index 100% rename from assets/characters/bf-pixel/sprite.xml rename to assets/images/characters/bf-pixel.xml diff --git a/assets/characters/bf/sprite.png b/assets/images/characters/bf.png similarity index 100% rename from assets/characters/bf/sprite.png rename to assets/images/characters/bf.png diff --git a/assets/characters/bf/sprite.xml b/assets/images/characters/bf.xml similarity index 100% rename from assets/characters/bf/sprite.xml rename to assets/images/characters/bf.xml diff --git a/assets/characters/da/sprite.png b/assets/images/characters/da.png similarity index 100% rename from assets/characters/da/sprite.png rename to assets/images/characters/da.png diff --git a/assets/characters/da/sprite.xml b/assets/images/characters/da.xml similarity index 100% rename from assets/characters/da/sprite.xml rename to assets/images/characters/da.xml diff --git a/assets/characters/dad/sprite.png b/assets/images/characters/dad.png similarity index 100% rename from assets/characters/dad/sprite.png rename to assets/images/characters/dad.png diff --git a/assets/characters/dad/sprite.xml b/assets/images/characters/dad.xml similarity index 100% rename from assets/characters/dad/sprite.xml rename to assets/images/characters/dad.xml diff --git a/assets/characters/gf-car/sprite/Animation.json b/assets/images/characters/gf-car/Animation.json similarity index 100% rename from assets/characters/gf-car/sprite/Animation.json rename to assets/images/characters/gf-car/Animation.json diff --git a/assets/characters/gf-car/sprite/spritemap1.json b/assets/images/characters/gf-car/spritemap1.json similarity index 100% rename from assets/characters/gf-car/sprite/spritemap1.json rename to assets/images/characters/gf-car/spritemap1.json diff --git a/assets/characters/gf-car/sprite/spritemap1.png b/assets/images/characters/gf-car/spritemap1.png similarity index 100% rename from assets/characters/gf-car/sprite/spritemap1.png rename to assets/images/characters/gf-car/spritemap1.png diff --git a/assets/characters/gf-christmas/sprite/Animation.json b/assets/images/characters/gf-christmas/Animation.json similarity index 100% rename from assets/characters/gf-christmas/sprite/Animation.json rename to assets/images/characters/gf-christmas/Animation.json diff --git a/assets/characters/gf-christmas/sprite/spritemap1.json b/assets/images/characters/gf-christmas/spritemap1.json similarity index 100% rename from assets/characters/gf-christmas/sprite/spritemap1.json rename to assets/images/characters/gf-christmas/spritemap1.json diff --git a/assets/characters/gf-christmas/sprite/spritemap1.png b/assets/images/characters/gf-christmas/spritemap1.png similarity index 100% rename from assets/characters/gf-christmas/sprite/spritemap1.png rename to assets/images/characters/gf-christmas/spritemap1.png diff --git a/assets/characters/gf-pixel/sprite.png b/assets/images/characters/gf-pixel.png similarity index 100% rename from assets/characters/gf-pixel/sprite.png rename to assets/images/characters/gf-pixel.png diff --git a/assets/characters/gf-pixel/sprite.xml b/assets/images/characters/gf-pixel.xml similarity index 100% rename from assets/characters/gf-pixel/sprite.xml rename to assets/images/characters/gf-pixel.xml diff --git a/assets/characters/gf-tankmen/sprite/Animation.json b/assets/images/characters/gf-tankmen/Animation.json similarity index 100% rename from assets/characters/gf-tankmen/sprite/Animation.json rename to assets/images/characters/gf-tankmen/Animation.json diff --git a/assets/characters/gf-tankmen/sprite/spritemap1.json b/assets/images/characters/gf-tankmen/spritemap1.json similarity index 100% rename from assets/characters/gf-tankmen/sprite/spritemap1.json rename to assets/images/characters/gf-tankmen/spritemap1.json diff --git a/assets/characters/gf-tankmen/sprite/spritemap1.png b/assets/images/characters/gf-tankmen/spritemap1.png similarity index 100% rename from assets/characters/gf-tankmen/sprite/spritemap1.png rename to assets/images/characters/gf-tankmen/spritemap1.png diff --git a/assets/characters/gf/sprite/Animation.json b/assets/images/characters/gf/Animation.json similarity index 100% rename from assets/characters/gf/sprite/Animation.json rename to assets/images/characters/gf/Animation.json diff --git a/assets/characters/gf/sprite/spritemap1.json b/assets/images/characters/gf/spritemap1.json similarity index 100% rename from assets/characters/gf/sprite/spritemap1.json rename to assets/images/characters/gf/spritemap1.json diff --git a/assets/characters/gf/sprite/spritemap1.png b/assets/images/characters/gf/spritemap1.png similarity index 100% rename from assets/characters/gf/sprite/spritemap1.png rename to assets/images/characters/gf/spritemap1.png diff --git a/assets/characters/mom-car/sprite.png b/assets/images/characters/mom-car.png similarity index 100% rename from assets/characters/mom-car/sprite.png rename to assets/images/characters/mom-car.png diff --git a/assets/characters/mom-car/sprite.xml b/assets/images/characters/mom-car.xml similarity index 100% rename from assets/characters/mom-car/sprite.xml rename to assets/images/characters/mom-car.xml diff --git a/assets/characters/mom/sprite.png b/assets/images/characters/mom.png similarity index 100% rename from assets/characters/mom/sprite.png rename to assets/images/characters/mom.png diff --git a/assets/characters/mom/sprite.xml b/assets/images/characters/mom.xml similarity index 100% rename from assets/characters/mom/sprite.xml rename to assets/images/characters/mom.xml diff --git a/assets/characters/monster-christmas/sprite.png b/assets/images/characters/monster-christmas.png similarity index 100% rename from assets/characters/monster-christmas/sprite.png rename to assets/images/characters/monster-christmas.png diff --git a/assets/characters/monster-christmas/sprite.xml b/assets/images/characters/monster-christmas.xml similarity index 100% rename from assets/characters/monster-christmas/sprite.xml rename to assets/images/characters/monster-christmas.xml diff --git a/assets/characters/monster/monster.png b/assets/images/characters/monster.png similarity index 100% rename from assets/characters/monster/monster.png rename to assets/images/characters/monster.png diff --git a/assets/characters/monster/monster.xml b/assets/images/characters/monster.xml similarity index 100% rename from assets/characters/monster/monster.xml rename to assets/images/characters/monster.xml diff --git a/assets/characters/parents-christmas/sprite.png b/assets/images/characters/parents-christmas.png similarity index 100% rename from assets/characters/parents-christmas/sprite.png rename to assets/images/characters/parents-christmas.png diff --git a/assets/characters/parents-christmas/sprite.xml b/assets/images/characters/parents-christmas.xml similarity index 100% rename from assets/characters/parents-christmas/sprite.xml rename to assets/images/characters/parents-christmas.xml diff --git a/assets/images/characters/pico-speakers.png b/assets/images/characters/pico-speakers.png new file mode 100644 index 00000000..f20d1a80 Binary files /dev/null and b/assets/images/characters/pico-speakers.png differ diff --git a/assets/images/characters/pico-speakers.xml b/assets/images/characters/pico-speakers.xml new file mode 100644 index 00000000..b3e7752a --- /dev/null +++ b/assets/images/characters/pico-speakers.xml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/characters/pico-speakers/pico-speakers/Animation.json b/assets/images/characters/pico-speakers/Animation.json similarity index 100% rename from assets/characters/pico-speakers/pico-speakers/Animation.json rename to assets/images/characters/pico-speakers/Animation.json diff --git a/assets/characters/pico-speakers/pico-speakers/spritemap1.json b/assets/images/characters/pico-speakers/spritemap1.json similarity index 100% rename from assets/characters/pico-speakers/pico-speakers/spritemap1.json rename to assets/images/characters/pico-speakers/spritemap1.json diff --git a/assets/characters/pico-speakers/pico-speakers/spritemap1.png b/assets/images/characters/pico-speakers/spritemap1.png similarity index 100% rename from assets/characters/pico-speakers/pico-speakers/spritemap1.png rename to assets/images/characters/pico-speakers/spritemap1.png diff --git a/assets/characters/pico/sprite.png b/assets/images/characters/pico.png similarity index 100% rename from assets/characters/pico/sprite.png rename to assets/images/characters/pico.png diff --git a/assets/characters/pico/sprite.xml b/assets/images/characters/pico.xml similarity index 100% rename from assets/characters/pico/sprite.xml rename to assets/images/characters/pico.xml diff --git a/assets/characters/senpai/sprite.png b/assets/images/characters/senpai.png similarity index 100% rename from assets/characters/senpai/sprite.png rename to assets/images/characters/senpai.png diff --git a/assets/characters/senpai/sprite.xml b/assets/images/characters/senpai.xml similarity index 100% rename from assets/characters/senpai/sprite.xml rename to assets/images/characters/senpai.xml diff --git a/assets/characters/spirit/sprite.png b/assets/images/characters/spirit.png similarity index 100% rename from assets/characters/spirit/sprite.png rename to assets/images/characters/spirit.png diff --git a/assets_old/week6/images/weeb/spirit.txt b/assets/images/characters/spirit.txt similarity index 100% rename from assets_old/week6/images/weeb/spirit.txt rename to assets/images/characters/spirit.txt diff --git a/assets/characters/spooky/sprite.png b/assets/images/characters/spooky.png similarity index 100% rename from assets/characters/spooky/sprite.png rename to assets/images/characters/spooky.png diff --git a/assets/characters/spooky/sprite.xml b/assets/images/characters/spooky.xml similarity index 100% rename from assets/characters/spooky/sprite.xml rename to assets/images/characters/spooky.xml diff --git a/assets/characters/tankman/sprite.png b/assets/images/characters/tankman.png similarity index 100% rename from assets/characters/tankman/sprite.png rename to assets/images/characters/tankman.png diff --git a/assets/characters/tankman/sprite.xml b/assets/images/characters/tankman.xml similarity index 100% rename from assets/characters/tankman/sprite.xml rename to assets/images/characters/tankman.xml diff --git a/assets_old/images/dialogue/boxes/default.png b/assets/images/dialogue/boxes/default.png similarity index 100% rename from assets_old/images/dialogue/boxes/default.png rename to assets/images/dialogue/boxes/default.png diff --git a/assets_old/images/dialogue/boxes/default.xml b/assets/images/dialogue/boxes/default.xml similarity index 100% rename from assets_old/images/dialogue/boxes/default.xml rename to assets/images/dialogue/boxes/default.xml diff --git a/assets_old/images/dialogue/characters/boyfriend.png b/assets/images/dialogue/characters/boyfriend.png similarity index 100% rename from assets_old/images/dialogue/characters/boyfriend.png rename to assets/images/dialogue/characters/boyfriend.png diff --git a/assets_old/images/dialogue/characters/boyfriend.xml b/assets/images/dialogue/characters/boyfriend.xml similarity index 100% rename from assets_old/images/dialogue/characters/boyfriend.xml rename to assets/images/dialogue/characters/boyfriend.xml diff --git a/assets_old/images/dialogue/characters/dad.png b/assets/images/dialogue/characters/dad.png similarity index 100% rename from assets_old/images/dialogue/characters/dad.png rename to assets/images/dialogue/characters/dad.png diff --git a/assets_old/images/dialogue/characters/dad.xml b/assets/images/dialogue/characters/dad.xml similarity index 100% rename from assets_old/images/dialogue/characters/dad.xml rename to assets/images/dialogue/characters/dad.xml diff --git a/assets_old/images/dialogue/characters/niko.png b/assets/images/dialogue/characters/niko.png similarity index 100% rename from assets_old/images/dialogue/characters/niko.png rename to assets/images/dialogue/characters/niko.png diff --git a/assets_old/images/dialogue/characters/niko.xml b/assets/images/dialogue/characters/niko.xml similarity index 100% rename from assets_old/images/dialogue/characters/niko.xml rename to assets/images/dialogue/characters/niko.xml diff --git a/assets/dumb/burns.png b/assets/images/dumb/burns.png similarity index 100% rename from assets/dumb/burns.png rename to assets/images/dumb/burns.png diff --git a/assets/dumb/dumb.png b/assets/images/dumb/dumb.png similarity index 100% rename from assets/dumb/dumb.png rename to assets/images/dumb/dumb.png diff --git a/assets/dumb/lol.png b/assets/images/dumb/lol.png similarity index 100% rename from assets/dumb/lol.png rename to assets/images/dumb/lol.png diff --git a/assets/dumb/screencapTierImage.png b/assets/images/dumb/screencapTierImage.png similarity index 100% rename from assets/dumb/screencapTierImage.png rename to assets/images/dumb/screencapTierImage.png diff --git a/assets/dumb/unknown.png b/assets/images/dumb/unknown.png similarity index 100% rename from assets/dumb/unknown.png rename to assets/images/dumb/unknown.png diff --git a/assets/dumb/week54prototype.png b/assets/images/dumb/week54prototype.png similarity index 100% rename from assets/dumb/week54prototype.png rename to assets/images/dumb/week54prototype.png diff --git a/assets/dumb/zzzzzzzz.png b/assets/images/dumb/zzzzzzzz.png similarity index 100% rename from assets/dumb/zzzzzzzz.png rename to assets/images/dumb/zzzzzzzz.png diff --git a/assets_old/images/editors/bgs/charter.png b/assets/images/editors/bgs/charter.png similarity index 100% rename from assets_old/images/editors/bgs/charter.png rename to assets/images/editors/bgs/charter.png diff --git a/assets_old/images/editors/charter/note.png b/assets/images/editors/charter/note.png similarity index 100% rename from assets_old/images/editors/charter/note.png rename to assets/images/editors/charter/note.png diff --git a/assets_old/images/editors/charter/strumline-info-bg.png b/assets/images/editors/charter/strumline-info-bg.png similarity index 100% rename from assets_old/images/editors/charter/strumline-info-bg.png rename to assets/images/editors/charter/strumline-info-bg.png diff --git a/assets_old/images/editors/icons.png b/assets/images/editors/icons.png similarity index 100% rename from assets_old/images/editors/icons.png rename to assets/images/editors/icons.png diff --git a/assets_old/images/editors/ui/button.png b/assets/images/editors/ui/button.png similarity index 100% rename from assets_old/images/editors/ui/button.png rename to assets/images/editors/ui/button.png diff --git a/assets_old/images/editors/ui/button.xml b/assets/images/editors/ui/button.xml similarity index 100% rename from assets_old/images/editors/ui/button.xml rename to assets/images/editors/ui/button.xml diff --git a/assets_old/images/editors/ui/checkbox.png b/assets/images/editors/ui/checkbox.png similarity index 100% rename from assets_old/images/editors/ui/checkbox.png rename to assets/images/editors/ui/checkbox.png diff --git a/assets_old/images/editors/ui/context-bg.png b/assets/images/editors/ui/context-bg.png similarity index 100% rename from assets_old/images/editors/ui/context-bg.png rename to assets/images/editors/ui/context-bg.png diff --git a/assets_old/images/editors/ui/context-bg.xml b/assets/images/editors/ui/context-bg.xml similarity index 100% rename from assets_old/images/editors/ui/context-bg.xml rename to assets/images/editors/ui/context-bg.xml diff --git a/assets_old/images/editors/ui/context-icons.png b/assets/images/editors/ui/context-icons.png similarity index 100% rename from assets_old/images/editors/ui/context-icons.png rename to assets/images/editors/ui/context-icons.png diff --git a/assets_old/images/editors/ui/inputbox.png b/assets/images/editors/ui/inputbox.png similarity index 100% rename from assets_old/images/editors/ui/inputbox.png rename to assets/images/editors/ui/inputbox.png diff --git a/assets_old/images/editors/ui/inputbox.xml b/assets/images/editors/ui/inputbox.xml similarity index 100% rename from assets_old/images/editors/ui/inputbox.xml rename to assets/images/editors/ui/inputbox.xml diff --git a/assets_old/images/editors/ui/menu-item.png b/assets/images/editors/ui/menu-item.png similarity index 100% rename from assets_old/images/editors/ui/menu-item.png rename to assets/images/editors/ui/menu-item.png diff --git a/assets_old/images/editors/ui/menu-item.xml b/assets/images/editors/ui/menu-item.xml similarity index 100% rename from assets_old/images/editors/ui/menu-item.xml rename to assets/images/editors/ui/menu-item.xml diff --git a/assets_old/images/editors/ui/selection.png b/assets/images/editors/ui/selection.png similarity index 100% rename from assets_old/images/editors/ui/selection.png rename to assets/images/editors/ui/selection.png diff --git a/assets_old/images/editors/ui/selection.xml b/assets/images/editors/ui/selection.xml similarity index 100% rename from assets_old/images/editors/ui/selection.xml rename to assets/images/editors/ui/selection.xml diff --git a/assets_old/images/editors/ui/slider.png b/assets/images/editors/ui/slider.png similarity index 100% rename from assets_old/images/editors/ui/slider.png rename to assets/images/editors/ui/slider.png diff --git a/assets_old/images/editors/ui/topmenu.png b/assets/images/editors/ui/topmenu.png similarity index 100% rename from assets_old/images/editors/ui/topmenu.png rename to assets/images/editors/ui/topmenu.png diff --git a/assets_old/images/editors/ui/topmenu.xml b/assets/images/editors/ui/topmenu.xml similarity index 100% rename from assets_old/images/editors/ui/topmenu.xml rename to assets/images/editors/ui/topmenu.xml diff --git a/assets_old/images/editors/ui/warning-popup.png b/assets/images/editors/ui/warning-popup.png similarity index 100% rename from assets_old/images/editors/ui/warning-popup.png rename to assets/images/editors/ui/warning-popup.png diff --git a/assets_old/images/editors/ui/warning-popup.xml b/assets/images/editors/ui/warning-popup.xml similarity index 100% rename from assets_old/images/editors/ui/warning-popup.xml rename to assets/images/editors/ui/warning-popup.xml diff --git a/assets_old/images/game/cutscenes/tank/guns-tankman/Animation.json b/assets/images/game/cutscenes/tank/guns-tankman/Animation.json similarity index 100% rename from assets_old/images/game/cutscenes/tank/guns-tankman/Animation.json rename to assets/images/game/cutscenes/tank/guns-tankman/Animation.json diff --git a/assets_old/images/game/cutscenes/tank/guns-tankman/spritemap1.json b/assets/images/game/cutscenes/tank/guns-tankman/spritemap1.json similarity index 100% rename from assets_old/images/game/cutscenes/tank/guns-tankman/spritemap1.json rename to assets/images/game/cutscenes/tank/guns-tankman/spritemap1.json diff --git a/assets_old/images/game/cutscenes/tank/guns-tankman/spritemap1.png b/assets/images/game/cutscenes/tank/guns-tankman/spritemap1.png similarity index 100% rename from assets_old/images/game/cutscenes/tank/guns-tankman/spritemap1.png rename to assets/images/game/cutscenes/tank/guns-tankman/spritemap1.png diff --git a/assets_old/images/game/cutscenes/tank/stress-pico/Animation.json b/assets/images/game/cutscenes/tank/stress-pico/Animation.json similarity index 100% rename from assets_old/images/game/cutscenes/tank/stress-pico/Animation.json rename to assets/images/game/cutscenes/tank/stress-pico/Animation.json diff --git a/assets_old/images/game/cutscenes/tank/stress-pico/spritemap1.json b/assets/images/game/cutscenes/tank/stress-pico/spritemap1.json similarity index 100% rename from assets_old/images/game/cutscenes/tank/stress-pico/spritemap1.json rename to assets/images/game/cutscenes/tank/stress-pico/spritemap1.json diff --git a/assets_old/images/game/cutscenes/tank/stress-pico/spritemap1.png b/assets/images/game/cutscenes/tank/stress-pico/spritemap1.png similarity index 100% rename from assets_old/images/game/cutscenes/tank/stress-pico/spritemap1.png rename to assets/images/game/cutscenes/tank/stress-pico/spritemap1.png diff --git a/assets_old/images/game/cutscenes/tank/stress-tankman/Animation.json b/assets/images/game/cutscenes/tank/stress-tankman/Animation.json similarity index 100% rename from assets_old/images/game/cutscenes/tank/stress-tankman/Animation.json rename to assets/images/game/cutscenes/tank/stress-tankman/Animation.json diff --git a/assets_old/images/game/cutscenes/tank/stress-tankman/spritemap1.json b/assets/images/game/cutscenes/tank/stress-tankman/spritemap1.json similarity index 100% rename from assets_old/images/game/cutscenes/tank/stress-tankman/spritemap1.json rename to assets/images/game/cutscenes/tank/stress-tankman/spritemap1.json diff --git a/assets_old/images/game/cutscenes/tank/stress-tankman/spritemap1.png b/assets/images/game/cutscenes/tank/stress-tankman/spritemap1.png similarity index 100% rename from assets_old/images/game/cutscenes/tank/stress-tankman/spritemap1.png rename to assets/images/game/cutscenes/tank/stress-tankman/spritemap1.png diff --git a/assets/songs/ugh/images/ugh-tankman/Animation.json b/assets/images/game/cutscenes/tank/ugh-tankman/Animation.json similarity index 100% rename from assets/songs/ugh/images/ugh-tankman/Animation.json rename to assets/images/game/cutscenes/tank/ugh-tankman/Animation.json diff --git a/assets/songs/ugh/images/ugh-tankman/spritemap1.json b/assets/images/game/cutscenes/tank/ugh-tankman/spritemap1.json similarity index 100% rename from assets/songs/ugh/images/ugh-tankman/spritemap1.json rename to assets/images/game/cutscenes/tank/ugh-tankman/spritemap1.json diff --git a/assets/songs/ugh/images/ugh-tankman/spritemap1.png b/assets/images/game/cutscenes/tank/ugh-tankman/spritemap1.png similarity index 100% rename from assets/songs/ugh/images/ugh-tankman/spritemap1.png rename to assets/images/game/cutscenes/tank/ugh-tankman/spritemap1.png diff --git a/assets/game/images/countdown/go.png b/assets/images/game/go.png similarity index 100% rename from assets/game/images/countdown/go.png rename to assets/images/game/go.png diff --git a/assets/game/images/healthBar.png b/assets/images/game/healthBar.png similarity index 100% rename from assets/game/images/healthBar.png rename to assets/images/game/healthBar.png diff --git a/assets/notetypes/default/sprite.png b/assets/images/game/notes/default.png similarity index 100% rename from assets/notetypes/default/sprite.png rename to assets/images/game/notes/default.png diff --git a/assets/notetypes/default/sprite.xml b/assets/images/game/notes/default.xml similarity index 100% rename from assets/notetypes/default/sprite.xml rename to assets/images/game/notes/default.xml diff --git a/assets/game/images/countdown/ready.png b/assets/images/game/ready.png similarity index 100% rename from assets/game/images/countdown/ready.png rename to assets/images/game/ready.png diff --git a/assets/game/images/countdown/restart.png b/assets/images/game/restart.png similarity index 100% rename from assets/game/images/countdown/restart.png rename to assets/images/game/restart.png diff --git a/assets/game/images/score/bad.png b/assets/images/game/score/bad.png similarity index 100% rename from assets/game/images/score/bad.png rename to assets/images/game/score/bad.png diff --git a/assets/game/images/score/combo.png b/assets/images/game/score/combo.png similarity index 100% rename from assets/game/images/score/combo.png rename to assets/images/game/score/combo.png diff --git a/assets/game/images/score/good.png b/assets/images/game/score/good.png similarity index 100% rename from assets/game/images/score/good.png rename to assets/images/game/score/good.png diff --git a/assets/game/images/score/num0.png b/assets/images/game/score/num0.png similarity index 100% rename from assets/game/images/score/num0.png rename to assets/images/game/score/num0.png diff --git a/assets/game/images/score/num1.png b/assets/images/game/score/num1.png similarity index 100% rename from assets/game/images/score/num1.png rename to assets/images/game/score/num1.png diff --git a/assets/game/images/score/num2.png b/assets/images/game/score/num2.png similarity index 100% rename from assets/game/images/score/num2.png rename to assets/images/game/score/num2.png diff --git a/assets/game/images/score/num3.png b/assets/images/game/score/num3.png similarity index 100% rename from assets/game/images/score/num3.png rename to assets/images/game/score/num3.png diff --git a/assets/game/images/score/num4.png b/assets/images/game/score/num4.png similarity index 100% rename from assets/game/images/score/num4.png rename to assets/images/game/score/num4.png diff --git a/assets/game/images/score/num5.png b/assets/images/game/score/num5.png similarity index 100% rename from assets/game/images/score/num5.png rename to assets/images/game/score/num5.png diff --git a/assets/game/images/score/num6.png b/assets/images/game/score/num6.png similarity index 100% rename from assets/game/images/score/num6.png rename to assets/images/game/score/num6.png diff --git a/assets/game/images/score/num7.png b/assets/images/game/score/num7.png similarity index 100% rename from assets/game/images/score/num7.png rename to assets/images/game/score/num7.png diff --git a/assets/game/images/score/num8.png b/assets/images/game/score/num8.png similarity index 100% rename from assets/game/images/score/num8.png rename to assets/images/game/score/num8.png diff --git a/assets/game/images/score/num9.png b/assets/images/game/score/num9.png similarity index 100% rename from assets/game/images/score/num9.png rename to assets/images/game/score/num9.png diff --git a/assets/game/images/score/shit.png b/assets/images/game/score/shit.png similarity index 100% rename from assets/game/images/score/shit.png rename to assets/images/game/score/shit.png diff --git a/assets/game/images/score/sick.png b/assets/images/game/score/sick.png similarity index 100% rename from assets/game/images/score/sick.png rename to assets/images/game/score/sick.png diff --git a/assets/game/images/countdown/set.png b/assets/images/game/set.png similarity index 100% rename from assets/game/images/countdown/set.png rename to assets/images/game/set.png diff --git a/assets/game/images/splashes/default.png b/assets/images/game/splashes/default.png similarity index 100% rename from assets/game/images/splashes/default.png rename to assets/images/game/splashes/default.png diff --git a/assets/game/images/splashes/default.xml b/assets/images/game/splashes/default.xml similarity index 100% rename from assets/game/images/splashes/default.xml rename to assets/images/game/splashes/default.xml diff --git a/assets/game/images/splashes/secret.png b/assets/images/game/splashes/secret.png similarity index 100% rename from assets/game/images/splashes/secret.png rename to assets/images/game/splashes/secret.png diff --git a/assets/game/images/splashes/secret.xml b/assets/images/game/splashes/secret.xml similarity index 100% rename from assets/game/images/splashes/secret.xml rename to assets/images/game/splashes/secret.xml diff --git a/assets/characters/icons/bf-old.png b/assets/images/icons/bf-old.png similarity index 100% rename from assets/characters/icons/bf-old.png rename to assets/images/icons/bf-old.png diff --git a/assets/characters/icons/bf-pixel.png b/assets/images/icons/bf-pixel.png similarity index 100% rename from assets/characters/icons/bf-pixel.png rename to assets/images/icons/bf-pixel.png diff --git a/assets/characters/icons/bf.png b/assets/images/icons/bf.png similarity index 100% rename from assets/characters/icons/bf.png rename to assets/images/icons/bf.png diff --git a/assets/characters/icons/dad.png b/assets/images/icons/dad.png similarity index 100% rename from assets/characters/icons/dad.png rename to assets/images/icons/dad.png diff --git a/assets/characters/icons/face.png b/assets/images/icons/face.png similarity index 100% rename from assets/characters/icons/face.png rename to assets/images/icons/face.png diff --git a/assets/characters/icons/gf.png b/assets/images/icons/gf.png similarity index 100% rename from assets/characters/icons/gf.png rename to assets/images/icons/gf.png diff --git a/assets/characters/icons/mom.png b/assets/images/icons/mom.png similarity index 100% rename from assets/characters/icons/mom.png rename to assets/images/icons/mom.png diff --git a/assets/characters/icons/monster.png b/assets/images/icons/monster.png similarity index 100% rename from assets/characters/icons/monster.png rename to assets/images/icons/monster.png diff --git a/assets/characters/icons/parents-christmas.png b/assets/images/icons/parents-christmas.png similarity index 100% rename from assets/characters/icons/parents-christmas.png rename to assets/images/icons/parents-christmas.png diff --git a/assets/characters/icons/pico.png b/assets/images/icons/pico.png similarity index 100% rename from assets/characters/icons/pico.png rename to assets/images/icons/pico.png diff --git a/assets/characters/icons/senpai.png b/assets/images/icons/senpai.png similarity index 100% rename from assets/characters/icons/senpai.png rename to assets/images/icons/senpai.png diff --git a/assets/characters/icons/spirit.png b/assets/images/icons/spirit.png similarity index 100% rename from assets/characters/icons/spirit.png rename to assets/images/icons/spirit.png diff --git a/assets/characters/icons/spooky.png b/assets/images/icons/spooky.png similarity index 100% rename from assets/characters/icons/spooky.png rename to assets/images/icons/spooky.png diff --git a/assets/characters/icons/tankman.png b/assets/images/icons/tankman.png similarity index 100% rename from assets/characters/icons/tankman.png rename to assets/images/icons/tankman.png diff --git a/assets/menus/images/alphabet-bold.png b/assets/images/menus/alphabet-bold.png similarity index 100% rename from assets/menus/images/alphabet-bold.png rename to assets/images/menus/alphabet-bold.png diff --git a/assets/menus/images/alphabet-bold.xml b/assets/images/menus/alphabet-bold.xml similarity index 100% rename from assets/menus/images/alphabet-bold.xml rename to assets/images/menus/alphabet-bold.xml diff --git a/assets/menus/images/alphabet.png b/assets/images/menus/alphabet.png similarity index 100% rename from assets/menus/images/alphabet.png rename to assets/images/menus/alphabet.png diff --git a/assets/menus/images/alphabet.xml b/assets/images/menus/alphabet.xml similarity index 100% rename from assets/menus/images/alphabet.xml rename to assets/images/menus/alphabet.xml diff --git a/assets/menus/images/mainmenu/donate.png b/assets/images/menus/mainmenu/donate.png similarity index 100% rename from assets/menus/images/mainmenu/donate.png rename to assets/images/menus/mainmenu/donate.png diff --git a/assets/menus/images/mainmenu/donate.xml b/assets/images/menus/mainmenu/donate.xml similarity index 100% rename from assets/menus/images/mainmenu/donate.xml rename to assets/images/menus/mainmenu/donate.xml diff --git a/assets/menus/images/mainmenu/freeplay.png b/assets/images/menus/mainmenu/freeplay.png similarity index 100% rename from assets/menus/images/mainmenu/freeplay.png rename to assets/images/menus/mainmenu/freeplay.png diff --git a/assets/menus/images/mainmenu/freeplay.xml b/assets/images/menus/mainmenu/freeplay.xml similarity index 100% rename from assets/menus/images/mainmenu/freeplay.xml rename to assets/images/menus/mainmenu/freeplay.xml diff --git a/assets/menus/images/mainmenu/options.png b/assets/images/menus/mainmenu/options.png similarity index 100% rename from assets/menus/images/mainmenu/options.png rename to assets/images/menus/mainmenu/options.png diff --git a/assets/menus/images/mainmenu/options.xml b/assets/images/menus/mainmenu/options.xml similarity index 100% rename from assets/menus/images/mainmenu/options.xml rename to assets/images/menus/mainmenu/options.xml diff --git a/assets/menus/images/mainmenu/story mode.png b/assets/images/menus/mainmenu/story mode.png similarity index 100% rename from assets/menus/images/mainmenu/story mode.png rename to assets/images/menus/mainmenu/story mode.png diff --git a/assets/menus/images/mainmenu/story mode.xml b/assets/images/menus/mainmenu/story mode.xml similarity index 100% rename from assets/menus/images/mainmenu/story mode.xml rename to assets/images/menus/mainmenu/story mode.xml diff --git a/assets/menus/images/menuBG.png b/assets/images/menus/menuBG.png similarity index 100% rename from assets/menus/images/menuBG.png rename to assets/images/menus/menuBG.png diff --git a/assets/menus/images/menuBGBlue.png b/assets/images/menus/menuBGBlue.png similarity index 100% rename from assets/menus/images/menuBGBlue.png rename to assets/images/menus/menuBGBlue.png diff --git a/assets/menus/images/menuBGMagenta.png b/assets/images/menus/menuBGMagenta.png similarity index 100% rename from assets/menus/images/menuBGMagenta.png rename to assets/images/menus/menuBGMagenta.png diff --git a/assets/menus/images/menuContrast.png b/assets/images/menus/menuContrast.png similarity index 100% rename from assets/menus/images/menuContrast.png rename to assets/images/menus/menuContrast.png diff --git a/assets/menus/images/menuDesat.png b/assets/images/menus/menuDesat.png similarity index 100% rename from assets/menus/images/menuDesat.png rename to assets/images/menus/menuDesat.png diff --git a/assets/menus/images/menuEditors.png b/assets/images/menus/menuEditors.png similarity index 100% rename from assets/menus/images/menuEditors.png rename to assets/images/menus/menuEditors.png diff --git a/assets/menus/images/menuTransparent.png b/assets/images/menus/menuTransparent.png similarity index 100% rename from assets/menus/images/menuTransparent.png rename to assets/images/menus/menuTransparent.png diff --git a/assets/menus/images/options/checkboxThingie.png b/assets/images/menus/options/checkboxThingie.png similarity index 100% rename from assets/menus/images/options/checkboxThingie.png rename to assets/images/menus/options/checkboxThingie.png diff --git a/assets/menus/images/options/checkboxThingie.xml b/assets/images/menus/options/checkboxThingie.xml similarity index 100% rename from assets/menus/images/options/checkboxThingie.xml rename to assets/images/menus/options/checkboxThingie.xml diff --git a/assets/menus/images/pauseAlt/bfLol.png b/assets/images/menus/pauseAlt/bfLol.png similarity index 100% rename from assets/menus/images/pauseAlt/bfLol.png rename to assets/images/menus/pauseAlt/bfLol.png diff --git a/assets/menus/images/pauseAlt/bfLol.xml b/assets/images/menus/pauseAlt/bfLol.xml similarity index 100% rename from assets/menus/images/pauseAlt/bfLol.xml rename to assets/images/menus/pauseAlt/bfLol.xml diff --git a/assets/menus/images/pauseAlt/pauseBG.png b/assets/images/menus/pauseAlt/pauseBG.png similarity index 100% rename from assets/menus/images/pauseAlt/pauseBG.png rename to assets/images/menus/pauseAlt/pauseBG.png diff --git a/assets/menus/images/pauseAlt/pauseUI.png b/assets/images/menus/pauseAlt/pauseUI.png similarity index 100% rename from assets/menus/images/pauseAlt/pauseUI.png rename to assets/images/menus/pauseAlt/pauseUI.png diff --git a/assets/menus/images/pauseAlt/pauseUI.xml b/assets/images/menus/pauseAlt/pauseUI.xml similarity index 100% rename from assets/menus/images/pauseAlt/pauseUI.xml rename to assets/images/menus/pauseAlt/pauseUI.xml diff --git a/assets/menus/images/storymenu/assets.png b/assets/images/menus/storymenu/assets.png similarity index 100% rename from assets/menus/images/storymenu/assets.png rename to assets/images/menus/storymenu/assets.png diff --git a/assets/menus/images/storymenu/assets.xml b/assets/images/menus/storymenu/assets.xml similarity index 100% rename from assets/menus/images/storymenu/assets.xml rename to assets/images/menus/storymenu/assets.xml diff --git a/assets/menus/images/storymenu/characters/bf.png b/assets/images/menus/storymenu/characters/bf.png similarity index 100% rename from assets/menus/images/storymenu/characters/bf.png rename to assets/images/menus/storymenu/characters/bf.png diff --git a/assets/menus/images/storymenu/characters/bf.xml b/assets/images/menus/storymenu/characters/bf.xml similarity index 100% rename from assets/menus/images/storymenu/characters/bf.xml rename to assets/images/menus/storymenu/characters/bf.xml diff --git a/assets/menus/images/storymenu/characters/dad.png b/assets/images/menus/storymenu/characters/dad.png similarity index 100% rename from assets/menus/images/storymenu/characters/dad.png rename to assets/images/menus/storymenu/characters/dad.png diff --git a/assets/menus/images/storymenu/characters/dad.xml b/assets/images/menus/storymenu/characters/dad.xml similarity index 100% rename from assets/menus/images/storymenu/characters/dad.xml rename to assets/images/menus/storymenu/characters/dad.xml diff --git a/assets/menus/images/storymenu/characters/gf.png b/assets/images/menus/storymenu/characters/gf.png similarity index 100% rename from assets/menus/images/storymenu/characters/gf.png rename to assets/images/menus/storymenu/characters/gf.png diff --git a/assets/menus/images/storymenu/characters/gf.xml b/assets/images/menus/storymenu/characters/gf.xml similarity index 100% rename from assets/menus/images/storymenu/characters/gf.xml rename to assets/images/menus/storymenu/characters/gf.xml diff --git a/assets/menus/images/storymenu/characters/mom.png b/assets/images/menus/storymenu/characters/mom.png similarity index 100% rename from assets/menus/images/storymenu/characters/mom.png rename to assets/images/menus/storymenu/characters/mom.png diff --git a/assets/menus/images/storymenu/characters/mom.xml b/assets/images/menus/storymenu/characters/mom.xml similarity index 100% rename from assets/menus/images/storymenu/characters/mom.xml rename to assets/images/menus/storymenu/characters/mom.xml diff --git a/assets/menus/images/storymenu/characters/parents-christmas.png b/assets/images/menus/storymenu/characters/parents-christmas.png similarity index 100% rename from assets/menus/images/storymenu/characters/parents-christmas.png rename to assets/images/menus/storymenu/characters/parents-christmas.png diff --git a/assets/menus/images/storymenu/characters/parents-christmas.xml b/assets/images/menus/storymenu/characters/parents-christmas.xml similarity index 100% rename from assets/menus/images/storymenu/characters/parents-christmas.xml rename to assets/images/menus/storymenu/characters/parents-christmas.xml diff --git a/assets/menus/images/storymenu/characters/pico.png b/assets/images/menus/storymenu/characters/pico.png similarity index 100% rename from assets/menus/images/storymenu/characters/pico.png rename to assets/images/menus/storymenu/characters/pico.png diff --git a/assets/menus/images/storymenu/characters/pico.xml b/assets/images/menus/storymenu/characters/pico.xml similarity index 100% rename from assets/menus/images/storymenu/characters/pico.xml rename to assets/images/menus/storymenu/characters/pico.xml diff --git a/assets/menus/images/storymenu/characters/senpai.png b/assets/images/menus/storymenu/characters/senpai.png similarity index 100% rename from assets/menus/images/storymenu/characters/senpai.png rename to assets/images/menus/storymenu/characters/senpai.png diff --git a/assets/menus/images/storymenu/characters/senpai.xml b/assets/images/menus/storymenu/characters/senpai.xml similarity index 100% rename from assets/menus/images/storymenu/characters/senpai.xml rename to assets/images/menus/storymenu/characters/senpai.xml diff --git a/assets/menus/images/storymenu/characters/spooky.png b/assets/images/menus/storymenu/characters/spooky.png similarity index 100% rename from assets/menus/images/storymenu/characters/spooky.png rename to assets/images/menus/storymenu/characters/spooky.png diff --git a/assets/menus/images/storymenu/characters/spooky.xml b/assets/images/menus/storymenu/characters/spooky.xml similarity index 100% rename from assets/menus/images/storymenu/characters/spooky.xml rename to assets/images/menus/storymenu/characters/spooky.xml diff --git a/assets/menus/images/storymenu/characters/tankman.png b/assets/images/menus/storymenu/characters/tankman.png similarity index 100% rename from assets/menus/images/storymenu/characters/tankman.png rename to assets/images/menus/storymenu/characters/tankman.png diff --git a/assets/menus/images/storymenu/characters/tankman.xml b/assets/images/menus/storymenu/characters/tankman.xml similarity index 100% rename from assets/menus/images/storymenu/characters/tankman.xml rename to assets/images/menus/storymenu/characters/tankman.xml diff --git a/assets/menus/images/storymenu/difficulties/easy.png b/assets/images/menus/storymenu/difficulties/easy.png similarity index 100% rename from assets/menus/images/storymenu/difficulties/easy.png rename to assets/images/menus/storymenu/difficulties/easy.png diff --git a/assets/menus/images/storymenu/difficulties/hard.png b/assets/images/menus/storymenu/difficulties/hard.png similarity index 100% rename from assets/menus/images/storymenu/difficulties/hard.png rename to assets/images/menus/storymenu/difficulties/hard.png diff --git a/assets/menus/images/storymenu/difficulties/normal.png b/assets/images/menus/storymenu/difficulties/normal.png similarity index 100% rename from assets/menus/images/storymenu/difficulties/normal.png rename to assets/images/menus/storymenu/difficulties/normal.png diff --git a/assets/menus/images/storymenu/weeks/tutorial.png b/assets/images/menus/storymenu/weeks/tutorial.png similarity index 100% rename from assets/menus/images/storymenu/weeks/tutorial.png rename to assets/images/menus/storymenu/weeks/tutorial.png diff --git a/assets/menus/images/storymenu/weeks/week1.png b/assets/images/menus/storymenu/weeks/week1.png similarity index 100% rename from assets/menus/images/storymenu/weeks/week1.png rename to assets/images/menus/storymenu/weeks/week1.png diff --git a/assets/menus/images/storymenu/weeks/week2.png b/assets/images/menus/storymenu/weeks/week2.png similarity index 100% rename from assets/menus/images/storymenu/weeks/week2.png rename to assets/images/menus/storymenu/weeks/week2.png diff --git a/assets/menus/images/storymenu/weeks/week3.png b/assets/images/menus/storymenu/weeks/week3.png similarity index 100% rename from assets/menus/images/storymenu/weeks/week3.png rename to assets/images/menus/storymenu/weeks/week3.png diff --git a/assets/menus/images/storymenu/weeks/week4.png b/assets/images/menus/storymenu/weeks/week4.png similarity index 100% rename from assets/menus/images/storymenu/weeks/week4.png rename to assets/images/menus/storymenu/weeks/week4.png diff --git a/assets/menus/images/storymenu/weeks/week5.png b/assets/images/menus/storymenu/weeks/week5.png similarity index 100% rename from assets/menus/images/storymenu/weeks/week5.png rename to assets/images/menus/storymenu/weeks/week5.png diff --git a/assets/menus/images/storymenu/weeks/week6.png b/assets/images/menus/storymenu/weeks/week6.png similarity index 100% rename from assets/menus/images/storymenu/weeks/week6.png rename to assets/images/menus/storymenu/weeks/week6.png diff --git a/assets/menus/images/storymenu/weeks/week7.png b/assets/images/menus/storymenu/weeks/week7.png similarity index 100% rename from assets/menus/images/storymenu/weeks/week7.png rename to assets/images/menus/storymenu/weeks/week7.png diff --git a/assets/menus/images/titlescreen/gf.png b/assets/images/menus/titlescreen/gf.png similarity index 100% rename from assets/menus/images/titlescreen/gf.png rename to assets/images/menus/titlescreen/gf.png diff --git a/assets/menus/images/titlescreen/gf.xml b/assets/images/menus/titlescreen/gf.xml similarity index 100% rename from assets/menus/images/titlescreen/gf.xml rename to assets/images/menus/titlescreen/gf.xml diff --git a/assets/menus/images/titlescreen/logo.png b/assets/images/menus/titlescreen/logo.png similarity index 100% rename from assets/menus/images/titlescreen/logo.png rename to assets/images/menus/titlescreen/logo.png diff --git a/assets/menus/images/titlescreen/logo.xml b/assets/images/menus/titlescreen/logo.xml similarity index 100% rename from assets/menus/images/titlescreen/logo.xml rename to assets/images/menus/titlescreen/logo.xml diff --git a/assets/menus/images/titlescreen/newgrounds_logo.png b/assets/images/menus/titlescreen/newgrounds_logo.png similarity index 100% rename from assets/menus/images/titlescreen/newgrounds_logo.png rename to assets/images/menus/titlescreen/newgrounds_logo.png diff --git a/assets/menus/images/titlescreen/titleEnter.png b/assets/images/menus/titlescreen/titleEnter.png similarity index 100% rename from assets/menus/images/titlescreen/titleEnter.png rename to assets/images/menus/titlescreen/titleEnter.png diff --git a/assets/menus/images/titlescreen/titleEnter.xml b/assets/images/menus/titlescreen/titleEnter.xml similarity index 100% rename from assets/menus/images/titlescreen/titleEnter.xml rename to assets/images/menus/titlescreen/titleEnter.xml diff --git a/assets/menus/images/transitionSpr.png b/assets/images/menus/transitionSpr.png similarity index 100% rename from assets/menus/images/transitionSpr.png rename to assets/images/menus/transitionSpr.png diff --git a/assets/menus/images/update/bf.png b/assets/images/menus/update/bf.png similarity index 100% rename from assets/menus/images/update/bf.png rename to assets/images/menus/update/bf.png diff --git a/assets/menus/images/update/bf.xml b/assets/images/menus/update/bf.xml similarity index 100% rename from assets/menus/images/update/bf.xml rename to assets/images/menus/update/bf.xml diff --git a/assets/stages/stage/images/stage_light.png b/assets/images/stages/default/stage_light.png similarity index 100% rename from assets/stages/stage/images/stage_light.png rename to assets/images/stages/default/stage_light.png diff --git a/assets/stages/stage/images/stageback.png b/assets/images/stages/default/stageback.png similarity index 100% rename from assets/stages/stage/images/stageback.png rename to assets/images/stages/default/stageback.png diff --git a/assets/stages/stage/images/stagecurtains.png b/assets/images/stages/default/stagecurtains.png similarity index 100% rename from assets/stages/stage/images/stagecurtains.png rename to assets/images/stages/default/stagecurtains.png diff --git a/assets/stages/stage/images/stagefront.png b/assets/images/stages/default/stagefront.png similarity index 100% rename from assets/stages/stage/images/stagefront.png rename to assets/images/stages/default/stagefront.png diff --git a/assets/stages/limo/images/bgLimo.png b/assets/images/stages/limo/bgLimo.png similarity index 100% rename from assets/stages/limo/images/bgLimo.png rename to assets/images/stages/limo/bgLimo.png diff --git a/assets/stages/limo/images/bgLimo.xml b/assets/images/stages/limo/bgLimo.xml similarity index 100% rename from assets/stages/limo/images/bgLimo.xml rename to assets/images/stages/limo/bgLimo.xml diff --git a/assets/stages/limo/images/dumb.png b/assets/images/stages/limo/dumb.png similarity index 100% rename from assets/stages/limo/images/dumb.png rename to assets/images/stages/limo/dumb.png diff --git a/assets/stages/limo/images/fastCarLol.png b/assets/images/stages/limo/fastCarLol.png similarity index 100% rename from assets/stages/limo/images/fastCarLol.png rename to assets/images/stages/limo/fastCarLol.png diff --git a/assets/stages/limo/images/limoDancer.png b/assets/images/stages/limo/limoDancer.png similarity index 100% rename from assets/stages/limo/images/limoDancer.png rename to assets/images/stages/limo/limoDancer.png diff --git a/assets/stages/limo/images/limoDancer.xml b/assets/images/stages/limo/limoDancer.xml similarity index 100% rename from assets/stages/limo/images/limoDancer.xml rename to assets/images/stages/limo/limoDancer.xml diff --git a/assets/stages/limo/images/limoDrive.png b/assets/images/stages/limo/limoDrive.png similarity index 100% rename from assets/stages/limo/images/limoDrive.png rename to assets/images/stages/limo/limoDrive.png diff --git a/assets/stages/limo/images/limoDrive.xml b/assets/images/stages/limo/limoDrive.xml similarity index 100% rename from assets/stages/limo/images/limoDrive.xml rename to assets/images/stages/limo/limoDrive.xml diff --git a/assets/stages/limo/images/limoOverlay.png b/assets/images/stages/limo/limoOverlay.png similarity index 100% rename from assets/stages/limo/images/limoOverlay.png rename to assets/images/stages/limo/limoOverlay.png diff --git a/assets/stages/limo/images/limoSunset.png b/assets/images/stages/limo/limoSunset.png similarity index 100% rename from assets/stages/limo/images/limoSunset.png rename to assets/images/stages/limo/limoSunset.png diff --git a/assets/stages/mall/images/bgEscalator.png b/assets/images/stages/mall/bgEscalator.png similarity index 100% rename from assets/stages/mall/images/bgEscalator.png rename to assets/images/stages/mall/bgEscalator.png diff --git a/assets/stages/mall/images/bgWalls.png b/assets/images/stages/mall/bgWalls.png similarity index 100% rename from assets/stages/mall/images/bgWalls.png rename to assets/images/stages/mall/bgWalls.png diff --git a/assets/stages/mall/images/bottomBop.png b/assets/images/stages/mall/bottomBop.png similarity index 100% rename from assets/stages/mall/images/bottomBop.png rename to assets/images/stages/mall/bottomBop.png diff --git a/assets/stages/mall/images/bottomBop.xml b/assets/images/stages/mall/bottomBop.xml similarity index 100% rename from assets/stages/mall/images/bottomBop.xml rename to assets/images/stages/mall/bottomBop.xml diff --git a/assets/stages/mall/images/christmasTree.png b/assets/images/stages/mall/christmasTree.png similarity index 100% rename from assets/stages/mall/images/christmasTree.png rename to assets/images/stages/mall/christmasTree.png diff --git a/assets/stages/mall/images/christmasWall.png b/assets/images/stages/mall/christmasWall.png similarity index 100% rename from assets/stages/mall/images/christmasWall.png rename to assets/images/stages/mall/christmasWall.png diff --git a/assets/stages/mall-evil/images/evilBG.png b/assets/images/stages/mall/evilBG.png similarity index 100% rename from assets/stages/mall-evil/images/evilBG.png rename to assets/images/stages/mall/evilBG.png diff --git a/assets/stages/mall-evil/images/evilSnow.png b/assets/images/stages/mall/evilSnow.png similarity index 100% rename from assets/stages/mall-evil/images/evilSnow.png rename to assets/images/stages/mall/evilSnow.png diff --git a/assets/stages/mall-evil/images/evilTree.png b/assets/images/stages/mall/evilTree.png similarity index 100% rename from assets/stages/mall-evil/images/evilTree.png rename to assets/images/stages/mall/evilTree.png diff --git a/assets/stages/mall/images/fgSnow.png b/assets/images/stages/mall/fgSnow.png similarity index 100% rename from assets/stages/mall/images/fgSnow.png rename to assets/images/stages/mall/fgSnow.png diff --git a/assets/stages/mall/images/santa.png b/assets/images/stages/mall/santa.png similarity index 100% rename from assets/stages/mall/images/santa.png rename to assets/images/stages/mall/santa.png diff --git a/assets/stages/mall/images/santa.xml b/assets/images/stages/mall/santa.xml similarity index 100% rename from assets/stages/mall/images/santa.xml rename to assets/images/stages/mall/santa.xml diff --git a/assets/stages/mall/images/upperBop.png b/assets/images/stages/mall/upperBop.png similarity index 100% rename from assets/stages/mall/images/upperBop.png rename to assets/images/stages/mall/upperBop.png diff --git a/assets/stages/mall/images/upperBop.xml b/assets/images/stages/mall/upperBop.xml similarity index 100% rename from assets/stages/mall/images/upperBop.xml rename to assets/images/stages/mall/upperBop.xml diff --git a/assets/stages/philly/images/behindTrain.png b/assets/images/stages/philly/behindTrain.png similarity index 100% rename from assets/stages/philly/images/behindTrain.png rename to assets/images/stages/philly/behindTrain.png diff --git a/assets/stages/philly/images/city.png b/assets/images/stages/philly/city.png similarity index 100% rename from assets/stages/philly/images/city.png rename to assets/images/stages/philly/city.png diff --git a/assets/stages/philly/images/sky.png b/assets/images/stages/philly/sky.png similarity index 100% rename from assets/stages/philly/images/sky.png rename to assets/images/stages/philly/sky.png diff --git a/assets/stages/philly/images/street.png b/assets/images/stages/philly/street.png similarity index 100% rename from assets/stages/philly/images/street.png rename to assets/images/stages/philly/street.png diff --git a/assets/stages/philly/images/train.png b/assets/images/stages/philly/train.png similarity index 100% rename from assets/stages/philly/images/train.png rename to assets/images/stages/philly/train.png diff --git a/assets/stages/philly/images/win.png b/assets/images/stages/philly/win.png similarity index 100% rename from assets/stages/philly/images/win.png rename to assets/images/stages/philly/win.png diff --git a/assets/stages/school/images/animatedEvilSchool.png b/assets/images/stages/school/animatedEvilSchool.png similarity index 100% rename from assets/stages/school/images/animatedEvilSchool.png rename to assets/images/stages/school/animatedEvilSchool.png diff --git a/assets/stages/school/images/animatedEvilSchool.xml b/assets/images/stages/school/animatedEvilSchool.xml similarity index 100% rename from assets/stages/school/images/animatedEvilSchool.xml rename to assets/images/stages/school/animatedEvilSchool.xml diff --git a/assets/stages/school/images/bgFreaks.png b/assets/images/stages/school/bgFreaks.png similarity index 100% rename from assets/stages/school/images/bgFreaks.png rename to assets/images/stages/school/bgFreaks.png diff --git a/assets/stages/school/images/bgFreaks.xml b/assets/images/stages/school/bgFreaks.xml similarity index 100% rename from assets/stages/school/images/bgFreaks.xml rename to assets/images/stages/school/bgFreaks.xml diff --git a/assets/stages/school/images/pause/bg.png b/assets/images/stages/school/pause/bg.png similarity index 100% rename from assets/stages/school/images/pause/bg.png rename to assets/images/stages/school/pause/bg.png diff --git a/assets/stages/school/images/pause/concept.pfi b/assets/images/stages/school/pause/concept.pfi similarity index 100% rename from assets/stages/school/images/pause/concept.pfi rename to assets/images/stages/school/pause/concept.pfi diff --git a/assets/stages/school/images/petals.png b/assets/images/stages/school/petals.png similarity index 100% rename from assets/stages/school/images/petals.png rename to assets/images/stages/school/petals.png diff --git a/assets/stages/school/images/petals.xml b/assets/images/stages/school/petals.xml similarity index 100% rename from assets/stages/school/images/petals.xml rename to assets/images/stages/school/petals.xml diff --git a/assets/stages/school/images/ui/arrowEnds.png b/assets/images/stages/school/ui/arrowEnds.png similarity index 100% rename from assets/stages/school/images/ui/arrowEnds.png rename to assets/images/stages/school/ui/arrowEnds.png diff --git a/assets/stages/school/images/ui/arrows-pixels.png b/assets/images/stages/school/ui/arrows-pixels.png similarity index 100% rename from assets/stages/school/images/ui/arrows-pixels.png rename to assets/images/stages/school/ui/arrows-pixels.png diff --git a/assets/stages/school/images/ui/bad.png b/assets/images/stages/school/ui/bad.png similarity index 100% rename from assets/stages/school/images/ui/bad.png rename to assets/images/stages/school/ui/bad.png diff --git a/assets/stages/school/images/ui/combo.png b/assets/images/stages/school/ui/combo.png similarity index 100% rename from assets/stages/school/images/ui/combo.png rename to assets/images/stages/school/ui/combo.png diff --git a/assets/stages/school/images/ui/dialogueBox-evil.png b/assets/images/stages/school/ui/dialogueBox-evil.png similarity index 100% rename from assets/stages/school/images/ui/dialogueBox-evil.png rename to assets/images/stages/school/ui/dialogueBox-evil.png diff --git a/assets/stages/school/images/ui/dialogueBox-evil.xml b/assets/images/stages/school/ui/dialogueBox-evil.xml similarity index 100% rename from assets/stages/school/images/ui/dialogueBox-evil.xml rename to assets/images/stages/school/ui/dialogueBox-evil.xml diff --git a/assets/stages/school/images/ui/dialogueBox-pixel.png b/assets/images/stages/school/ui/dialogueBox-pixel.png similarity index 100% rename from assets/stages/school/images/ui/dialogueBox-pixel.png rename to assets/images/stages/school/ui/dialogueBox-pixel.png diff --git a/assets/stages/school/images/ui/dialogueBox-pixel.xml b/assets/images/stages/school/ui/dialogueBox-pixel.xml similarity index 100% rename from assets/stages/school/images/ui/dialogueBox-pixel.xml rename to assets/images/stages/school/ui/dialogueBox-pixel.xml diff --git a/assets/stages/school/images/ui/dialogueBox-senpaiMad.png b/assets/images/stages/school/ui/dialogueBox-senpaiMad.png similarity index 100% rename from assets/stages/school/images/ui/dialogueBox-senpaiMad.png rename to assets/images/stages/school/ui/dialogueBox-senpaiMad.png diff --git a/assets/stages/school/images/ui/dialogueBox-senpaiMad.xml b/assets/images/stages/school/ui/dialogueBox-senpaiMad.xml similarity index 100% rename from assets/stages/school/images/ui/dialogueBox-senpaiMad.xml rename to assets/images/stages/school/ui/dialogueBox-senpaiMad.xml diff --git a/assets/stages/school/images/ui/go.png b/assets/images/stages/school/ui/go.png similarity index 100% rename from assets/stages/school/images/ui/go.png rename to assets/images/stages/school/ui/go.png diff --git a/assets/stages/school/images/ui/good.png b/assets/images/stages/school/ui/good.png similarity index 100% rename from assets/stages/school/images/ui/good.png rename to assets/images/stages/school/ui/good.png diff --git a/assets/stages/school/images/ui/hand_textbox.png b/assets/images/stages/school/ui/hand_textbox.png similarity index 100% rename from assets/stages/school/images/ui/hand_textbox.png rename to assets/images/stages/school/ui/hand_textbox.png diff --git a/assets/stages/school/images/ui/num0.png b/assets/images/stages/school/ui/num0.png similarity index 100% rename from assets/stages/school/images/ui/num0.png rename to assets/images/stages/school/ui/num0.png diff --git a/assets/stages/school/images/ui/num1.png b/assets/images/stages/school/ui/num1.png similarity index 100% rename from assets/stages/school/images/ui/num1.png rename to assets/images/stages/school/ui/num1.png diff --git a/assets/stages/school/images/ui/num2.png b/assets/images/stages/school/ui/num2.png similarity index 100% rename from assets/stages/school/images/ui/num2.png rename to assets/images/stages/school/ui/num2.png diff --git a/assets/stages/school/images/ui/num3.png b/assets/images/stages/school/ui/num3.png similarity index 100% rename from assets/stages/school/images/ui/num3.png rename to assets/images/stages/school/ui/num3.png diff --git a/assets/stages/school/images/ui/num4.png b/assets/images/stages/school/ui/num4.png similarity index 100% rename from assets/stages/school/images/ui/num4.png rename to assets/images/stages/school/ui/num4.png diff --git a/assets/stages/school/images/ui/num5.png b/assets/images/stages/school/ui/num5.png similarity index 100% rename from assets/stages/school/images/ui/num5.png rename to assets/images/stages/school/ui/num5.png diff --git a/assets/stages/school/images/ui/num6.png b/assets/images/stages/school/ui/num6.png similarity index 100% rename from assets/stages/school/images/ui/num6.png rename to assets/images/stages/school/ui/num6.png diff --git a/assets/stages/school/images/ui/num7.png b/assets/images/stages/school/ui/num7.png similarity index 100% rename from assets/stages/school/images/ui/num7.png rename to assets/images/stages/school/ui/num7.png diff --git a/assets/stages/school/images/ui/num8.png b/assets/images/stages/school/ui/num8.png similarity index 100% rename from assets/stages/school/images/ui/num8.png rename to assets/images/stages/school/ui/num8.png diff --git a/assets/stages/school/images/ui/num9.png b/assets/images/stages/school/ui/num9.png similarity index 100% rename from assets/stages/school/images/ui/num9.png rename to assets/images/stages/school/ui/num9.png diff --git a/assets/stages/school/images/ui/ready.png b/assets/images/stages/school/ui/ready.png similarity index 100% rename from assets/stages/school/images/ui/ready.png rename to assets/images/stages/school/ui/ready.png diff --git a/assets/stages/school/images/ui/set.png b/assets/images/stages/school/ui/set.png similarity index 100% rename from assets/stages/school/images/ui/set.png rename to assets/images/stages/school/ui/set.png diff --git a/assets/stages/school/images/ui/shit.png b/assets/images/stages/school/ui/shit.png similarity index 100% rename from assets/stages/school/images/ui/shit.png rename to assets/images/stages/school/ui/shit.png diff --git a/assets/stages/school/images/ui/sick.png b/assets/images/stages/school/ui/sick.png similarity index 100% rename from assets/stages/school/images/ui/sick.png rename to assets/images/stages/school/ui/sick.png diff --git a/assets/stages/school/images/weebSchool.png b/assets/images/stages/school/weebSchool.png similarity index 100% rename from assets/stages/school/images/weebSchool.png rename to assets/images/stages/school/weebSchool.png diff --git a/assets/stages/school/images/weebSky.png b/assets/images/stages/school/weebSky.png similarity index 100% rename from assets/stages/school/images/weebSky.png rename to assets/images/stages/school/weebSky.png diff --git a/assets/stages/school/images/weebStreet.png b/assets/images/stages/school/weebStreet.png similarity index 100% rename from assets/stages/school/images/weebStreet.png rename to assets/images/stages/school/weebStreet.png diff --git a/assets/stages/school/images/weebTrees.png b/assets/images/stages/school/weebTrees.png similarity index 100% rename from assets/stages/school/images/weebTrees.png rename to assets/images/stages/school/weebTrees.png diff --git a/assets/stages/school/images/weebTrees.txt b/assets/images/stages/school/weebTrees.txt similarity index 100% rename from assets/stages/school/images/weebTrees.txt rename to assets/images/stages/school/weebTrees.txt diff --git a/assets/stages/school/images/weebTreesBack.png b/assets/images/stages/school/weebTreesBack.png similarity index 100% rename from assets/stages/school/images/weebTreesBack.png rename to assets/images/stages/school/weebTreesBack.png diff --git a/assets/stages/spooky/images/halloween_bg.png b/assets/images/stages/spooky/halloween_bg.png similarity index 100% rename from assets/stages/spooky/images/halloween_bg.png rename to assets/images/stages/spooky/halloween_bg.png diff --git a/assets/stages/spooky/images/halloween_bg.xml b/assets/images/stages/spooky/halloween_bg.xml similarity index 100% rename from assets/stages/spooky/images/halloween_bg.xml rename to assets/images/stages/spooky/halloween_bg.xml diff --git a/assets/stages/tank/images/smokeLeft.png b/assets/images/stages/tank/smokeLeft.png similarity index 100% rename from assets/stages/tank/images/smokeLeft.png rename to assets/images/stages/tank/smokeLeft.png diff --git a/assets/stages/tank/images/smokeLeft.xml b/assets/images/stages/tank/smokeLeft.xml similarity index 100% rename from assets/stages/tank/images/smokeLeft.xml rename to assets/images/stages/tank/smokeLeft.xml diff --git a/assets/stages/tank/images/smokeRight.png b/assets/images/stages/tank/smokeRight.png similarity index 100% rename from assets/stages/tank/images/smokeRight.png rename to assets/images/stages/tank/smokeRight.png diff --git a/assets/stages/tank/images/smokeRight.xml b/assets/images/stages/tank/smokeRight.xml similarity index 100% rename from assets/stages/tank/images/smokeRight.xml rename to assets/images/stages/tank/smokeRight.xml diff --git a/assets/stages/tank/images/tank0.png b/assets/images/stages/tank/tank0.png similarity index 100% rename from assets/stages/tank/images/tank0.png rename to assets/images/stages/tank/tank0.png diff --git a/assets/stages/tank/images/tank0.xml b/assets/images/stages/tank/tank0.xml similarity index 100% rename from assets/stages/tank/images/tank0.xml rename to assets/images/stages/tank/tank0.xml diff --git a/assets/stages/tank/images/tank1.png b/assets/images/stages/tank/tank1.png similarity index 100% rename from assets/stages/tank/images/tank1.png rename to assets/images/stages/tank/tank1.png diff --git a/assets/stages/tank/images/tank1.xml b/assets/images/stages/tank/tank1.xml similarity index 100% rename from assets/stages/tank/images/tank1.xml rename to assets/images/stages/tank/tank1.xml diff --git a/assets/stages/tank/images/tank2.png b/assets/images/stages/tank/tank2.png similarity index 100% rename from assets/stages/tank/images/tank2.png rename to assets/images/stages/tank/tank2.png diff --git a/assets/stages/tank/images/tank2.xml b/assets/images/stages/tank/tank2.xml similarity index 100% rename from assets/stages/tank/images/tank2.xml rename to assets/images/stages/tank/tank2.xml diff --git a/assets/stages/tank/images/tank3.png b/assets/images/stages/tank/tank3.png similarity index 100% rename from assets/stages/tank/images/tank3.png rename to assets/images/stages/tank/tank3.png diff --git a/assets/stages/tank/images/tank3.xml b/assets/images/stages/tank/tank3.xml similarity index 100% rename from assets/stages/tank/images/tank3.xml rename to assets/images/stages/tank/tank3.xml diff --git a/assets/stages/tank/images/tank4.png b/assets/images/stages/tank/tank4.png similarity index 100% rename from assets/stages/tank/images/tank4.png rename to assets/images/stages/tank/tank4.png diff --git a/assets/stages/tank/images/tank4.xml b/assets/images/stages/tank/tank4.xml similarity index 100% rename from assets/stages/tank/images/tank4.xml rename to assets/images/stages/tank/tank4.xml diff --git a/assets/stages/tank/images/tank5.png b/assets/images/stages/tank/tank5.png similarity index 100% rename from assets/stages/tank/images/tank5.png rename to assets/images/stages/tank/tank5.png diff --git a/assets/stages/tank/images/tank5.xml b/assets/images/stages/tank/tank5.xml similarity index 100% rename from assets/stages/tank/images/tank5.xml rename to assets/images/stages/tank/tank5.xml diff --git a/assets/stages/tank/images/tankBuildings.png b/assets/images/stages/tank/tankBuildings.png similarity index 100% rename from assets/stages/tank/images/tankBuildings.png rename to assets/images/stages/tank/tankBuildings.png diff --git a/assets/stages/tank/images/tankClouds.png b/assets/images/stages/tank/tankClouds.png similarity index 100% rename from assets/stages/tank/images/tankClouds.png rename to assets/images/stages/tank/tankClouds.png diff --git a/assets/stages/tank/images/tankGround.png b/assets/images/stages/tank/tankGround.png similarity index 100% rename from assets/stages/tank/images/tankGround.png rename to assets/images/stages/tank/tankGround.png diff --git a/assets/stages/tank/images/tankMountains.png b/assets/images/stages/tank/tankMountains.png similarity index 100% rename from assets/stages/tank/images/tankMountains.png rename to assets/images/stages/tank/tankMountains.png diff --git a/assets/stages/tank/images/tankRolling.png b/assets/images/stages/tank/tankRolling.png similarity index 100% rename from assets/stages/tank/images/tankRolling.png rename to assets/images/stages/tank/tankRolling.png diff --git a/assets/stages/tank/images/tankRolling.xml b/assets/images/stages/tank/tankRolling.xml similarity index 100% rename from assets/stages/tank/images/tankRolling.xml rename to assets/images/stages/tank/tankRolling.xml diff --git a/assets/stages/tank/images/tankRuins.png b/assets/images/stages/tank/tankRuins.png similarity index 100% rename from assets/stages/tank/images/tankRuins.png rename to assets/images/stages/tank/tankRuins.png diff --git a/assets/stages/tank/images/tankSky.png b/assets/images/stages/tank/tankSky.png similarity index 100% rename from assets/stages/tank/images/tankSky.png rename to assets/images/stages/tank/tankSky.png diff --git a/assets/stages/tank/images/tankWatchtower.png b/assets/images/stages/tank/tankWatchtower.png similarity index 100% rename from assets/stages/tank/images/tankWatchtower.png rename to assets/images/stages/tank/tankWatchtower.png diff --git a/assets/stages/tank/images/tankWatchtower.xml b/assets/images/stages/tank/tankWatchtower.xml similarity index 100% rename from assets/stages/tank/images/tankWatchtower.xml rename to assets/images/stages/tank/tankWatchtower.xml diff --git a/assets/stages/tank/images/tankmanKilled1.png b/assets/images/stages/tank/tankmanKilled1.png similarity index 100% rename from assets/stages/tank/images/tankmanKilled1.png rename to assets/images/stages/tank/tankmanKilled1.png diff --git a/assets/stages/tank/images/tankmanKilled1.xml b/assets/images/stages/tank/tankmanKilled1.xml similarity index 100% rename from assets/stages/tank/images/tankmanKilled1.xml rename to assets/images/stages/tank/tankmanKilled1.xml diff --git a/assets/stages/tank/music/DISTORTO.mp3 b/assets/music/DISTORTO.mp3 similarity index 100% rename from assets/stages/tank/music/DISTORTO.mp3 rename to assets/music/DISTORTO.mp3 diff --git a/assets/stages/tank/music/DISTORTO.ogg b/assets/music/DISTORTO.ogg similarity index 100% rename from assets/stages/tank/music/DISTORTO.ogg rename to assets/music/DISTORTO.ogg diff --git a/assets/game/music/breakfast.mp3 b/assets/music/breakfast.mp3 similarity index 100% rename from assets/game/music/breakfast.mp3 rename to assets/music/breakfast.mp3 diff --git a/assets/game/music/breakfast.ogg b/assets/music/breakfast.ogg similarity index 100% rename from assets/game/music/breakfast.ogg rename to assets/music/breakfast.ogg diff --git a/assets/menus/music/freakyMenu.ini b/assets/music/freakyMenu.ini similarity index 100% rename from assets/menus/music/freakyMenu.ini rename to assets/music/freakyMenu.ini diff --git a/assets/menus/music/freakyMenu.mp3 b/assets/music/freakyMenu.mp3 similarity index 100% rename from assets/menus/music/freakyMenu.mp3 rename to assets/music/freakyMenu.mp3 diff --git a/assets/menus/music/freakyMenu.ogg b/assets/music/freakyMenu.ogg similarity index 100% rename from assets/menus/music/freakyMenu.ogg rename to assets/music/freakyMenu.ogg diff --git a/assets/game/music/gameOver.ini b/assets/music/gameOver.ini similarity index 100% rename from assets/game/music/gameOver.ini rename to assets/music/gameOver.ini diff --git a/assets/game/music/gameOver.mp3 b/assets/music/gameOver.mp3 similarity index 100% rename from assets/game/music/gameOver.mp3 rename to assets/music/gameOver.mp3 diff --git a/assets/game/music/gameOver.ogg b/assets/music/gameOver.ogg similarity index 100% rename from assets/game/music/gameOver.ogg rename to assets/music/gameOver.ogg diff --git a/assets/stages/school/music/Lunchbox.mp3 b/assets/music/pixel/Lunchbox.mp3 similarity index 100% rename from assets/stages/school/music/Lunchbox.mp3 rename to assets/music/pixel/Lunchbox.mp3 diff --git a/assets/stages/school/music/Lunchbox.ogg b/assets/music/pixel/Lunchbox.ogg similarity index 100% rename from assets/stages/school/music/Lunchbox.ogg rename to assets/music/pixel/Lunchbox.ogg diff --git a/assets/stages/school/music/LunchboxScary.mp3 b/assets/music/pixel/LunchboxScary.mp3 similarity index 100% rename from assets/stages/school/music/LunchboxScary.mp3 rename to assets/music/pixel/LunchboxScary.mp3 diff --git a/assets/stages/school/music/LunchboxScary.ogg b/assets/music/pixel/LunchboxScary.ogg similarity index 100% rename from assets/stages/school/music/LunchboxScary.ogg rename to assets/music/pixel/LunchboxScary.ogg diff --git a/assets/stages/school/music/gameOver.mp3 b/assets/music/pixel/gameOver.mp3 similarity index 100% rename from assets/stages/school/music/gameOver.mp3 rename to assets/music/pixel/gameOver.mp3 diff --git a/assets/stages/school/music/gameOver.ogg b/assets/music/pixel/gameOver.ogg similarity index 100% rename from assets/stages/school/music/gameOver.ogg rename to assets/music/pixel/gameOver.ogg diff --git a/assets_old/paths.json b/assets/paths.json similarity index 100% rename from assets_old/paths.json rename to assets/paths.json diff --git a/assets/scripting/shaders/engine/README.txt b/assets/shaders/engine/README.txt similarity index 100% rename from assets/scripting/shaders/engine/README.txt rename to assets/shaders/engine/README.txt diff --git a/assets/scripting/shaders/engine/circleProfilePicture.frag b/assets/shaders/engine/circleProfilePicture.frag similarity index 100% rename from assets/scripting/shaders/engine/circleProfilePicture.frag rename to assets/shaders/engine/circleProfilePicture.frag diff --git a/assets/scripting/shaders/engine/editorBlur.frag b/assets/shaders/engine/editorBlur.frag similarity index 100% rename from assets/scripting/shaders/engine/editorBlur.frag rename to assets/shaders/engine/editorBlur.frag diff --git a/assets/scripting/shaders/engine/updaterShader.frag b/assets/shaders/engine/updaterShader.frag similarity index 100% rename from assets/scripting/shaders/engine/updaterShader.frag rename to assets/shaders/engine/updaterShader.frag diff --git a/assets/scripting/shaders/pixelZoomShader.frag b/assets/shaders/pixelZoomShader.frag similarity index 100% rename from assets/scripting/shaders/pixelZoomShader.frag rename to assets/shaders/pixelZoomShader.frag diff --git a/assets_old/sounds/ANGRY_TEXT_BOX.mp3 b/assets/sounds/ANGRY_TEXT_BOX.mp3 similarity index 100% rename from assets_old/sounds/ANGRY_TEXT_BOX.mp3 rename to assets/sounds/ANGRY_TEXT_BOX.mp3 diff --git a/assets_old/sounds/ANGRY_TEXT_BOX.ogg b/assets/sounds/ANGRY_TEXT_BOX.ogg similarity index 100% rename from assets_old/sounds/ANGRY_TEXT_BOX.ogg rename to assets/sounds/ANGRY_TEXT_BOX.ogg diff --git a/assets_old/sounds/Lights_Shut_off.mp3 b/assets/sounds/Lights_Shut_off.mp3 similarity index 100% rename from assets_old/sounds/Lights_Shut_off.mp3 rename to assets/sounds/Lights_Shut_off.mp3 diff --git a/assets_old/sounds/Lights_Shut_off.ogg b/assets/sounds/Lights_Shut_off.ogg similarity index 100% rename from assets_old/sounds/Lights_Shut_off.ogg rename to assets/sounds/Lights_Shut_off.ogg diff --git a/assets_old/sounds/Lights_Turn_On.mp3 b/assets/sounds/Lights_Turn_On.mp3 similarity index 100% rename from assets_old/sounds/Lights_Turn_On.mp3 rename to assets/sounds/Lights_Turn_On.mp3 diff --git a/assets_old/sounds/Lights_Turn_On.ogg b/assets/sounds/Lights_Turn_On.ogg similarity index 100% rename from assets_old/sounds/Lights_Turn_On.ogg rename to assets/sounds/Lights_Turn_On.ogg diff --git a/assets_old/sounds/Senpai_Dies.mp3 b/assets/sounds/Senpai_Dies.mp3 similarity index 100% rename from assets_old/sounds/Senpai_Dies.mp3 rename to assets/sounds/Senpai_Dies.mp3 diff --git a/assets_old/sounds/Senpai_Dies.ogg b/assets/sounds/Senpai_Dies.ogg similarity index 100% rename from assets_old/sounds/Senpai_Dies.ogg rename to assets/sounds/Senpai_Dies.ogg diff --git a/assets/game/sounds/unused/badnoise1.mp3 b/assets/sounds/badnoise1.mp3 similarity index 100% rename from assets/game/sounds/unused/badnoise1.mp3 rename to assets/sounds/badnoise1.mp3 diff --git a/assets/game/sounds/unused/badnoise1.ogg b/assets/sounds/badnoise1.ogg similarity index 100% rename from assets/game/sounds/unused/badnoise1.ogg rename to assets/sounds/badnoise1.ogg diff --git a/assets/game/sounds/unused/badnoise2.mp3 b/assets/sounds/badnoise2.mp3 similarity index 100% rename from assets/game/sounds/unused/badnoise2.mp3 rename to assets/sounds/badnoise2.mp3 diff --git a/assets/game/sounds/unused/badnoise2.ogg b/assets/sounds/badnoise2.ogg similarity index 100% rename from assets/game/sounds/unused/badnoise2.ogg rename to assets/sounds/badnoise2.ogg diff --git a/assets/game/sounds/unused/badnoise3.mp3 b/assets/sounds/badnoise3.mp3 similarity index 100% rename from assets/game/sounds/unused/badnoise3.mp3 rename to assets/sounds/badnoise3.mp3 diff --git a/assets/game/sounds/unused/badnoise3.ogg b/assets/sounds/badnoise3.ogg similarity index 100% rename from assets/game/sounds/unused/badnoise3.ogg rename to assets/sounds/badnoise3.ogg diff --git a/assets_old/sounds/carPass0.mp3 b/assets/sounds/carPass0.mp3 similarity index 100% rename from assets_old/sounds/carPass0.mp3 rename to assets/sounds/carPass0.mp3 diff --git a/assets_old/sounds/carPass0.ogg b/assets/sounds/carPass0.ogg similarity index 100% rename from assets_old/sounds/carPass0.ogg rename to assets/sounds/carPass0.ogg diff --git a/assets_old/sounds/carPass1.mp3 b/assets/sounds/carPass1.mp3 similarity index 100% rename from assets_old/sounds/carPass1.mp3 rename to assets/sounds/carPass1.mp3 diff --git a/assets_old/sounds/carPass1.ogg b/assets/sounds/carPass1.ogg similarity index 100% rename from assets_old/sounds/carPass1.ogg rename to assets/sounds/carPass1.ogg diff --git a/assets_old/sounds/cutscenes/tank/guns.mp3 b/assets/sounds/cutscenes/tank/guns.mp3 similarity index 100% rename from assets_old/sounds/cutscenes/tank/guns.mp3 rename to assets/sounds/cutscenes/tank/guns.mp3 diff --git a/assets_old/sounds/cutscenes/tank/guns.ogg b/assets/sounds/cutscenes/tank/guns.ogg similarity index 100% rename from assets_old/sounds/cutscenes/tank/guns.ogg rename to assets/sounds/cutscenes/tank/guns.ogg diff --git a/assets_old/sounds/cutscenes/tank/stress-censor.mp3 b/assets/sounds/cutscenes/tank/stress-censor.mp3 similarity index 100% rename from assets_old/sounds/cutscenes/tank/stress-censor.mp3 rename to assets/sounds/cutscenes/tank/stress-censor.mp3 diff --git a/assets_old/sounds/cutscenes/tank/stress-censor.ogg b/assets/sounds/cutscenes/tank/stress-censor.ogg similarity index 100% rename from assets_old/sounds/cutscenes/tank/stress-censor.ogg rename to assets/sounds/cutscenes/tank/stress-censor.ogg diff --git a/assets_old/sounds/cutscenes/tank/stress.mp3 b/assets/sounds/cutscenes/tank/stress.mp3 similarity index 100% rename from assets_old/sounds/cutscenes/tank/stress.mp3 rename to assets/sounds/cutscenes/tank/stress.mp3 diff --git a/assets_old/sounds/cutscenes/tank/stress.ogg b/assets/sounds/cutscenes/tank/stress.ogg similarity index 100% rename from assets_old/sounds/cutscenes/tank/stress.ogg rename to assets/sounds/cutscenes/tank/stress.ogg diff --git a/assets_old/sounds/cutscenes/tank/ugh-1.mp3 b/assets/sounds/cutscenes/tank/ugh-1.mp3 similarity index 100% rename from assets_old/sounds/cutscenes/tank/ugh-1.mp3 rename to assets/sounds/cutscenes/tank/ugh-1.mp3 diff --git a/assets_old/sounds/cutscenes/tank/ugh-1.ogg b/assets/sounds/cutscenes/tank/ugh-1.ogg similarity index 100% rename from assets_old/sounds/cutscenes/tank/ugh-1.ogg rename to assets/sounds/cutscenes/tank/ugh-1.ogg diff --git a/assets_old/sounds/cutscenes/tank/ugh-2.mp3 b/assets/sounds/cutscenes/tank/ugh-2.mp3 similarity index 100% rename from assets_old/sounds/cutscenes/tank/ugh-2.mp3 rename to assets/sounds/cutscenes/tank/ugh-2.mp3 diff --git a/assets_old/sounds/cutscenes/tank/ugh-2.ogg b/assets/sounds/cutscenes/tank/ugh-2.ogg similarity index 100% rename from assets_old/sounds/cutscenes/tank/ugh-2.ogg rename to assets/sounds/cutscenes/tank/ugh-2.ogg diff --git a/assets_old/sounds/cutscenes/tank/ugh-beep.mp3 b/assets/sounds/cutscenes/tank/ugh-beep.mp3 similarity index 100% rename from assets_old/sounds/cutscenes/tank/ugh-beep.mp3 rename to assets/sounds/cutscenes/tank/ugh-beep.mp3 diff --git a/assets_old/sounds/cutscenes/tank/ugh-beep.ogg b/assets/sounds/cutscenes/tank/ugh-beep.ogg similarity index 100% rename from assets_old/sounds/cutscenes/tank/ugh-beep.ogg rename to assets/sounds/cutscenes/tank/ugh-beep.ogg diff --git a/assets_old/sounds/dialogue/gf/normal1.mp3 b/assets/sounds/dialogue/gf/normal1.mp3 similarity index 100% rename from assets_old/sounds/dialogue/gf/normal1.mp3 rename to assets/sounds/dialogue/gf/normal1.mp3 diff --git a/assets_old/sounds/dialogue/gf/normal1.ogg b/assets/sounds/dialogue/gf/normal1.ogg similarity index 100% rename from assets_old/sounds/dialogue/gf/normal1.ogg rename to assets/sounds/dialogue/gf/normal1.ogg diff --git a/assets_old/sounds/dialogue/gf/normal2.mp3 b/assets/sounds/dialogue/gf/normal2.mp3 similarity index 100% rename from assets_old/sounds/dialogue/gf/normal2.mp3 rename to assets/sounds/dialogue/gf/normal2.mp3 diff --git a/assets_old/sounds/dialogue/gf/normal2.ogg b/assets/sounds/dialogue/gf/normal2.ogg similarity index 100% rename from assets_old/sounds/dialogue/gf/normal2.ogg rename to assets/sounds/dialogue/gf/normal2.ogg diff --git a/assets_old/sounds/dialogue/gf/normal3.mp3 b/assets/sounds/dialogue/gf/normal3.mp3 similarity index 100% rename from assets_old/sounds/dialogue/gf/normal3.mp3 rename to assets/sounds/dialogue/gf/normal3.mp3 diff --git a/assets_old/sounds/dialogue/gf/normal3.ogg b/assets/sounds/dialogue/gf/normal3.ogg similarity index 100% rename from assets_old/sounds/dialogue/gf/normal3.ogg rename to assets/sounds/dialogue/gf/normal3.ogg diff --git a/assets_old/sounds/dialogue/gf/normal4.mp3 b/assets/sounds/dialogue/gf/normal4.mp3 similarity index 100% rename from assets_old/sounds/dialogue/gf/normal4.mp3 rename to assets/sounds/dialogue/gf/normal4.mp3 diff --git a/assets_old/sounds/dialogue/gf/normal4.ogg b/assets/sounds/dialogue/gf/normal4.ogg similarity index 100% rename from assets_old/sounds/dialogue/gf/normal4.ogg rename to assets/sounds/dialogue/gf/normal4.ogg diff --git a/assets_old/sounds/dialogue/next-pixel.mp3 b/assets/sounds/dialogue/next-pixel.mp3 similarity index 100% rename from assets_old/sounds/dialogue/next-pixel.mp3 rename to assets/sounds/dialogue/next-pixel.mp3 diff --git a/assets_old/sounds/dialogue/next-pixel.ogg b/assets/sounds/dialogue/next-pixel.ogg similarity index 100% rename from assets_old/sounds/dialogue/next-pixel.ogg rename to assets/sounds/dialogue/next-pixel.ogg diff --git a/assets_old/sounds/dialogue/next.mp3 b/assets/sounds/dialogue/next.mp3 similarity index 100% rename from assets_old/sounds/dialogue/next.mp3 rename to assets/sounds/dialogue/next.mp3 diff --git a/assets_old/sounds/dialogue/next.ogg b/assets/sounds/dialogue/next.ogg similarity index 100% rename from assets_old/sounds/dialogue/next.ogg rename to assets/sounds/dialogue/next.ogg diff --git a/assets_old/sounds/dialogue/text-pixel.mp3 b/assets/sounds/dialogue/text-pixel.mp3 similarity index 100% rename from assets_old/sounds/dialogue/text-pixel.mp3 rename to assets/sounds/dialogue/text-pixel.mp3 diff --git a/assets_old/sounds/dialogue/text-pixel.ogg b/assets/sounds/dialogue/text-pixel.ogg similarity index 100% rename from assets_old/sounds/dialogue/text-pixel.ogg rename to assets/sounds/dialogue/text-pixel.ogg diff --git a/assets_old/sounds/editors/charter/hitsound.mp3 b/assets/sounds/editors/charter/hitsound.mp3 similarity index 100% rename from assets_old/sounds/editors/charter/hitsound.mp3 rename to assets/sounds/editors/charter/hitsound.mp3 diff --git a/assets_old/sounds/editors/charter/hitsound.ogg b/assets/sounds/editors/charter/hitsound.ogg similarity index 100% rename from assets_old/sounds/editors/charter/hitsound.ogg rename to assets/sounds/editors/charter/hitsound.ogg diff --git a/assets_old/sounds/editors/charter/metronome.mp3 b/assets/sounds/editors/charter/metronome.mp3 similarity index 100% rename from assets_old/sounds/editors/charter/metronome.mp3 rename to assets/sounds/editors/charter/metronome.mp3 diff --git a/assets_old/sounds/editors/charter/metronome.ogg b/assets/sounds/editors/charter/metronome.ogg similarity index 100% rename from assets_old/sounds/editors/charter/metronome.ogg rename to assets/sounds/editors/charter/metronome.ogg diff --git a/assets/game/sounds/gameover/gameOverEnd.mp3 b/assets/sounds/gameOverEnd.mp3 similarity index 100% rename from assets/game/sounds/gameover/gameOverEnd.mp3 rename to assets/sounds/gameOverEnd.mp3 diff --git a/assets/game/sounds/gameover/gameOverEnd.ogg b/assets/sounds/gameOverEnd.ogg similarity index 100% rename from assets/game/sounds/gameover/gameOverEnd.ogg rename to assets/sounds/gameOverEnd.ogg diff --git a/assets/game/sounds/gameover/gameOverSFX.mp3 b/assets/sounds/gameOverSFX.mp3 similarity index 100% rename from assets/game/sounds/gameover/gameOverSFX.mp3 rename to assets/sounds/gameOverSFX.mp3 diff --git a/assets/game/sounds/gameover/gameOverSFX.ogg b/assets/sounds/gameOverSFX.ogg similarity index 100% rename from assets/game/sounds/gameover/gameOverSFX.ogg rename to assets/sounds/gameOverSFX.ogg diff --git a/assets/game/sounds/intro/1.mp3 b/assets/sounds/intro1.mp3 similarity index 100% rename from assets/game/sounds/intro/1.mp3 rename to assets/sounds/intro1.mp3 diff --git a/assets/game/sounds/intro/1.ogg b/assets/sounds/intro1.ogg similarity index 100% rename from assets/game/sounds/intro/1.ogg rename to assets/sounds/intro1.ogg diff --git a/assets/game/sounds/intro/2.mp3 b/assets/sounds/intro2.mp3 similarity index 100% rename from assets/game/sounds/intro/2.mp3 rename to assets/sounds/intro2.mp3 diff --git a/assets/game/sounds/intro/2.ogg b/assets/sounds/intro2.ogg similarity index 100% rename from assets/game/sounds/intro/2.ogg rename to assets/sounds/intro2.ogg diff --git a/assets/game/sounds/intro/3.mp3 b/assets/sounds/intro3.mp3 similarity index 100% rename from assets/game/sounds/intro/3.mp3 rename to assets/sounds/intro3.mp3 diff --git a/assets/game/sounds/intro/3.ogg b/assets/sounds/intro3.ogg similarity index 100% rename from assets/game/sounds/intro/3.ogg rename to assets/sounds/intro3.ogg diff --git a/assets/game/sounds/intro/go.mp3 b/assets/sounds/introGo.mp3 similarity index 100% rename from assets/game/sounds/intro/go.mp3 rename to assets/sounds/introGo.mp3 diff --git a/assets/game/sounds/intro/go.ogg b/assets/sounds/introGo.ogg similarity index 100% rename from assets/game/sounds/intro/go.ogg rename to assets/sounds/introGo.ogg diff --git a/assets_old/sounds/jeffGameover/jeffGameover-1.mp3 b/assets/sounds/jeffGameover/jeffGameover-1.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-1.mp3 rename to assets/sounds/jeffGameover/jeffGameover-1.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-10.mp3 b/assets/sounds/jeffGameover/jeffGameover-10.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-10.mp3 rename to assets/sounds/jeffGameover/jeffGameover-10.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-11.mp3 b/assets/sounds/jeffGameover/jeffGameover-11.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-11.mp3 rename to assets/sounds/jeffGameover/jeffGameover-11.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-12.mp3 b/assets/sounds/jeffGameover/jeffGameover-12.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-12.mp3 rename to assets/sounds/jeffGameover/jeffGameover-12.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-13.mp3 b/assets/sounds/jeffGameover/jeffGameover-13.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-13.mp3 rename to assets/sounds/jeffGameover/jeffGameover-13.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-14.mp3 b/assets/sounds/jeffGameover/jeffGameover-14.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-14.mp3 rename to assets/sounds/jeffGameover/jeffGameover-14.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-15.mp3 b/assets/sounds/jeffGameover/jeffGameover-15.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-15.mp3 rename to assets/sounds/jeffGameover/jeffGameover-15.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-16.mp3 b/assets/sounds/jeffGameover/jeffGameover-16.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-16.mp3 rename to assets/sounds/jeffGameover/jeffGameover-16.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-17.mp3 b/assets/sounds/jeffGameover/jeffGameover-17.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-17.mp3 rename to assets/sounds/jeffGameover/jeffGameover-17.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-18.mp3 b/assets/sounds/jeffGameover/jeffGameover-18.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-18.mp3 rename to assets/sounds/jeffGameover/jeffGameover-18.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-19.mp3 b/assets/sounds/jeffGameover/jeffGameover-19.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-19.mp3 rename to assets/sounds/jeffGameover/jeffGameover-19.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-2.mp3 b/assets/sounds/jeffGameover/jeffGameover-2.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-2.mp3 rename to assets/sounds/jeffGameover/jeffGameover-2.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-20.mp3 b/assets/sounds/jeffGameover/jeffGameover-20.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-20.mp3 rename to assets/sounds/jeffGameover/jeffGameover-20.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-21.mp3 b/assets/sounds/jeffGameover/jeffGameover-21.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-21.mp3 rename to assets/sounds/jeffGameover/jeffGameover-21.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-22.mp3 b/assets/sounds/jeffGameover/jeffGameover-22.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-22.mp3 rename to assets/sounds/jeffGameover/jeffGameover-22.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-23.mp3 b/assets/sounds/jeffGameover/jeffGameover-23.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-23.mp3 rename to assets/sounds/jeffGameover/jeffGameover-23.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-24.mp3 b/assets/sounds/jeffGameover/jeffGameover-24.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-24.mp3 rename to assets/sounds/jeffGameover/jeffGameover-24.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-25.mp3 b/assets/sounds/jeffGameover/jeffGameover-25.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-25.mp3 rename to assets/sounds/jeffGameover/jeffGameover-25.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-3.mp3 b/assets/sounds/jeffGameover/jeffGameover-3.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-3.mp3 rename to assets/sounds/jeffGameover/jeffGameover-3.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-4.mp3 b/assets/sounds/jeffGameover/jeffGameover-4.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-4.mp3 rename to assets/sounds/jeffGameover/jeffGameover-4.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-5.mp3 b/assets/sounds/jeffGameover/jeffGameover-5.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-5.mp3 rename to assets/sounds/jeffGameover/jeffGameover-5.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-6.mp3 b/assets/sounds/jeffGameover/jeffGameover-6.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-6.mp3 rename to assets/sounds/jeffGameover/jeffGameover-6.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-7.mp3 b/assets/sounds/jeffGameover/jeffGameover-7.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-7.mp3 rename to assets/sounds/jeffGameover/jeffGameover-7.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-8.mp3 b/assets/sounds/jeffGameover/jeffGameover-8.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-8.mp3 rename to assets/sounds/jeffGameover/jeffGameover-8.mp3 diff --git a/assets_old/sounds/jeffGameover/jeffGameover-9.mp3 b/assets/sounds/jeffGameover/jeffGameover-9.mp3 similarity index 100% rename from assets_old/sounds/jeffGameover/jeffGameover-9.mp3 rename to assets/sounds/jeffGameover/jeffGameover-9.mp3 diff --git a/assets_old/sounds/menu/cancel.mp3 b/assets/sounds/menu/cancel.mp3 similarity index 100% rename from assets_old/sounds/menu/cancel.mp3 rename to assets/sounds/menu/cancel.mp3 diff --git a/assets_old/sounds/menu/cancel.ogg b/assets/sounds/menu/cancel.ogg similarity index 100% rename from assets_old/sounds/menu/cancel.ogg rename to assets/sounds/menu/cancel.ogg diff --git a/assets_old/sounds/menu/checkboxChecked.mp3 b/assets/sounds/menu/checkboxChecked.mp3 similarity index 100% rename from assets_old/sounds/menu/checkboxChecked.mp3 rename to assets/sounds/menu/checkboxChecked.mp3 diff --git a/assets_old/sounds/menu/checkboxChecked.ogg b/assets/sounds/menu/checkboxChecked.ogg similarity index 100% rename from assets_old/sounds/menu/checkboxChecked.ogg rename to assets/sounds/menu/checkboxChecked.ogg diff --git a/assets_old/sounds/menu/checkboxUnchecked.mp3 b/assets/sounds/menu/checkboxUnchecked.mp3 similarity index 100% rename from assets_old/sounds/menu/checkboxUnchecked.mp3 rename to assets/sounds/menu/checkboxUnchecked.mp3 diff --git a/assets_old/sounds/menu/checkboxUnchecked.ogg b/assets/sounds/menu/checkboxUnchecked.ogg similarity index 100% rename from assets_old/sounds/menu/checkboxUnchecked.ogg rename to assets/sounds/menu/checkboxUnchecked.ogg diff --git a/assets_old/sounds/menu/confirm.mp3 b/assets/sounds/menu/confirm.mp3 similarity index 100% rename from assets_old/sounds/menu/confirm.mp3 rename to assets/sounds/menu/confirm.mp3 diff --git a/assets_old/sounds/menu/confirm.ogg b/assets/sounds/menu/confirm.ogg similarity index 100% rename from assets_old/sounds/menu/confirm.ogg rename to assets/sounds/menu/confirm.ogg diff --git a/assets_old/sounds/menu/scroll.mp3 b/assets/sounds/menu/scroll.mp3 similarity index 100% rename from assets_old/sounds/menu/scroll.mp3 rename to assets/sounds/menu/scroll.mp3 diff --git a/assets_old/sounds/menu/scroll.ogg b/assets/sounds/menu/scroll.ogg similarity index 100% rename from assets_old/sounds/menu/scroll.ogg rename to assets/sounds/menu/scroll.ogg diff --git a/assets_old/sounds/menu/volume.mp3 b/assets/sounds/menu/volume.mp3 similarity index 100% rename from assets_old/sounds/menu/volume.mp3 rename to assets/sounds/menu/volume.mp3 diff --git a/assets_old/sounds/menu/volume.ogg b/assets/sounds/menu/volume.ogg similarity index 100% rename from assets_old/sounds/menu/volume.ogg rename to assets/sounds/menu/volume.ogg diff --git a/assets_old/sounds/menu/warningMenu.mp3 b/assets/sounds/menu/warningMenu.mp3 similarity index 100% rename from assets_old/sounds/menu/warningMenu.mp3 rename to assets/sounds/menu/warningMenu.mp3 diff --git a/assets_old/sounds/menu/warningMenu.ogg b/assets/sounds/menu/warningMenu.ogg similarity index 100% rename from assets_old/sounds/menu/warningMenu.ogg rename to assets/sounds/menu/warningMenu.ogg diff --git a/assets/game/sounds/miss/missnote1.mp3 b/assets/sounds/missnote1.mp3 similarity index 100% rename from assets/game/sounds/miss/missnote1.mp3 rename to assets/sounds/missnote1.mp3 diff --git a/assets/game/sounds/miss/missnote1.ogg b/assets/sounds/missnote1.ogg similarity index 100% rename from assets/game/sounds/miss/missnote1.ogg rename to assets/sounds/missnote1.ogg diff --git a/assets/game/sounds/miss/missnote2.mp3 b/assets/sounds/missnote2.mp3 similarity index 100% rename from assets/game/sounds/miss/missnote2.mp3 rename to assets/sounds/missnote2.mp3 diff --git a/assets/game/sounds/miss/missnote2.ogg b/assets/sounds/missnote2.ogg similarity index 100% rename from assets/game/sounds/miss/missnote2.ogg rename to assets/sounds/missnote2.ogg diff --git a/assets/game/sounds/miss/missnote3.mp3 b/assets/sounds/missnote3.mp3 similarity index 100% rename from assets/game/sounds/miss/missnote3.mp3 rename to assets/sounds/missnote3.mp3 diff --git a/assets/game/sounds/miss/missnote3.ogg b/assets/sounds/missnote3.ogg similarity index 100% rename from assets/game/sounds/miss/missnote3.ogg rename to assets/sounds/missnote3.ogg diff --git a/assets_old/sounds/pixel/ANGRY.mp3 b/assets/sounds/pixel/ANGRY.mp3 similarity index 100% rename from assets_old/sounds/pixel/ANGRY.mp3 rename to assets/sounds/pixel/ANGRY.mp3 diff --git a/assets_old/sounds/pixel/ANGRY.ogg b/assets/sounds/pixel/ANGRY.ogg similarity index 100% rename from assets_old/sounds/pixel/ANGRY.ogg rename to assets/sounds/pixel/ANGRY.ogg diff --git a/assets_old/sounds/pixel/clickText.ogg b/assets/sounds/pixel/clickText.ogg similarity index 100% rename from assets_old/sounds/pixel/clickText.ogg rename to assets/sounds/pixel/clickText.ogg diff --git a/assets/stages/school/sounds/gameover/gameOverEnd.mp3 b/assets/sounds/pixel/gameOverEnd.mp3 similarity index 100% rename from assets/stages/school/sounds/gameover/gameOverEnd.mp3 rename to assets/sounds/pixel/gameOverEnd.mp3 diff --git a/assets/stages/school/sounds/gameover/gameOverEnd.ogg b/assets/sounds/pixel/gameOverEnd.ogg similarity index 100% rename from assets/stages/school/sounds/gameover/gameOverEnd.ogg rename to assets/sounds/pixel/gameOverEnd.ogg diff --git a/assets/stages/school/sounds/gameover/gameOverSFX.mp3 b/assets/sounds/pixel/gameOverSFX.mp3 similarity index 100% rename from assets/stages/school/sounds/gameover/gameOverSFX.mp3 rename to assets/sounds/pixel/gameOverSFX.mp3 diff --git a/assets/stages/school/sounds/gameover/gameOverSFX.ogg b/assets/sounds/pixel/gameOverSFX.ogg similarity index 100% rename from assets/stages/school/sounds/gameover/gameOverSFX.ogg rename to assets/sounds/pixel/gameOverSFX.ogg diff --git a/assets/stages/school/sounds/intro/1.mp3 b/assets/sounds/pixel/intro1.mp3 similarity index 100% rename from assets/stages/school/sounds/intro/1.mp3 rename to assets/sounds/pixel/intro1.mp3 diff --git a/assets/stages/school/sounds/intro/1.ogg b/assets/sounds/pixel/intro1.ogg similarity index 100% rename from assets/stages/school/sounds/intro/1.ogg rename to assets/sounds/pixel/intro1.ogg diff --git a/assets/stages/school/sounds/intro/2.mp3 b/assets/sounds/pixel/intro2.mp3 similarity index 100% rename from assets/stages/school/sounds/intro/2.mp3 rename to assets/sounds/pixel/intro2.mp3 diff --git a/assets/stages/school/sounds/intro/2.ogg b/assets/sounds/pixel/intro2.ogg similarity index 100% rename from assets/stages/school/sounds/intro/2.ogg rename to assets/sounds/pixel/intro2.ogg diff --git a/assets/stages/school/sounds/intro/3.mp3 b/assets/sounds/pixel/intro3.mp3 similarity index 100% rename from assets/stages/school/sounds/intro/3.mp3 rename to assets/sounds/pixel/intro3.mp3 diff --git a/assets/stages/school/sounds/intro/3.ogg b/assets/sounds/pixel/intro3.ogg similarity index 100% rename from assets/stages/school/sounds/intro/3.ogg rename to assets/sounds/pixel/intro3.ogg diff --git a/assets/stages/school/sounds/intro/go.mp3 b/assets/sounds/pixel/introGo.mp3 similarity index 100% rename from assets/stages/school/sounds/intro/go.mp3 rename to assets/sounds/pixel/introGo.mp3 diff --git a/assets/stages/school/sounds/intro/go.ogg b/assets/sounds/pixel/introGo.ogg similarity index 100% rename from assets/stages/school/sounds/intro/go.ogg rename to assets/sounds/pixel/introGo.ogg diff --git a/assets/stages/school/sounds/pixelText.mp3 b/assets/sounds/pixel/pixelText.mp3 similarity index 100% rename from assets/stages/school/sounds/pixelText.mp3 rename to assets/sounds/pixel/pixelText.mp3 diff --git a/assets/stages/school/sounds/pixelText.ogg b/assets/sounds/pixel/pixelText.ogg similarity index 100% rename from assets/stages/school/sounds/pixelText.ogg rename to assets/sounds/pixel/pixelText.ogg diff --git a/assets/stages/school/sounds/type.ogg b/assets/sounds/pixel/type.ogg similarity index 100% rename from assets/stages/school/sounds/type.ogg rename to assets/sounds/pixel/type.ogg diff --git a/assets/stages/school/sounds/type.wav b/assets/sounds/pixel/type.wav similarity index 100% rename from assets/stages/school/sounds/type.wav rename to assets/sounds/pixel/type.wav diff --git a/assets/game/sounds/unused/soundTest.mp3 b/assets/sounds/soundTest.mp3 similarity index 100% rename from assets/game/sounds/unused/soundTest.mp3 rename to assets/sounds/soundTest.mp3 diff --git a/assets/game/sounds/unused/soundTest.ogg b/assets/sounds/soundTest.ogg similarity index 100% rename from assets/game/sounds/unused/soundTest.ogg rename to assets/sounds/soundTest.ogg diff --git a/assets_old/sounds/sounds-go-here.txt b/assets/sounds/sounds-go-here.txt similarity index 100% rename from assets_old/sounds/sounds-go-here.txt rename to assets/sounds/sounds-go-here.txt diff --git a/assets/stages/spooky/sounds/thunder_1.mp3 b/assets/sounds/thunder_1.mp3 similarity index 100% rename from assets/stages/spooky/sounds/thunder_1.mp3 rename to assets/sounds/thunder_1.mp3 diff --git a/assets/stages/spooky/sounds/thunder_1.ogg b/assets/sounds/thunder_1.ogg similarity index 100% rename from assets/stages/spooky/sounds/thunder_1.ogg rename to assets/sounds/thunder_1.ogg diff --git a/assets/stages/spooky/sounds/thunder_2.mp3 b/assets/sounds/thunder_2.mp3 similarity index 100% rename from assets/stages/spooky/sounds/thunder_2.mp3 rename to assets/sounds/thunder_2.mp3 diff --git a/assets/stages/spooky/sounds/thunder_2.ogg b/assets/sounds/thunder_2.ogg similarity index 100% rename from assets/stages/spooky/sounds/thunder_2.ogg rename to assets/sounds/thunder_2.ogg diff --git a/assets/stages/philly/sounds/train_passes.mp3 b/assets/sounds/train_passes.mp3 similarity index 100% rename from assets/stages/philly/sounds/train_passes.mp3 rename to assets/sounds/train_passes.mp3 diff --git a/assets/stages/philly/sounds/train_passes.ogg b/assets/sounds/train_passes.ogg similarity index 100% rename from assets/stages/philly/sounds/train_passes.ogg rename to assets/sounds/train_passes.ogg diff --git a/assets_old/videos/guns-cutscene.mp4 b/assets/videos/guns-cutscene.mp4 similarity index 100% rename from assets_old/videos/guns-cutscene.mp4 rename to assets/videos/guns-cutscene.mp4 diff --git a/assets_old/videos/kickstarter.mp4 b/assets/videos/kickstarter.mp4 similarity index 100% rename from assets_old/videos/kickstarter.mp4 rename to assets/videos/kickstarter.mp4 diff --git a/assets_old/videos/stress-cutscene.mp4 b/assets/videos/stress-cutscene.mp4 similarity index 100% rename from assets_old/videos/stress-cutscene.mp4 rename to assets/videos/stress-cutscene.mp4 diff --git a/assets_old/videos/ugh-cutscene.mp4 b/assets/videos/ugh-cutscene.mp4 similarity index 100% rename from assets_old/videos/ugh-cutscene.mp4 rename to assets/videos/ugh-cutscene.mp4 diff --git a/assets_old/week6/images/weeb/animatedEvilSchool.png b/assets/week6/images/weeb/animatedEvilSchool.png similarity index 100% rename from assets_old/week6/images/weeb/animatedEvilSchool.png rename to assets/week6/images/weeb/animatedEvilSchool.png diff --git a/assets_old/week6/images/weeb/animatedEvilSchool.xml b/assets/week6/images/weeb/animatedEvilSchool.xml similarity index 100% rename from assets_old/week6/images/weeb/animatedEvilSchool.xml rename to assets/week6/images/weeb/animatedEvilSchool.xml diff --git a/assets_old/week6/images/weeb/bfPixel.png b/assets/week6/images/weeb/bfPixel.png similarity index 100% rename from assets_old/week6/images/weeb/bfPixel.png rename to assets/week6/images/weeb/bfPixel.png diff --git a/assets_old/week6/images/weeb/bfPixel.xml b/assets/week6/images/weeb/bfPixel.xml similarity index 100% rename from assets_old/week6/images/weeb/bfPixel.xml rename to assets/week6/images/weeb/bfPixel.xml diff --git a/assets_old/week6/images/weeb/bfPixelsDEAD.png b/assets/week6/images/weeb/bfPixelsDEAD.png similarity index 100% rename from assets_old/week6/images/weeb/bfPixelsDEAD.png rename to assets/week6/images/weeb/bfPixelsDEAD.png diff --git a/assets_old/week6/images/weeb/bfPixelsDEAD.xml b/assets/week6/images/weeb/bfPixelsDEAD.xml similarity index 100% rename from assets_old/week6/images/weeb/bfPixelsDEAD.xml rename to assets/week6/images/weeb/bfPixelsDEAD.xml diff --git a/assets_old/week6/images/weeb/bfPortrait.png b/assets/week6/images/weeb/bfPortrait.png similarity index 100% rename from assets_old/week6/images/weeb/bfPortrait.png rename to assets/week6/images/weeb/bfPortrait.png diff --git a/assets_old/week6/images/weeb/bfPortrait.xml b/assets/week6/images/weeb/bfPortrait.xml similarity index 100% rename from assets_old/week6/images/weeb/bfPortrait.xml rename to assets/week6/images/weeb/bfPortrait.xml diff --git a/assets_old/week6/images/weeb/bgFreaks.png b/assets/week6/images/weeb/bgFreaks.png similarity index 100% rename from assets_old/week6/images/weeb/bgFreaks.png rename to assets/week6/images/weeb/bgFreaks.png diff --git a/assets_old/week6/images/weeb/bgFreaks.xml b/assets/week6/images/weeb/bgFreaks.xml similarity index 100% rename from assets_old/week6/images/weeb/bgFreaks.xml rename to assets/week6/images/weeb/bgFreaks.xml diff --git a/assets_old/week6/images/weeb/evilSchoolBG.png b/assets/week6/images/weeb/evilSchoolBG.png similarity index 100% rename from assets_old/week6/images/weeb/evilSchoolBG.png rename to assets/week6/images/weeb/evilSchoolBG.png diff --git a/assets_old/week6/images/weeb/evilSchoolFG.png b/assets/week6/images/weeb/evilSchoolFG.png similarity index 100% rename from assets_old/week6/images/weeb/evilSchoolFG.png rename to assets/week6/images/weeb/evilSchoolFG.png diff --git a/assets_old/week6/images/weeb/gfPixel - Copy.png b/assets/week6/images/weeb/gfPixel - Copy.png similarity index 100% rename from assets_old/week6/images/weeb/gfPixel - Copy.png rename to assets/week6/images/weeb/gfPixel - Copy.png diff --git a/assets_old/week6/images/weeb/gfPixel - Copy.xml b/assets/week6/images/weeb/gfPixel - Copy.xml similarity index 100% rename from assets_old/week6/images/weeb/gfPixel - Copy.xml rename to assets/week6/images/weeb/gfPixel - Copy.xml diff --git a/assets_old/week6/images/weeb/gfPixel.png b/assets/week6/images/weeb/gfPixel.png similarity index 100% rename from assets_old/week6/images/weeb/gfPixel.png rename to assets/week6/images/weeb/gfPixel.png diff --git a/assets_old/week6/images/weeb/gfPixel.xml b/assets/week6/images/weeb/gfPixel.xml similarity index 100% rename from assets_old/week6/images/weeb/gfPixel.xml rename to assets/week6/images/weeb/gfPixel.xml diff --git a/assets_old/week6/images/weeb/petals.png b/assets/week6/images/weeb/petals.png similarity index 100% rename from assets_old/week6/images/weeb/petals.png rename to assets/week6/images/weeb/petals.png diff --git a/assets_old/week6/images/weeb/petals.xml b/assets/week6/images/weeb/petals.xml similarity index 100% rename from assets_old/week6/images/weeb/petals.xml rename to assets/week6/images/weeb/petals.xml diff --git a/assets_old/week6/images/weeb/pixelUI/arrowEnds.png b/assets/week6/images/weeb/pixelUI/arrowEnds.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/arrowEnds.png rename to assets/week6/images/weeb/pixelUI/arrowEnds.png diff --git a/assets_old/week6/images/weeb/pixelUI/arrows-pixels.png b/assets/week6/images/weeb/pixelUI/arrows-pixels.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/arrows-pixels.png rename to assets/week6/images/weeb/pixelUI/arrows-pixels.png diff --git a/assets_old/week6/images/weeb/pixelUI/bad-pixel.png b/assets/week6/images/weeb/pixelUI/bad-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/bad-pixel.png rename to assets/week6/images/weeb/pixelUI/bad-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/combo-pixel.png b/assets/week6/images/weeb/pixelUI/combo-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/combo-pixel.png rename to assets/week6/images/weeb/pixelUI/combo-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/date-pixel.png b/assets/week6/images/weeb/pixelUI/date-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/date-pixel.png rename to assets/week6/images/weeb/pixelUI/date-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/dialogueBox-evil.png b/assets/week6/images/weeb/pixelUI/dialogueBox-evil.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/dialogueBox-evil.png rename to assets/week6/images/weeb/pixelUI/dialogueBox-evil.png diff --git a/assets_old/week6/images/weeb/pixelUI/dialogueBox-evil.xml b/assets/week6/images/weeb/pixelUI/dialogueBox-evil.xml similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/dialogueBox-evil.xml rename to assets/week6/images/weeb/pixelUI/dialogueBox-evil.xml diff --git a/assets_old/week6/images/weeb/pixelUI/dialogueBox-pixel.png b/assets/week6/images/weeb/pixelUI/dialogueBox-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/dialogueBox-pixel.png rename to assets/week6/images/weeb/pixelUI/dialogueBox-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/dialogueBox-pixel.xml b/assets/week6/images/weeb/pixelUI/dialogueBox-pixel.xml similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/dialogueBox-pixel.xml rename to assets/week6/images/weeb/pixelUI/dialogueBox-pixel.xml diff --git a/assets_old/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.png b/assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.png rename to assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.png diff --git a/assets_old/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.xml b/assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.xml similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.xml rename to assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.xml diff --git a/assets_old/week6/images/weeb/pixelUI/good-pixel.png b/assets/week6/images/weeb/pixelUI/good-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/good-pixel.png rename to assets/week6/images/weeb/pixelUI/good-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/hand_textbox.png b/assets/week6/images/weeb/pixelUI/hand_textbox.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/hand_textbox.png rename to assets/week6/images/weeb/pixelUI/hand_textbox.png diff --git a/assets_old/week6/images/weeb/pixelUI/num0-pixel.png b/assets/week6/images/weeb/pixelUI/num0-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num0-pixel.png rename to assets/week6/images/weeb/pixelUI/num0-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num1-pixel.png b/assets/week6/images/weeb/pixelUI/num1-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num1-pixel.png rename to assets/week6/images/weeb/pixelUI/num1-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num2-pixel.png b/assets/week6/images/weeb/pixelUI/num2-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num2-pixel.png rename to assets/week6/images/weeb/pixelUI/num2-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num3-pixel.png b/assets/week6/images/weeb/pixelUI/num3-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num3-pixel.png rename to assets/week6/images/weeb/pixelUI/num3-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num4-pixel.png b/assets/week6/images/weeb/pixelUI/num4-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num4-pixel.png rename to assets/week6/images/weeb/pixelUI/num4-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num5-pixel.png b/assets/week6/images/weeb/pixelUI/num5-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num5-pixel.png rename to assets/week6/images/weeb/pixelUI/num5-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num6-pixel.png b/assets/week6/images/weeb/pixelUI/num6-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num6-pixel.png rename to assets/week6/images/weeb/pixelUI/num6-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num7-pixel.png b/assets/week6/images/weeb/pixelUI/num7-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num7-pixel.png rename to assets/week6/images/weeb/pixelUI/num7-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num8-pixel.png b/assets/week6/images/weeb/pixelUI/num8-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num8-pixel.png rename to assets/week6/images/weeb/pixelUI/num8-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/num9-pixel.png b/assets/week6/images/weeb/pixelUI/num9-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/num9-pixel.png rename to assets/week6/images/weeb/pixelUI/num9-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/ready-pixel.png b/assets/week6/images/weeb/pixelUI/ready-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/ready-pixel.png rename to assets/week6/images/weeb/pixelUI/ready-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/set-pixel.png b/assets/week6/images/weeb/pixelUI/set-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/set-pixel.png rename to assets/week6/images/weeb/pixelUI/set-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/shit-pixel.png b/assets/week6/images/weeb/pixelUI/shit-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/shit-pixel.png rename to assets/week6/images/weeb/pixelUI/shit-pixel.png diff --git a/assets_old/week6/images/weeb/pixelUI/sick-pixel.png b/assets/week6/images/weeb/pixelUI/sick-pixel.png similarity index 100% rename from assets_old/week6/images/weeb/pixelUI/sick-pixel.png rename to assets/week6/images/weeb/pixelUI/sick-pixel.png diff --git a/assets_old/week6/images/weeb/senpaiCrazy.png b/assets/week6/images/weeb/senpaiCrazy.png similarity index 100% rename from assets_old/week6/images/weeb/senpaiCrazy.png rename to assets/week6/images/weeb/senpaiCrazy.png diff --git a/assets_old/week6/images/weeb/senpaiCrazy.xml b/assets/week6/images/weeb/senpaiCrazy.xml similarity index 100% rename from assets_old/week6/images/weeb/senpaiCrazy.xml rename to assets/week6/images/weeb/senpaiCrazy.xml diff --git a/assets_old/week6/images/weeb/senpaiPortrait.png b/assets/week6/images/weeb/senpaiPortrait.png similarity index 100% rename from assets_old/week6/images/weeb/senpaiPortrait.png rename to assets/week6/images/weeb/senpaiPortrait.png diff --git a/assets_old/week6/images/weeb/senpaiPortrait.xml b/assets/week6/images/weeb/senpaiPortrait.xml similarity index 100% rename from assets_old/week6/images/weeb/senpaiPortrait.xml rename to assets/week6/images/weeb/senpaiPortrait.xml diff --git a/assets_old/week6/images/weeb/spirit.png b/assets/week6/images/weeb/spirit.png similarity index 100% rename from assets_old/week6/images/weeb/spirit.png rename to assets/week6/images/weeb/spirit.png diff --git a/assets/characters/spirit/sprite.txt b/assets/week6/images/weeb/spirit.txt similarity index 100% rename from assets/characters/spirit/sprite.txt rename to assets/week6/images/weeb/spirit.txt diff --git a/assets_old/week6/images/weeb/spiritFaceForward.png b/assets/week6/images/weeb/spiritFaceForward.png similarity index 100% rename from assets_old/week6/images/weeb/spiritFaceForward.png rename to assets/week6/images/weeb/spiritFaceForward.png diff --git a/assets_old/week6/images/weeb/weebSchool.png b/assets/week6/images/weeb/weebSchool.png similarity index 100% rename from assets_old/week6/images/weeb/weebSchool.png rename to assets/week6/images/weeb/weebSchool.png diff --git a/assets_old/week6/images/weeb/weebSky.png b/assets/week6/images/weeb/weebSky.png similarity index 100% rename from assets_old/week6/images/weeb/weebSky.png rename to assets/week6/images/weeb/weebSky.png diff --git a/assets_old/week6/images/weeb/weebStreet.png b/assets/week6/images/weeb/weebStreet.png similarity index 100% rename from assets_old/week6/images/weeb/weebStreet.png rename to assets/week6/images/weeb/weebStreet.png diff --git a/assets_old/week6/images/weeb/weebTrees.png b/assets/week6/images/weeb/weebTrees.png similarity index 100% rename from assets_old/week6/images/weeb/weebTrees.png rename to assets/week6/images/weeb/weebTrees.png diff --git a/assets_old/week6/images/weeb/weebTrees.txt b/assets/week6/images/weeb/weebTrees.txt similarity index 100% rename from assets_old/week6/images/weeb/weebTrees.txt rename to assets/week6/images/weeb/weebTrees.txt diff --git a/assets_old/week6/images/weeb/weebTreesBack.png b/assets/week6/images/weeb/weebTreesBack.png similarity index 100% rename from assets_old/week6/images/weeb/weebTreesBack.png rename to assets/week6/images/weeb/weebTreesBack.png diff --git a/assets_old/week6/week6_stuff_here.txt b/assets/week6/week6_stuff_here.txt similarity index 100% rename from assets_old/week6/week6_stuff_here.txt rename to assets/week6/week6_stuff_here.txt