diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 3980f534b4b..be7537f755f 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -54,8 +54,7 @@ var/datum/controller/subsystem/ticker/SSticker
 		'sound/music/space.ogg',
 		'sound/music/traitor.ogg',
 		'sound/music/title2.ogg',
-		'sound/music/clouds.s3m',
-		'sound/music/space_oddity.ogg'
+		'sound/music/clouds.s3m'
 	)
 
 	var/lobby_ready = FALSE
diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm
index 904a4e1882e..783bfaffcad 100644
--- a/code/game/machinery/jukebox.dm
+++ b/code/game/machinery/jukebox.dm
@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 datum/track
 	var/title
 	var/sound
@@ -8,7 +6,7 @@ datum/track/New(var/title_name, var/audio)
 	title = title_name
 	sound = audio
 
-/obj/machinery/media/jukebox/
+/obj/machinery/media/jukebox
 	name = "jukebox"
 	icon = 'icons/obj/jukebox.dmi'
 	icon_state = "jukebox-nopower"
@@ -24,19 +22,16 @@ datum/track/New(var/title_name, var/audio)
 
 	var/datum/track/current_track
 	var/list/datum/track/tracks = list(
-		new/datum/track("Beyond", 'sound/ambience/ambispace.ogg'),
+		new/datum/track("Beyond", 'sound/music/ambispace.ogg'),
 		new/datum/track("Clouds of Fire", 'sound/music/clouds.s3m'),
 		new/datum/track("D`Bert", 'sound/music/title2.ogg'),
-		new/datum/track("D`Fort", 'sound/ambience/song_game.ogg'),
+		new/datum/track("D`Fort", 'sound/music/song_game.ogg'),
 		new/datum/track("Floating", 'sound/music/main.ogg'),
 		new/datum/track("Endless Space", 'sound/music/space.ogg'),
-		new/datum/track("Part A", 'sound/misc/TestLoop1.ogg'),
 		new/datum/track("Scratch", 'sound/music/title1.ogg'),
-		new/datum/track("Trai`Tor", 'sound/music/traitor.ogg'),
-		new/datum/track("Thunderdome", 'sound/music/THUNDERDOME.ogg'),
-		new/datum/track("Space Oddity", 'sound/music/space_oddity.ogg'),
-		new/datum/track("Space Asshole", 'sound/music/space_asshole.ogg'),
-		new/datum/track("Velvet Rose", 'sound/music/Velvet-Rose.ogg')
+		new/datum/track("Suspenseful", 'sound/music/traitor.ogg'),
+		new/datum/track("Thunderdome", 'sound/music/thunderdome.ogg'),
+		new/datum/track("Velvet Rose", 'sound/music/velvet_rose.ogg')
 	)
 
 
@@ -223,11 +218,11 @@ datum/track/New(var/title_name, var/audio)
 	state_base = "record"
 	anchored = 0
 	tracks = list(
-		new/datum/track("Boolean Sisters", 'sound/music/recordplayer/BooleanSisters.ogg'),
-		new/datum/track("Posin'", 'sound/music/recordplayer/Posin.ogg'),
-		new/datum/track("Jazz Instrumental", 'sound/music/recordplayer/JazzInstrumental.ogg'),
-		new/datum/track("Le Swing", 'sound/music/recordplayer/LeSwing.ogg'),
-		new/datum/track("Cosmorot", 'sound/music/recordplayer/Cosmorot.ogg')
+		new/datum/track("Boolean Sisters", 'sound/music/phonograph/boolean_sisters.ogg'),
+		new/datum/track("Electro Swing", 'sound/music/phonograph/electro_swing.ogg'),
+		new/datum/track("Jazz Instrumental", 'sound/music/phonograph/jazz_instrumental.ogg'),
+		new/datum/track("Le Swing", 'sound/music/phonograph/le_swing.ogg'),
+		new/datum/track("Posin'", 'sound/music/phonograph/posin.ogg')
 	)
 
 /obj/machinery/media/jukebox/phonograph/update_icon()
diff --git a/maps/_common/areas/asteroid_areas.dm b/maps/_common/areas/asteroid_areas.dm
index 68a21282ca6..1d9ff511e5e 100644
--- a/maps/_common/areas/asteroid_areas.dm
+++ b/maps/_common/areas/asteroid_areas.dm
@@ -2,7 +2,7 @@
 
 /area/mine
 	icon_state = "mining"
-	ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
+	ambience = list('sound/music/ambimine.ogg', 'sound/music/song_game.ogg')
 	sound_env = ASTEROID
 
 /area/mine/explored
