diff --git a/desktop/resources/music/inside-antique.mp3 b/desktop/resources/music/inside-antique.mp3
new file mode 100644
index 00000000..7399d079
Binary files /dev/null and b/desktop/resources/music/inside-antique.mp3 differ
diff --git a/desktop/resources/inside-antique.ogg b/desktop/resources/music/inside-antique.ogg
similarity index 100%
rename from desktop/resources/inside-antique.ogg
rename to desktop/resources/music/inside-antique.ogg
diff --git a/desktop/resources/music/inside-fangald.mp3 b/desktop/resources/music/inside-fangald.mp3
new file mode 100644
index 00000000..99937d85
Binary files /dev/null and b/desktop/resources/music/inside-fangald.mp3 differ
diff --git a/desktop/resources/inside-fangald.ogg b/desktop/resources/music/inside-fangald.ogg
similarity index 100%
rename from desktop/resources/inside-fangald.ogg
rename to desktop/resources/music/inside-fangald.ogg
diff --git a/desktop/resources/music/intro.mp3 b/desktop/resources/music/intro.mp3
new file mode 100644
index 00000000..c9cb4980
Binary files /dev/null and b/desktop/resources/music/intro.mp3 differ
diff --git a/desktop/resources/intro.ogg b/desktop/resources/music/intro.ogg
similarity index 100%
rename from desktop/resources/intro.ogg
rename to desktop/resources/music/intro.ogg
diff --git a/desktop/resources/music/love.mp3 b/desktop/resources/music/love.mp3
new file mode 100644
index 00000000..e89545eb
Binary files /dev/null and b/desktop/resources/music/love.mp3 differ
diff --git a/desktop/resources/love.ogg b/desktop/resources/music/love.ogg
similarity index 100%
rename from desktop/resources/love.ogg
rename to desktop/resources/music/love.ogg
diff --git a/desktop/resources/megaboss.mp3 b/desktop/resources/music/megaboss.mp3
similarity index 100%
rename from desktop/resources/megaboss.mp3
rename to desktop/resources/music/megaboss.mp3
diff --git a/desktop/resources/music/night.mp3 b/desktop/resources/music/night.mp3
new file mode 100644
index 00000000..08196ca3
Binary files /dev/null and b/desktop/resources/music/night.mp3 differ
diff --git a/desktop/resources/night.ogg b/desktop/resources/music/night.ogg
similarity index 100%
rename from desktop/resources/night.ogg
rename to desktop/resources/music/night.ogg
diff --git a/desktop/resources/music/pull-sword.mp3 b/desktop/resources/music/pull-sword.mp3
new file mode 100644
index 00000000..e5a15214
Binary files /dev/null and b/desktop/resources/music/pull-sword.mp3 differ
diff --git a/desktop/resources/pull-sword.ogg b/desktop/resources/music/pull-sword.ogg
similarity index 100%
rename from desktop/resources/pull-sword.ogg
rename to desktop/resources/music/pull-sword.ogg
diff --git a/desktop/resources/music/secret-hideout.mp3 b/desktop/resources/music/secret-hideout.mp3
new file mode 100644
index 00000000..9bc3332c
Binary files /dev/null and b/desktop/resources/music/secret-hideout.mp3 differ
diff --git a/desktop/resources/secret-hideout.ogg b/desktop/resources/music/secret-hideout.ogg
similarity index 100%
rename from desktop/resources/secret-hideout.ogg
rename to desktop/resources/music/secret-hideout.ogg
diff --git a/desktop/resources/music/town-music-1.mp3 b/desktop/resources/music/town-music-1.mp3
new file mode 100644
index 00000000..0fee8992
Binary files /dev/null and b/desktop/resources/music/town-music-1.mp3 differ
diff --git a/desktop/resources/town-music-1.ogg b/desktop/resources/music/town-music-1.ogg
similarity index 100%
rename from desktop/resources/town-music-1.ogg
rename to desktop/resources/music/town-music-1.ogg
diff --git a/desktop/resources/music/town-music-2.mp3 b/desktop/resources/music/town-music-2.mp3
new file mode 100644
index 00000000..266ee236
Binary files /dev/null and b/desktop/resources/music/town-music-2.mp3 differ
diff --git a/desktop/resources/town-music-2.ogg b/desktop/resources/music/town-music-2.ogg
similarity index 100%
rename from desktop/resources/town-music-2.ogg
rename to desktop/resources/music/town-music-2.ogg
diff --git a/desktop/resources/music/town-music.mp3 b/desktop/resources/music/town-music.mp3
new file mode 100644
index 00000000..d38ec333
Binary files /dev/null and b/desktop/resources/music/town-music.mp3 differ
diff --git a/desktop/resources/town-music.ogg b/desktop/resources/music/town-music.ogg
similarity index 100%
rename from desktop/resources/town-music.ogg
rename to desktop/resources/music/town-music.ogg
diff --git a/desktop/resources/town-music.ovw b/desktop/resources/music/town-music.ovw
similarity index 100%
rename from desktop/resources/town-music.ovw
rename to desktop/resources/music/town-music.ovw
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index c8517e9a..70ef7805 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -978,16 +978,16 @@ void main()
                               :paused? false
                               :object nil}
                         :musics {:object nil
-                                 :inside-antique (utils/make-music "inside-antique.ogg")
-                                 :town-1 (utils/make-music "town-music-1.ogg")
-                                 :town-2 (utils/make-music "town-music-2.ogg")
-                                 :love (utils/make-music "love.ogg")
-                                 :inside-fangald (utils/make-music "inside-fangald.ogg")
-                                 :fight (utils/make-music "megaboss.mp3")
-                                 :pull-sword (utils/make-music "pull-sword.ogg")
-                                 :night (utils/make-music "night.ogg")
+                                 :inside-antique (utils/make-music "music/inside-antique.ogg")
+                                 :town-1 (utils/make-music "music/town-music-1.ogg")
+                                 :town-2 (utils/make-music "music/town-music-2.ogg")
+                                 :love (utils/make-music "music/love.ogg")
+                                 :inside-fangald (utils/make-music "music/inside-fangald.ogg")
+                                 :fight (utils/make-music "music/megaboss.mp3")
+                                 :pull-sword (utils/make-music "music/pull-sword.ogg")
+                                 :night (utils/make-music "music/night.ogg")
                                  :dream (utils/make-music "dream/music.ogg")
-                                 :secret-hideout (utils/make-music "secret-hideout.ogg")}
+                                 :secret-hideout (utils/make-music "music/secret-hideout.ogg")}
                         :state (get-state) 
                         :time-profiles {:object nil
                                         :default utils/default-night-merge
diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj
index 343abfeb..d902dc1d 100644
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -96,7 +96,7 @@
           fullscreen (center fullscreen) 
           quit (assoc (label "End quest" (style :label font (color 1.0 0.3 0.3 1.0))) :x 0 :y (- 280 (* 32 6)) :height 32 :origin-x 0 :origin-y 0)
           quit (center quit) 
-          music (utils/make-music "intro.ogg")
+          music (utils/make-music "music/intro.ogg")
           ui-skin (skin "ui/ui.json")
           balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))
           ]
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index bef48444..da56e7cd 100644
--- a/desktop/src-common/advent/utils.clj
+++ b/desktop/src-common/advent/utils.clj
@@ -222,7 +222,10 @@
   (music! snd :stop))
 
 (defn make-music [r]
-  (doto (music r) (music! :set-looping true)))
+  (try
+    (doto (music r) (music! :set-looping true))
+    (catch Exception _
+      (doto (music (str/replace r #"\.ogg" ".mp3")) (music! :set-looping true)))))