diff --git a/maps/sccv_horizon/code/sccv_horizon_holodeck.dm b/maps/sccv_horizon/code/sccv_horizon_holodeck.dm
index 566296f334d..12f64eb450a 100644
--- a/maps/sccv_horizon/code/sccv_horizon_holodeck.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_holodeck.dm
@@ -35,7 +35,7 @@
 		),
 		"space" = new /datum/holodeck_program(/area/horizon/holodeck/source_space,
 			list(
-				'sound/ambience/ambispace.ogg',
+				'sound/music/ambispace.ogg',
 				'sound/music/main.ogg',
 				'sound/music/space.ogg',
 				'sound/music/traitor.ogg'
diff --git a/sound/misc/TestLoop1.ogg b/sound/misc/TestLoop1.ogg
deleted file mode 100644
index 5e1210bfd06..00000000000
Binary files a/sound/misc/TestLoop1.ogg and /dev/null differ
diff --git a/sound/music/1.ogg b/sound/music/1.ogg
deleted file mode 100644
index 4977b69d87d..00000000000
Binary files a/sound/music/1.ogg and /dev/null differ
diff --git a/sound/ambience/ambimine.ogg b/sound/music/ambimine.ogg
similarity index 100%
rename from sound/ambience/ambimine.ogg
rename to sound/music/ambimine.ogg
diff --git a/sound/ambience/ambispace.ogg b/sound/music/ambispace.ogg
similarity index 100%
rename from sound/ambience/ambispace.ogg
rename to sound/music/ambispace.ogg
diff --git a/sound/music/licensing_information.txt b/sound/music/licensing_information.txt
new file mode 100644
index 00000000000..6b20a91842f
--- /dev/null
+++ b/sound/music/licensing_information.txt
@@ -0,0 +1,82 @@
+MUSIC LICENSING INFORMATION
+----------
+File Name: ambimine.ogg
+Original Title: N/A
+Author: N/A
+License: N/A
+Link: N/A
+----------
+File Name: ambispace.ogg
+Original Title: N/A
+Author: N/A
+License: N/A
+Link: N/A
+----------
+File Name: b12_combined_start.ogg
+Original Title: b12 Combined Start (?)
+Author: Tarn Adams AKA Toady One
+License: N/A
+Link: N/A
+----------
+File Name: battlemonsters_theme.ogg
+Original Title: battlemonsters_theme
+Author: BurgerBB
+License: GNU AGPL Version 3
+Link: N/A
+----------
+File Name: clouds.s3m
+Original Title: Clouds Of Fire
+Author: Hector AKA hec/dMk
+License: Mod Archive Distribution License (?)
+License Link: https://modarchive.org/index.php?terms-upload
+Link: https://modarchive.org/index.php?request=view_by_moduleid&query=73980
+----------
+File Name: main.ogg
+Original Title: another_drone
+Author: the_semen_incident
+License: CC0 1.0
+Link: https://freesound.org/people/the_semen_incident/sounds/66097
+----------
+File Name: song_game.ogg
+Original Title: Unknown (?)
+Author: Tarn Adams AKA Toady One
+License: N/A
+Link: N/A
+----------
+File Name: space.ogg
+Original Title: Solus- Endless Space Expanded
+Author: SolusLunes
+License: CC BY 3.0
+Link: https://www.newgrounds.com/audio/listen/74946
+----------
+File Name: thunderdome.ogg
+Original Title: -Sector11
+Author: MashedByMachines
+License: CC BY-NC-SA 3.0
+Link: https://www.newgrounds.com/audio/listen/312622
+----------
+File Name: title1.ogg
+Original Title: flip-flap
+Author: Wojciech Panufnik AKA X-CEED
+License: CC BY 3.0 (?)
+Link: https://aminet.net/package/mods/xceed/Flipflap
+Link 2: https://amp.dascene.net/detail.php?detail=modules&view=8236
+----------
+File Name: title2.ogg
+Original Title: robocop
+Author: Eric Schumaker AKA CBoyardee
+License: N/A
+Link: N/A
+----------
+File Name: traitor.ogg
+Original Title: Absconditus
+Author: Joseph Toscano AKA Zhaytee
+License: CC BY-NC-SA 3.0
+Link: https://bandcamp.zhaytee.net/track/absconditus
+----------
+File Name: velvet_rose.ogg
+Original Title: Velvet Rose
+Author: Naelynn
+License: CC0 1.0
+License Link: https://github.com/Aurorastation/Aurora.3/pull/7729#issuecomment-567239575
+Link: https://github.com/Aurorastation/Aurora.3/pull/7729
\ No newline at end of file
diff --git a/sound/music/music help.txt b/sound/music/music help.txt
deleted file mode 100644
index 7118a4c7296..00000000000
--- a/sound/music/music help.txt	
+++ /dev/null
@@ -1 +0,0 @@
-To make music work open up maps/Space Station 13 Areas.dm and add music = "music/bla" below an entry and include musicplayer.dm at compiletime
\ No newline at end of file
diff --git a/sound/music/recordplayer/BooleanSisters.ogg b/sound/music/phonograph/boolean_sisters.ogg
similarity index 100%
rename from sound/music/recordplayer/BooleanSisters.ogg
rename to sound/music/phonograph/boolean_sisters.ogg
diff --git a/sound/music/recordplayer/Cosmorot.ogg b/sound/music/phonograph/electro_swing.ogg
similarity index 100%
rename from sound/music/recordplayer/Cosmorot.ogg
rename to sound/music/phonograph/electro_swing.ogg
diff --git a/sound/music/recordplayer/JazzInstrumental.ogg b/sound/music/phonograph/jazz_instrumental.ogg
similarity index 100%
rename from sound/music/recordplayer/JazzInstrumental.ogg
rename to sound/music/phonograph/jazz_instrumental.ogg
diff --git a/sound/music/recordplayer/LeSwing.ogg b/sound/music/phonograph/le_swing.ogg
similarity index 100%
rename from sound/music/recordplayer/LeSwing.ogg
rename to sound/music/phonograph/le_swing.ogg
diff --git a/sound/music/phonograph/licensing_information.txt b/sound/music/phonograph/licensing_information.txt
new file mode 100644
index 00000000000..483fa55cc4f
--- /dev/null
+++ b/sound/music/phonograph/licensing_information.txt
@@ -0,0 +1,32 @@
+MUSIC LICENSING INFORMATION
+----------
+File Name: boolean_sisters.ogg
+Original Title: Boolean Sisters
+Author: Sim Gretina
+License: Artist permission.
+Link: https://www.youtube.com/watch?v=yz7TiORMhLY
+----------
+File Name: electro_swing.ogg
+Original Title: Electro Swing
+Author: Cosmorot
+License: Music Standard License 
+License Link: https://audiojungle.net/licenses/terms/music_standard
+Link: https://audiojungle.net/item/electro-swing/7702240
+----------
+File Name: jazz_instrumental.ogg
+Original Title: My Cutey's Due at Two-to-Two To-Day
+Author: Little Ramblers
+License: Public Domain
+Link: https://www.discogs.com/release/3394515-The-Little-Ramblers-And-Then-I-Forget-My-Cuteys-Due-At-Two-To-Two-To-Day
+----------
+File Name: le_swing.ogg
+Original Title: Unknown
+Author: Unknown
+License: CC-BY 4.0 (?)
+Link: Unknown
+----------
+File Name: posin.ogg
+Original Title: Posin'
+Author: Sim Gretina
+License: Artist permission.
+Link: https://www.youtube.com/watch?v=TtXMeMR81q4
\ No newline at end of file
diff --git a/sound/music/recordplayer/Posin.ogg b/sound/music/phonograph/posin.ogg
similarity index 100%
rename from sound/music/recordplayer/Posin.ogg
rename to sound/music/phonograph/posin.ogg
diff --git a/sound/music/recordplayer/licensing.txt b/sound/music/recordplayer/licensing.txt
deleted file mode 100644
index f36853c8983..00000000000
--- a/sound/music/recordplayer/licensing.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Posin' - Sim Gretina - Artist Permission
-Boolean Sisters - Sim Gretina - Artist Permission
-Le Swing - CC-BY 4.0
-Cosmorot - CC-BY 3.0
-Jazz Instrumental - Public Domain
\ No newline at end of file
diff --git a/sound/ambience/song_game.ogg b/sound/music/song_game.ogg
similarity index 100%
rename from sound/ambience/song_game.ogg
rename to sound/music/song_game.ogg
diff --git a/sound/music/space_asshole.ogg b/sound/music/space_asshole.ogg
deleted file mode 100644
index 883f24c2862..00000000000
Binary files a/sound/music/space_asshole.ogg and /dev/null differ
diff --git a/sound/music/space_oddity.ogg b/sound/music/space_oddity.ogg
deleted file mode 100644
index b77fd23aeb7..00000000000
Binary files a/sound/music/space_oddity.ogg and /dev/null differ
diff --git a/sound/music/Velvet-Rose.ogg b/sound/music/velvet_rose.ogg
similarity index 100%
rename from sound/music/Velvet-Rose.ogg
rename to sound/music/velvet_rose.ogg
diff --git a/sound/serversound_list.txt b/sound/serversound_list.txt
index f832605a80b..6fde246a661 100644
--- a/sound/serversound_list.txt
+++ b/sound/serversound_list.txt
@@ -1,15 +1,13 @@
-sound/music/1.ogg
+sound/music/ambimine.ogg
+sound/music/ambispace.ogg
 sound/music/b12_combined_start.ogg
-sound/music/clouds.ogg
+sound/music/battlemonsters_theme.ogg
+sound/music/clouds.s3m
 sound/music/main.ogg
+sound/music/song_game.ogg
 sound/music/space.ogg
-sound/music/space_asshole.ogg
-sound/music/space_oddity.ogg
-sound/music/THUNDERDOME.ogg
+sound/music/thunderdome.ogg
 sound/music/title1.ogg
 sound/music/title2.ogg
 sound/music/traitor.ogg
-sound/music/battlemonsters_theme.ogg
-sound/music/Velvet-Rose.ogg
-sound/items/bikehorn.ogg
-sound/effects/siren.ogg
\ No newline at end of file
+sound/music/velvet_rose.ogg
\ No newline at end of file