Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.

To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"

If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -1,7 +1,7 @@
 obj/machinery/atmospherics/binary/passive_gate
 	//Tries to achieve target pressure at output (like a normal pump) except
 	//	Uses no power but can not transfer gases from a low pressure area to a high pressure area
-	icon = 'passive_gate.dmi'
+	icon = 'icons/obj/atmospherics/passive_gate.dmi'
 	icon_state = "intact_off"
 
 	name = "Passive gate"

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -188,7 +188,7 @@ obj/machinery/atmospherics/binary/pump
 			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 			add_fingerprint(user)
 			return 1
-		playsound(src.loc, 'Ratchet.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "\blue You begin to unfasten \the [src]..."
 		if (do_after(user, 40))
 			user.visible_message( \

code/ATMOSPHERICS/components/portables_connector.dm

@@ -146,7 +146,7 @@
 			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 			add_fingerprint(user)
 			return 1
-		playsound(src.loc, 'Ratchet.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "\blue You begin to unfasten \the [src]..."
 		if (do_after(user, 40))
 			user.visible_message( \

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -144,7 +144,7 @@ Filter types:
 			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 			add_fingerprint(user)
 			return 1
-		playsound(src.loc, 'Ratchet.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "\blue You begin to unfasten \the [src]..."
 		if (do_after(user, 40))
 			user.visible_message( \

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -95,7 +95,7 @@ obj/machinery/atmospherics/trinary/mixer
 			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 			add_fingerprint(user)
 			return 1
-		playsound(src.loc, 'Ratchet.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "\blue You begin to unfasten \the [src]..."
 		if (do_after(user, 40))
 			user.visible_message( \

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -258,7 +258,7 @@
 				user << "\blue Now welding the vent."
 				if(do_after(user, 20))
 					if(!src || !WT.isOn()) return
-					playsound(src.loc, 'Welder2.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 					if(!welded)
 						user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
 						welded = 1
@@ -301,7 +301,7 @@
 			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 			add_fingerprint(user)
 			return 1
-		playsound(src.loc, 'Ratchet.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "\blue You begin to unfasten \the [src]..."
 		if (do_after(user, 40))
 			user.visible_message( \

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -248,7 +248,7 @@
 			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 			add_fingerprint(user)
 			return 1
-		playsound(src.loc, 'Ratchet.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "\blue You begin to unfasten \the [src]..."
 		if (do_after(user, 40))
 			user.visible_message( \

code/ATMOSPHERICS/components/valve.dm

@@ -320,7 +320,7 @@ obj/machinery/atmospherics/valve
 			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 			add_fingerprint(user)
 			return 1
-		playsound(src.loc, 'Ratchet.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "\blue You begin to unfasten \the [src]..."
 		if (do_after(user, 40))
 			user.visible_message( \

code/ATMOSPHERICS/pipes.dm

@@ -159,7 +159,7 @@ obj/machinery/atmospherics/pipe
 
 		proc/burst()
 			src.visible_message("\red \bold [src] bursts!");
-			playsound(src.loc, 'bang.ogg', 25, 1)
+			playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
 			var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
 			smoke.set_up(1,0, src.loc, 0)
 			smoke.start()
@@ -818,7 +818,7 @@ obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/u
 		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
 		add_fingerprint(user)
 		return 1
-	playsound(src.loc, 'Ratchet.ogg', 50, 1)
+	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	user << "\blue You begin to unfasten \the [src]..."
 	if (do_after(user, 40))
 		user.visible_message( \

code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm

@@ -372,23 +372,23 @@ mob
 
 				var/datum/pipe_network/master = P.return_network()
 				if(master)
-					P.overlays += icon('atmos_testing.dmi',"marker[master.marker]")
+					P.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[master.marker]")
 				else
 					world << "error"
-					P.overlays += icon('atmos_testing.dmi',"marker0")
+					P.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0")
 
 			for(var/obj/machinery/atmospherics/valve/V in world)
 				V.overlays = null
 
 				if(V.network_node1)
-					V.overlays += icon('atmos_testing.dmi',"marker[V.network_node1.marker]")
+					V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[V.network_node1.marker]")
 				else
-					V.overlays += icon('atmos_testing.dmi',"marker0")
+					V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0")
 
 				if(V.network_node2)
-					V.overlays += icon('atmos_testing.dmi',"marker[V.network_node2.marker]")
+					V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[V.network_node2.marker]")
 				else
-					V.overlays += icon('atmos_testing.dmi',"marker0")
+					V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0")
 
 turf/simulated
 	var/fire_verbose = 0
@@ -399,9 +399,9 @@ turf/simulated
 			overlays = null
 			for(var/direction in list(NORTH,SOUTH,EAST,WEST))
 				if(group_border&direction)
-					overlays += icon('turf_analysis.dmi',"red_arrow",direction)
+					overlays += icon('icons/Testing/turf_analysis.dmi',"red_arrow",direction)
 				else if(air_check_directions&direction)
-					overlays += icon('turf_analysis.dmi',"arrow",direction)
+					overlays += icon('icons/Testing/turf_analysis.dmi',"arrow",direction)
 		air_status()
 			set src in world
 			set category = "Minor"
@@ -446,7 +446,7 @@ turf/simulated
 				assume_air(adding)
 
 obj/indicator
-	icon = 'air_meter.dmi'
+	icon = 'icons/Testing/air_meter.dmi'
 	var/measure = "temperature"
 	anchored = 1
 
@@ -562,7 +562,7 @@ mob
 				group.marker = 0
 
 			for(var/turf/simulated/floor/S in world)
-				S.icon = 'turf_analysis.dmi'
+				S.icon = 'icons/Testing/turf_analysis.dmi'
 				if(S.parent)
 					if(S.parent.group_processing)
 						if (S.parent.check_delay < 2)
@@ -608,7 +608,7 @@ mob
 				group.marker = 0
 
 			for(var/turf/simulated/floor/S in world)
-				S.icon = 'turf_analysis.dmi'
+				S.icon = 'icons/Testing/turf_analysis.dmi'
 				if(S.parent)
 					if(S.parent.group_processing)
 						if(S.parent.marker == 0)

code/WorkInProgress/virus2/analyser.dm

@@ -1,6 +1,6 @@
 /obj/machinery/disease2/diseaseanalyser
 	name = "Disease Analyser"
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "analyser"
 	anchored = 1
 	density = 1

code/WorkInProgress/virus2/biohazard destroyer.dm

@@ -1,6 +1,6 @@
 /obj/machinery/disease2/biodestroyer
 	name = "Biohazard destroyer"
-	icon = 'disposal.dmi'
+	icon = 'icons/obj/pipes/disposal.dmi'
 	icon_state = "disposalbio"
 	var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers)
 	density = 1
@@ -11,7 +11,7 @@
 		if(I.type in typesof(path))
 			user.drop_item()
 			del(I)
-			overlays += image('disposal.dmi', "dispover-handle")
+			overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle")
 			return
 	user.drop_item()
 	I.loc = src.loc

code/WorkInProgress/virus2/cureimplanter.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/cureimplanter
 	name = "Hypospray injector"
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "implanter1"
 	var/datum/disease2/resistance/resistance = null
 	var/works = 0

code/WorkInProgress/virus2/curer.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/curer
 	name = "Cure Research Machine"
-	icon = 'computer.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_state = "dna"
 	var/curing
 	var/virusing
@@ -9,7 +9,7 @@
 
 /obj/machinery/computer/curer/attackby(var/obj/I as obj, var/mob/user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			if (src.stat & BROKEN)
 				user << "\blue The broken glass falls out."

code/WorkInProgress/virus2/diseasesplicer.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/diseasesplicer
 	name = "Disease Splicer"
-	icon = 'computer.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_state = "crew"
 
 	var/datum/disease2/effectholder/memorybank = null
@@ -13,7 +13,7 @@
 
 /obj/machinery/computer/diseasesplicer/attackby(var/obj/I as obj, var/mob/user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			if (src.stat & BROKEN)
 				user << "\blue The broken glass falls out."
@@ -173,7 +173,7 @@
 
 /obj/item/weapon/diseasedisk
 	name = "Blank GNA disk"
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "datadisk0"
 	var/datum/disease2/effectholder/effect = null
 	var/stage = 1

code/WorkInProgress/virus2/dishincubator.dm

@@ -2,7 +2,7 @@
 	name = "Pathogenic incubator"
 	density = 1
 	anchored = 1
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "incubator"
 	var/obj/item/weapon/virusdish/dish
 	var/obj/item/weapon/reagent_containers/glass/beaker = null

code/WorkInProgress/virus2/isolator.dm

@@ -2,7 +2,7 @@
 	name = "Pathogenic Isolator"
 	density = 1
 	anchored = 1
-	icon = 'virology.dmi'
+	icon = 'icons/obj/virology.dmi'
 	icon_state = "isolator"
 	var/datum/disease2/disease/virus2 = null
 	var/isolating = 0
@@ -115,7 +115,7 @@
 
 /obj/item/weapon/virusdish
 	name = "Virus containment/growth dish"
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "implantcase-b"
 	var/datum/disease2/disease/virus2 = null
 	var/growth = 0

code/WorkInProgress/virus2/monkeydispensor.dm

@@ -1,6 +1,6 @@
 /obj/machinery/disease2/monkeycloner
 	name = "Monkey dispensor"
-	icon = 'cloning.dmi'
+	icon = 'icons/obj/cloning.dmi'
 	icon_state = "pod_0"
 	density = 1
 	anchored = 1

code/datums/diseases/alien_embryo.dm

@@ -82,7 +82,7 @@
 				else
 					new_xeno.key = affected_mob.key
 
-				new_xeno << sound('hiss5.ogg',0,0,0,100)	//To get the player's attention
+				new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
 				affected_mob.gib()
 				src.cure(0)
 				gibbed = 1

code/datums/diseases/appendicitis.dm

@@ -29,7 +29,7 @@
 					affected_mob.Stun(rand(4,6))
 					for(var/mob/O in viewers(world.view, affected_mob))
 						O.show_message(text("<b>\red [] throws up!</b>", affected_mob), 1)
-					playsound(affected_mob.loc, 'splat.ogg', 50, 1)
+					playsound(affected_mob.loc, 'sound/effects/splat.ogg', 50, 1)
 					var/turf/location = affected_mob.loc
 					if (istype(location, /turf/simulated))
 						location.add_vomit_floor(affected_mob)

code/datums/shuttle_controller.dm

@@ -39,7 +39,7 @@ datum/shuttle_controller
 			if(timeleft >= 600)
 				return
 			captain_announce("The emergency shuttle has been recalled.")
-			world << sound('shuttlerecalled.ogg')
+			world << sound('sound/AI/shuttlerecalled.ogg')
 			setdirection(-1)
 			online = 1
 
@@ -257,7 +257,7 @@ datum/shuttle_controller
 						settimeleft(SHUTTLELEAVETIME)
 						send2irc("Server", "The Emergency Shuttle has docked with the station.")
 						captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.")
-						world << sound('shuttledock.ogg')
+						world << sound('sound/AI/shuttledock.ogg')
 
 						return 1
 

code/datums/spell.dm

@@ -98,9 +98,9 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			else
 				usr.say(dd_replacetext(invocation," ","`"))
 			if(usr.gender=="male")
-				playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+				playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
 			else
-				playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+				playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
 		if("whisper")
 			if(prob(50))
 				usr.whisper(invocation)

code/datums/spells/area_teleport.dm

@@ -60,9 +60,9 @@
 			if("shout")
 				usr.say("[invocation] [uppertext(chosenarea.name)]")
 				if(usr.gender=="male")
-					playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+					playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
 				else
-					playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
+					playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
 			if("whisper")
 				usr.whisper("[invocation] [uppertext(chosenarea.name)]")
 

code/defines/area/Space Station 13 areas.dm

@@ -931,7 +931,7 @@ proc/process_ghost_teleport_locs()
 /area/medical/medbay
 	name = "Medbay"
 	icon_state = "medbay"
-	music = 'signal.ogg'
+	music = 'sound/ambience/signal.ogg'
 
 /area/medical/patients_rooms
 	name = "\improper Patient's Rooms"
@@ -1515,7 +1515,7 @@ var/list/the_station_areas = list (
 		..()
 		var/sound/S = new/sound()
 		mysound = S
-		S.file = 'shore.ogg'
+		S.file = 'sound/ambience/shore.ogg'
 		S.repeat = 1
 		S.wait = 0
 		S.channel = 123
@@ -1543,7 +1543,7 @@ var/list/the_station_areas = list (
 		var/sound/S = null
 		var/sound_delay = 0
 		if(prob(25))
-			S = sound(file=pick('seag1.ogg','seag2.ogg','seag3.ogg'), volume=100)
+			S = sound(file=pick('sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag3.ogg'), volume=100)
 			sound_delay = rand(0, 50)
 
 		for(var/mob/living/carbon/human/H in src)

code/defines/obj/toy.dm

@@ -175,7 +175,7 @@
 		if (src.bullets < 1)
 			user.show_message("\red *click* *click*", 2)
 			return
-		playsound(user, 'Gunshot.ogg', 100, 1)
+		playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1)
 		src.bullets--
 		for(var/mob/O in viewers(user, null))
 			O.show_message(text("\red <B>[] fires a cap gun at []!</B>", user, target), 1, "\red You hear a gunshot", 2)
@@ -195,13 +195,13 @@
 		src.active = !( src.active )
 		if (src.active)
 			user << "\blue You extend the plastic blade with a quick flick of your wrist."
-			playsound(user, 'saberon.ogg', 50, 1)
+			playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 			src.icon_state = "swordblue"
 			src.item_state = "swordblue"
 			src.w_class = 4
 		else
 			user << "\blue You push the plastic blade back down into the handle."
-			playsound(user, 'saberoff.ogg', 50, 1)
+			playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 			src.icon_state = "sword0"
 			src.item_state = "sword0"
 			src.w_class = 2
@@ -248,7 +248,7 @@
 			bullets--
 			D.icon_state = "foamdart"
 			D.name = "foam dart"
-			playsound(user.loc, 'syringeproj.ogg', 50, 1)
+			playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
 
 			for(var/i=0, i<6, i++)
 				if (D)
@@ -296,7 +296,7 @@
 					O.show_message(text("\red <B>[] casually lines up a shot with []'s head and pulls the trigger!</B>", user, M), 1, "\red You hear the sound of foam against skull", 2)
 					O.show_message(text("\red [] was hit in the head by the foam dart!", M), 1)
 
-			playsound(user.loc, 'syringeproj.ogg', 50, 1)
+			playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
 			new /obj/item/toy/ammo/crossbow(M.loc)
 			src.bullets--
 		else if (M.lying && src.bullets == 0)
@@ -343,7 +343,7 @@
 		s.start()
 		new /obj/effect/decal/cleanable/ash(src.loc)
 		src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
-		playsound(src, 'snap.ogg', 50, 1)
+		playsound(src, 'sound/effects/snap.ogg', 50, 1)
 		del(src)
 
 /obj/item/toy/snappop/HasEntered(H as mob|obj)
@@ -357,7 +357,7 @@
 			s.start()
 			new /obj/effect/decal/cleanable/ash(src.loc)
 			src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
-			playsound(src, 'snap.ogg', 50, 1)
+			playsound(src, 'sound/effects/snap.ogg', 50, 1)
 			del(src)
 
 /obj/item/toy/waterflower
@@ -406,7 +406,7 @@
 		D.icon_state = "chempuff"
 		D.create_reagents(5)
 		src.reagents.trans_to(D, 1)
-		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
+		playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 
 		spawn(0)
 			for(var/i=0, i<1, i++)

code/defines/obj/weapon.dm

@@ -657,7 +657,7 @@
 	icon_state = "fire_extinguisher0"
 	var/last_use = 1.0
 	var/safety = 1
-	hitsound = 'smash.ogg'
+	hitsound = 'sound/weapons/smash.ogg'
 	flags = FPRINT | USEDELAY | TABLEPASS | CONDUCT
 	throwforce = 10
 	w_class = 3.0
@@ -1484,7 +1484,7 @@
 	desc = "You can drill using this item. You dig?"
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "drill"
-	hitsound = 'circsawhit.ogg'
+	hitsound = 'sound/weapons/circsawhit.ogg'
 	m_amt = 15000
 	g_amt = 10000
 	flags = FPRINT | TABLEPASS | CONDUCT
@@ -1498,7 +1498,7 @@
 	desc = "For heavy duty cutting."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "saw3"
-	hitsound = 'circsawhit.ogg'
+	hitsound = 'sound/weapons/circsawhit.ogg'
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
 	w_class = 1.0

code/defines/procs/helpers.dm

@@ -319,7 +319,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		if(cmptext("ai",role))
 			oldname = null//don't bother with the records update crap
 			world << "<b>[newname] is the AI!</b>"
-			world << sound('newAI.ogg')
+			world << sound('sound/AI/newAI.ogg')
 
 		fully_replace_character_name(oldname,newname)
 

code/game/area/areas.dm

@@ -284,7 +284,7 @@
 
 	var/sound = null
 	var/musVolume = 25
-	sound = 'ambigen1.ogg'
+	sound = 'sound/ambience/ambigen1.ogg'
 
 
 	if (ismob(A))
@@ -308,24 +308,24 @@
 
 		if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
 			A:client:ambience_playing = 1
-			A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
+			A << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
 
 		switch(src.name)
-			if ("Chapel") sound = pick('ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg')
+			if ("Chapel") sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg')
-			if ("Morgue") sound = pick('ambimo1.ogg','ambimo2.ogg','title2.ogg')
+			if ("Morgue") sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/title2.ogg')
-			if ("Space") sound = pick('ambispace.ogg','title2.ogg',)
+			if ("Space") sound = pick('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',)
-			if ("Engine Control", "Engineering", "Engineering SMES") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg')
+			if ("Engine Control", "Engineering", "Engineering SMES") sound = pick('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg')
-			if ("AI Satellite Teleporter Room") sound = pick('ambimalf.ogg')
+			if ("AI Satellite Teleporter Room") sound = pick('sound/ambience/ambimalf.ogg')
-			if ("AI Upload Foyer") sound = pick('ambimalf.ogg')
+			if ("AI Upload Foyer") sound = pick('sound/ambience/ambimalf.ogg')
-			if ("AI Upload Chamber") sound = pick('ambimalf.ogg')
+			if ("AI Upload Chamber") sound = pick('sound/ambience/ambimalf.ogg')
 			if ("Mine")
-				sound = pick('ambimine.ogg')
+				sound = pick('sound/ambience/ambimine.ogg')
 				musVolume = 25
 			else
-				sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg')
+				sound = pick('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
 
 		if(findtext(src.name, "Telecommunications"))
-			sound = pick('ambisin2.ogg', 'signal.ogg', 'signal.ogg', 'ambigen10.ogg')
+			sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
 
 		if (prob(35))
 			if(A && A:client && !A:client:played)

code/game/atom_procs.dm

@@ -1007,7 +1007,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 				var/obj/item/projectile/beam/A = new /obj/item/projectile/beam( usr.loc )
 				A.icon = 'icons/effects/genetics.dmi'
 				A.icon_state = "eyelasers"
-				playsound(usr.loc, 'taser2.ogg', 75, 1)
+				playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
 
 				A.firer = usr
 				A.def_zone = usr:get_organ_target()

code/game/cellautomata.dm

@@ -120,15 +120,15 @@
 //Crispy fullban
 /world/Reboot(var/reason)
 	spawn(0)
-		world << sound(pick('newroundsexy.ogg','apcdestroyed.ogg','bangindonk.ogg')) // random end sounds!! - LastyBatsy
+		world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy
 		//if(prob(40))
 		//	for(var/mob/M in world)
 		//		if(M.client)
-		//			M << sound('newroundsexy.ogg')
+		//			M << sound('sound/AI/newroundsexy.ogg')
 		//else
 		//	for(var/mob/M in world)
 		//		if(M.client)
-		//			M << sound('apcdestroyed.ogg')
+		//			M << sound('sound/misc/apcdestroyed.ogg')
 
 	for(var/client/C)
 		if (config.server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite

code/game/chemistry.dm

@@ -62,7 +62,7 @@
 			user << "\red You prime the smoke bomb! [det_time/10] seconds!"
 			src.state = 1
 			src.icon_state = "flashbang1"
-			playsound(src.loc, 'armbomb.ogg', 75, 1, -3)
+			playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
 			spawn( src.det_time )
 				prime()
 				return
@@ -82,7 +82,7 @@
 	return
 
 /obj/item/weapon/smokebomb/proc/prime()
-	playsound(src.loc, 'smoke.ogg', 50, 1, -3)
+	playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 	spawn(0)
 		src.smoke.start()
 		sleep(10)
@@ -131,7 +131,7 @@
 			user << "\red You prime the mustard gas bomb! [det_time/10] seconds!"
 			src.state = 1
 			src.icon_state = "flashbang1"
-			playsound(src.loc, 'armbomb.ogg', 75, 1, -3)
+			playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
 			spawn( src.det_time )
 				prime()
 				return
@@ -151,7 +151,7 @@
 	return
 
 /obj/item/weapon/mustardbomb/proc/prime()
-	playsound(src.loc, 'smoke.ogg', 50, 1, -3)
+	playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 	spawn(0)
 		src.mustard_gas.start()
 		sleep(10)

code/game/gamemodes/blob/blob.dm

@@ -109,7 +109,7 @@ var/list/blob_nodes = list()
 
 			if (1)
 				command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-				world << sound('outbreak5.ogg')
+				world << sound('sound/AI/outbreak5.ogg')
 				autoexpand = 0//No more extra pulses
 				stage = -1
 				//next stage in 4-5 minutes

code/game/gamemodes/blob/blobs/core.dm

@@ -23,7 +23,7 @@
 
 	update_icon()
 		if(health <= 0)
-			playsound(src.loc, 'splat.ogg', 50, 1)
+			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
 			del(src)
 			return
 		return

code/game/gamemodes/blob/blobs/factory.dm

@@ -11,7 +11,7 @@
 
 	update_icon()
 		if(health <= 0)
-			playsound(src.loc, 'splat.ogg', 50, 1)
+			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
 			del(src)
 			return
 		return

code/game/gamemodes/blob/blobs/node.dm

@@ -23,7 +23,7 @@
 
 	update_icon()
 		if(health <= 0)
-			playsound(src.loc, 'splat.ogg', 50, 1)
+			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
 			del(src)
 			return
 		return

code/game/gamemodes/blob/blobs/shield.dm

@@ -13,7 +13,7 @@
 
 	update_icon()
 		if(health <= 0)
-			playsound(src.loc, 'splat.ogg', 50, 1)
+			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
 			del(src)
 			return
 		return

code/game/gamemodes/blob/theblob.dm

@@ -133,7 +133,7 @@
 
 	update_icon()//Needs to be updated with the types
 		if(health <= 0)
-			playsound(src.loc, 'splat.ogg', 50, 1)
+			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
 			del(src)
 			return
 		if(health <= 15)
@@ -157,14 +157,14 @@
 
 
 	attackby(var/obj/item/weapon/W, var/mob/user)
-		playsound(src.loc, 'attackblob.ogg', 50, 1)
+		playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
 		src.visible_message("\red <B>The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]")
 		var/damage = 0
 		switch(W.damtype)
 			if("fire")
 				damage = (W.force / max(src.fire_resist,1))
 				if(istype(W, /obj/item/weapon/weldingtool))
-					playsound(src.loc, 'Welder.ogg', 100, 1)
+					playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
 			if("brute")
 				damage = (W.force / max(src.brute_resist,1))
 

code/game/gamemodes/events.dm

@@ -28,7 +28,7 @@
 	switch(pick(eventNumbersToPickFrom))
 		if(1)
 			command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
-			world << sound('meteors.ogg')
+			world << sound('sound/AI/meteors.ogg')
 			spawn(100)
 				meteor_wave()
 				spawn_meteors()
@@ -38,7 +38,7 @@
 
 		if(2)
 			command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('granomalies.ogg')
+			world << sound('sound/AI/granomalies.ogg')
 			var/turf/T = pick(blobstart)
 			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
 			spawn(rand(50, 300))
@@ -46,7 +46,7 @@
 		/*
 		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
 			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('spanomalies.ogg')
+			world << sound('sound/AI/spanomalies.ogg')
 			var/list/turfs = new
 			var/turf/picked
 			for(var/turf/simulated/floor/T in world)
@@ -95,7 +95,7 @@
 
 /proc/power_failure()
 	command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure")
-	world << sound('poweroff.ogg')
+	world << sound('sound/AI/poweroff.ogg')
 	for(var/obj/machinery/power/smes/S in world)
 		if(istype(get_area(S), /area/turret_protected) || S.z != 1)
 			continue
@@ -143,7 +143,7 @@
 /proc/power_restore()
 
 	command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal")
-	world << sound('poweron.ogg')
+	world << sound('sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/apc/C in world)
 		if(C.cell && C.z == 1)
 			C.cell.charge = C.cell.maxcharge
@@ -165,7 +165,7 @@
 /proc/power_restore_quick()
 
 	command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal")
-	world << sound('poweron.ogg')
+	world << sound('sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/smes/S in world)
 		if(S.z != 1)
 			continue
@@ -191,7 +191,7 @@
 
 /proc/viral_outbreak(var/virus = null)
 //	command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-//	world << sound('outbreak7.ogg')
+//	world << sound('sound/AI/outbreak7.ogg')
 	var/virus_type
 	if(!virus)
 		virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat)
@@ -246,11 +246,11 @@
 			break
 	spawn(rand(1500, 3000)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-		world << sound('outbreak7.ogg')
+		world << sound('sound/AI/outbreak7.ogg')
 
 /proc/alien_infestation(var/spawncount = 1) // -- TLE
 	//command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
-	//world << sound('aliens.ogg')
+	//world << sound('sound/AI/aliens.ogg')
 	var/list/vents = list()
 	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
 		if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network)
@@ -279,7 +279,7 @@
 
 	spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
-		world << sound('aliens.ogg')
+		world << sound('sound/AI/aliens.ogg')
 
 /proc/high_radiation_event()
 
@@ -306,7 +306,7 @@
 		M.apply_effect((rand(15,75)),IRRADIATE,0)
 	sleep(100)
 	command_alert("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert")
-	world << sound('radiation.ogg')
+	world << sound('sound/AI/radiation.ogg')
 
 
 
@@ -360,7 +360,7 @@
 	//sleep(100)
 	spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
-		world << sound('commandreport.ogg')
+		world << sound('sound/AI/commandreport.ogg')
 
 /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights
 	if(isEvent)

code/game/gamemodes/events/dust.dm

@@ -96,7 +96,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 					if(!M.stat && !istype(M, /mob/living/silicon/ai))
 						shake_camera(M, 3, 1)
 			if (A)
-				playsound(src.loc, 'meteorimpact.ogg', 40, 1)
+				playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
 
 				if(ismob(A))
 					A.meteorhit(src)//This should work for now I guess

code/game/gamemodes/events/miniblob.dm

@@ -13,7 +13,7 @@
 		blobevent = 0
 	spawn(rand(1000, 2000)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-		world << sound('outbreak5.ogg')
+		world << sound('sound/AI/outbreak5.ogg')
 
 /proc/dotheblobbaby()
 	if (blobevent)

code/game/gamemodes/events/ninja_abilities.dm

@@ -60,7 +60,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 		var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread()
 		smoke.set_up(10, 0, U.loc)
 		smoke.start()
-		playsound(U.loc, 'bamf.ogg', 50, 2)
+		playsound(U.loc, 'sound/effects/bamf.ogg', 50, 2)
 		s_bombs--
 		s_coold = 1
 	return
@@ -88,7 +88,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 
 			spawn(0)
 				spark_system.start()
-				playsound(U.loc, 'phasein.ogg', 25, 1)
+				playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
 				playsound(U.loc, "sparks", 50, 1)
 				anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
 
@@ -114,7 +114,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 		var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
 		if((!T.density)&&istype(mobloc, /turf))
 			spawn(0)
-				playsound(U.loc, 'sparks4.ogg', 50, 1)
+				playsound(U.loc, 'sound/effects/sparks4.ogg', 50, 1)
 				anim(mobloc,src,'icons/mob/mob.dmi',,"phaseout",,U.dir)
 
 			handle_teleport_grab(T, U)
@@ -122,8 +122,8 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 
 			spawn(0)
 				spark_system.start()
-				playsound(U.loc, 'phasein.ogg', 25, 1)
+				playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
-				playsound(U.loc, 'sparks2.ogg', 50, 1)
+				playsound(U.loc, 'sound/effects/sparks2.ogg', 50, 1)
 				anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
 
 			spawn(0)//Any living mobs in teleport area are gibbed.
@@ -145,7 +145,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 	var/C = 250
 	if(!ninjacost(C,1))
 		var/mob/living/carbon/human/U = affecting
-		playsound(U.loc, 'EMPulse.ogg', 60, 2)
+		playsound(U.loc, 'sound/effects/EMPulse.ogg', 60, 2)
 		empulse(U, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
 		s_coold = 2
 		cell.charge-=(C*10)
@@ -344,7 +344,7 @@ Or otherwise known as anime mode. Which also happens to be ridiculously powerful
 
 			spawn(0)
 				spark_system.start()
-				playsound(U.loc, 'phasein.ogg', 25, 1)
+				playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
 				playsound(U.loc, "sparks", 50, 1)
 				anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
 			s_coold = 1
@@ -418,7 +418,7 @@ This is so anime it hurts. But that's the point.*/
 
 				spawn(0)
 					spark_system.start()
-					playsound(U.loc, 'phasein.ogg', 25, 1)
+					playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
 					playsound(U.loc, "sparks", 50, 1)
 					anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
 				s_coold = 1

code/game/gamemodes/events/ninja_equipment.dm

@@ -537,7 +537,7 @@ ________________________________________________________________________________
 				return
 			P.tnote += "<i><b>&larr; From [!s_control?(A):"an unknown source"]:</b></i><br>[t]<br>"
 			if (!P.silent)
-				playsound(P.loc, 'twobeep.ogg', 50, 1)
+				playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
 				for (var/mob/O in hearers(3, P.loc))
 					O.show_message(text("\icon[P] *[P.ttone]*"))
 			P.overlays = null
@@ -1358,7 +1358,7 @@ It is possible to destroy the net by the occupant or someone else.
 				M.drop_from_inventory(W)
 
 			spawn(0)
-				playsound(M.loc, 'sparks4.ogg', 50, 1)
+				playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
 				anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
 
 			M.loc = pick(holdingfacility)//Throw mob in to the holding facility.
@@ -1368,8 +1368,8 @@ It is possible to destroy the net by the occupant or someone else.
 				var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 				spark_system.set_up(5, 0, M.loc)
 				spark_system.start()
-				playsound(M.loc, 'phasein.ogg', 25, 1)
+				playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1)
-				playsound(M.loc, 'sparks2.ogg', 50, 1)
+				playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
 				anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
 				del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
 
@@ -1420,7 +1420,7 @@ It is possible to destroy the net by the occupant or someone else.
 			tforce = 10
 		else
 			tforce = AM:throwforce
-		playsound(src.loc, 'slash.ogg', 80, 1)
+		playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1)
 		health = max(0, health - tforce)
 		healthcheck()
 		..()
@@ -1444,7 +1444,7 @@ It is possible to destroy the net by the occupant or someone else.
 		usr << text("\green You claw at the net.")
 		for(var/mob/O in oviewers(src))
 			O.show_message(text("\red [] claws at the energy net!", usr), 1)
-		playsound(src.loc, 'slash.ogg', 80, 1)
+		playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1)
 		health -= rand(10, 20)
 		if(health <= 0)
 			usr << text("\green You slice the energy net to pieces.")

code/game/gamemodes/events/space_ninja.dm

@@ -593,7 +593,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 /mob/proc/NinjaStealthMalf()
 	invisibility = 0//Set ninja invis to 0.
 	overlays += image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = layer+0.9)
-	playsound(loc, 'stealthoff.ogg', 75, 1)
+	playsound(loc, 'sound/effects/stealthoff.ogg', 75, 1)
 
 //=======//GENERIC VERB MODIFIERS//=======//
 

code/game/gamemodes/events/wormholes.dm

@@ -8,7 +8,7 @@
 		if(pick_turfs.len)
 			//All ready. Announce that bad juju is afoot.
 			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('spanomalies.ogg')
+			world << sound('sound/AI/spanomalies.ogg')
 
 			//prob(20) can be approximated to 1 wormhole every 5 turfs!
 			//admittedly less random but totally worth it >_<

code/game/gamemodes/game_mode.dm

@@ -227,7 +227,7 @@ Whitespace:Seperator;
 			comm.messagetext.Add(intercepttext)
 
 	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
-	world << sound('intercept.ogg')
+	world << sound('sound/AI/intercept.ogg')
 	if(security_level < SEC_LEVEL_BLUE)
 		set_security_level(SEC_LEVEL_BLUE)
 

code/game/gamemodes/gameticker.dm

@@ -37,7 +37,7 @@ var/global/datum/controller/gameticker/ticker
 	var/triai = 0//Global holder for Triumvirate
 
 /datum/controller/gameticker/proc/pregame()
-	login_music = pick('title2.ogg') // choose title music!
+	login_music = pick('sound/ambience/title2.ogg') // choose title music!
 
 	do
 		pregame_timeleft = 90
@@ -116,7 +116,7 @@ var/global/datum/controller/gameticker/ticker
 			if (S.name != "AI")
 				del(S)
 		world << "<FONT color='blue'><B>Enjoy the game!</B></FONT>"
-//		world << sound('welcome.ogg') // Skie
+//		world << sound('sound/AI/welcome.ogg') // Skie
 		//Holiday Round-start stuff	~Carn
 		Holiday_Game_Start()
 
@@ -187,19 +187,19 @@ var/global/datum/controller/gameticker/ticker
 					if("nuclear emergency") //Nuke wasn't on station when it blew up
 						flick("intro_nuke",cinematic)
 						sleep(35)
-						world << sound('explosionfar.ogg')
+						world << sound('sound/effects/explosionfar.ogg')
 						flick("station_intact_fade_red",cinematic)
 						cinematic.icon_state = "summary_nukefail"
 					else
 						flick("intro_nuke",cinematic)
 						sleep(35)
-						world << sound('explosionfar.ogg')
+						world << sound('sound/effects/explosionfar.ogg')
 						//flick("end",cinematic)
 
 
 			if(2)	//nuke was nowhere nearby	//TODO: a really distant explosion animation
 				sleep(50)
-				world << sound('explosionfar.ogg')
+				world << sound('sound/effects/explosionfar.ogg')
 
 
 			else	//station was destroyed
@@ -210,25 +210,25 @@ var/global/datum/controller/gameticker/ticker
 						flick("intro_nuke",cinematic)
 						sleep(35)
 						flick("station_explode_fade_red",cinematic)
-						world << sound('explosionfar.ogg')
+						world << sound('sound/effects/explosionfar.ogg')
 						cinematic.icon_state = "summary_nukewin"
 					if("AI malfunction") //Malf (screen,explosion,summary)
 						flick("intro_malf",cinematic)
 						sleep(76)
 						flick("station_explode_fade_red",cinematic)
-						world << sound('explosionfar.ogg')
+						world << sound('sound/effects/explosionfar.ogg')
 						cinematic.icon_state = "summary_malf"
 					if("blob") //Station nuked (nuke,explosion,summary)
 						flick("intro_nuke",cinematic)
 						sleep(35)
 						flick("station_explode_fade_red",cinematic)
-						world << sound('explosionfar.ogg')
+						world << sound('sound/effects/explosionfar.ogg')
 						cinematic.icon_state = "summary_selfdes"
 					else //Station nuked (nuke,explosion,summary)
 						flick("intro_nuke",cinematic)
 						sleep(35)
 						flick("station_explode_fade_red", cinematic)
-						world << sound('explosionfar.ogg')
+						world << sound('sound/effects/explosionfar.ogg')
 						cinematic.icon_state = "summary_selfdes"
 
 		//If its actually the end of the round, wait for it to end.

code/game/gamemodes/malfunction/malfunction.dm

@@ -165,7 +165,7 @@
 	ticker.mode:malf_mode_declared = 1
 	for(var/datum/mind/AI_mind in ticker.mode:malf_ai)
 		AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover
-	world << sound('aimalf.ogg')
+	world << sound('sound/AI/aimalf.ogg')
 
 
 /datum/game_mode/malfunction/proc/ai_win()
@@ -179,7 +179,7 @@
 		AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/ai_win
 	ticker.mode:explosion_in_progress = 1
 	for(var/mob/M in player_list)
-		M << 'Alarm.ogg'
+		M << 'sound/machines/Alarm.ogg'
 	world << "Self-destructing in 10"
 	for (var/i=9 to 1 step -1)
 		sleep(10)

code/game/gamemodes/meteor/meteors.dm

@@ -109,7 +109,7 @@
 				shake_camera(M, 3, 1)
 		if (A)
 			A.meteorhit(src)
-			playsound(src.loc, 'meteorimpact.ogg', 40, 1)
+			playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
 		if (--src.hits <= 0)
 
 			//Prevent meteors from blowing up the singularity's containment.
@@ -151,7 +151,7 @@
 					shake_camera(M, 3, 1)
 			if (A)
 				explosion(src.loc, 0, 1, 2, 3, 0)
-				playsound(src.loc, 'meteorimpact.ogg', 40, 1)
+				playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
 			if (--src.hits <= 0)
 				if(prob(15) && !istype(A, /obj/structure/grille))
 					explosion(src.loc, 1, 2, 3, 4, 0)

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -167,7 +167,7 @@
 	src.yes_code = 0
 	src.safety = 1
 	src.icon_state = "nuclearbomb3"
-	playsound(src,'Alarm.ogg',100,0,5)
+	playsound(src,'sound/machines/Alarm.ogg',100,0,5)
 	if (ticker && ticker.mode)
 		ticker.mode.explosion_in_progress = 1
 	sleep(100)

code/game/gamemodes/nuclear/pinpointer.dm

@@ -200,7 +200,7 @@
 	if(bomb_set)//If the bomb is set, lead to the shuttle
 		mode = 1//Ensures worklocation() continues to work
 		worklocation()
-		playsound(src.loc, 'twobeep.ogg', 50, 1)//Plays a beep
+		playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1)//Plays a beep
 		for (var/mob/O in hearers(1, src.loc))
 			O.show_message(text("Shuttle Locator active."))//Lets the mob holding it know that the mode has changed
 		return//Get outta here
@@ -233,7 +233,7 @@
 	if(!bomb_set)
 		mode = 0
 		workdisk()
-		playsound(src.loc, 'twobeep.ogg', 50, 1)
+		playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1)
 		for (var/mob/O in hearers(2, src.loc))
 			O.show_message(text("Authentication Disk Locator active."))
 	if(!home)

code/game/machinery/alarm.dm

@@ -1158,7 +1158,7 @@ table tr:first-child th:first-child { border: none;}
 		return
 	for(var/area/RA in A.related)
 		RA.firealert()
-	//playsound(src.loc, 'signal.ogg', 75, 0)
+	//playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0)
 	return
 
 /obj/machinery/partyalarm/attack_paw(mob/user as mob)

code/game/machinery/atmo_control.dm

@@ -97,7 +97,7 @@ obj/machinery/computer/general_air_control
 
 	attackby(I as obj, user as mob)
 		if(istype(I, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				if (src.stat & BROKEN)
 					user << "\blue The broken glass falls out."
@@ -296,7 +296,7 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 
 		attackby(I as obj, user as mob)
 			if(istype(I, /obj/item/weapon/screwdriver))
-				playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				if(do_after(user, 20))
 					if (src.stat & BROKEN)
 						user << "\blue The broken glass falls out."

code/game/machinery/atmoalter/area_atmos_computer.dm

@@ -49,7 +49,7 @@
 
 	attackby(I as obj, user as mob)
 		if(istype(I, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				var/obj/item/weapon/circuitboard/area_atmos/M = new /obj/item/weapon/circuitboard/area_atmos( A )

code/game/machinery/atmoalter/canister.dm

@@ -89,7 +89,7 @@
 		location.assume_air(air_contents)
 
 		src.destroyed = 1
-		playsound(src.loc, 'spray.ogg', 10, 1, -3)
+		playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3)
 		src.density = 0
 		update_icon()
 

code/game/machinery/atmoalter/meter.dm

@@ -97,7 +97,7 @@
 /obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
-	playsound(src.loc, 'Ratchet.ogg', 50, 1)
+	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	user << "\blue You begin to unfasten \the [src]..."
 	if (do_after(user, 40))
 		user.visible_message( \

code/game/machinery/autolathe.dm

@@ -146,7 +146,7 @@ var/global/list/autolathe_recipes_hidden = list( \
 			return 1
 		if (opened)
 			if(istype(O, /obj/item/weapon/crowbar))
-				playsound(src.loc, 'Crowbar.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 				var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
 				M.state = 2
 				M.icon_state = "box_1"

code/game/machinery/biogenerator.dm

@@ -139,7 +139,7 @@
 		processing = 1
 		update_icon()
 		updateUsrDialog()
-		playsound(src.loc, 'blender.ogg', 50, 1)
+		playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
 		use_power(S*30)
 		sleep(S+15)
 		processing = 0

code/game/machinery/bots/bots.dm

@@ -51,7 +51,7 @@
 	*/
 	src.health -= rand(15,30)*brute_dam_coeff
 	src.visible_message("\red <B>[user] has slashed [src]!</B>")
-	playsound(src.loc, 'slice.ogg', 25, 1, -1)
+	playsound(src.loc, 'sound/weapons/slice.ogg', 25, 1, -1)
 	if(prob(10))
 		new /obj/effect/decal/cleanable/oil(src.loc)
 	healthcheck()

code/game/machinery/bots/ed209bot.dm

@@ -268,7 +268,7 @@ Auto Patrol: []"},
 
 			if (target)		// make sure target exists
 				if (get_dist(src, src.target) <= 1)		// if right next to perp
-					playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
+					playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
 					src.icon_state = "[lasercolor]ed209-c"
 					spawn(2)
 						src.icon_state = "[lasercolor]ed209[src.on]"
@@ -317,7 +317,7 @@ Auto Patrol: []"},
 				return
 
 			if (!src.target.handcuffed && !src.arrest_type)
-				playsound(src.loc, 'handcuffs.ogg', 30, 1, -2)
+				playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
 				mode = SECBOT_ARREST
 				for(var/mob/O in viewers(src, null))
 					O.show_message("\red <B>[src] is trying to put handcuffs on [src.target]!</B>", 1)
@@ -337,7 +337,7 @@ Auto Patrol: []"},
 						src.last_found = world.time
 						src.frustration = 0
 
-	//					playsound(src.loc, pick('bgod.ogg', 'biamthelaw.ogg', 'bsecureday.ogg', 'bradio.ogg', 'binsult.ogg', 'bcreep.ogg'), 50, 0)
+	//					playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
 	//					var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.")
 	//					src.speak(arrest_message)
 
@@ -639,7 +639,7 @@ Auto Patrol: []"},
 			src.oldtarget_name = C.name
 			src.speak("Level [src.threatlevel] infraction alert!")
 			if(!src.lasercolor)
-				playsound(src.loc, pick('ed209_20sec.ogg', 'EDPlaceholder.ogg'), 50, 0)
+				playsound(src.loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0)
 			src.visible_message("<b>[src]</b> points at [C.name]!")
 			mode = SECBOT_HUNT
 			spawn(0)
@@ -990,7 +990,7 @@ Auto Patrol: []"},
 
 		if(8)
 			if( istype(W, /obj/item/weapon/screwdriver) )
-				playsound(src.loc, 'Screwdriver.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				var/turf/T = get_turf(user)
 				user << "<span class='notice'>Now attaching the gun to the frame...</span>"
 				sleep(40)

code/game/machinery/bots/mulebot.dm

@@ -127,7 +127,7 @@
 		locked = !locked
 		user << "\blue You [locked ? "lock" : "unlock"] the mulebot's controls!"
 		flick("mulebot-emagged", src)
-		playsound(src.loc, 'sparks1.ogg', 100, 0)
+		playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0)
 	else if(istype(I,/obj/item/weapon/cell) && open && !cell)
 		var/obj/item/weapon/cell/C = I
 		user.drop_item()
@@ -465,7 +465,7 @@
 /obj/machinery/bot/mulebot/proc/load(var/atom/movable/C)
 	if((wires & wire_loadcheck) && !istype(C,/obj/structure/closet/crate))
 		src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
-		playsound(src.loc, 'buzz-sigh.ogg', 50, 0)
+		playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
 		return		// if not emagged, only allow crates to be loaded
 
 	//I'm sure someone will come along and ask why this is here... well people were dragging screen items onto the mule, and that was not cool.
@@ -655,25 +655,25 @@
 						mode = 4
 						if(blockcount == 3)
 							src.visible_message("[src] makes an annoyed buzzing sound", "You hear an electronic buzzing sound.")
-							playsound(src.loc, 'buzz-two.ogg', 50, 0)
+							playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
 
 						if(blockcount > 5)	// attempt 5 times before recomputing
 							// find new path excluding blocked turf
 							src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
-							playsound(src.loc, 'buzz-sigh.ogg', 50, 0)
+							playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
 
 							spawn(2)
 								calc_path(next)
 								if(path.len > 0)
 									src.visible_message("[src] makes a delighted ping!", "You hear a ping.")
-									playsound(src.loc, 'ping.ogg', 50, 0)
+									playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
 								mode = 4
 							mode =6
 							return
 						return
 				else
 					src.visible_message("[src] makes an annoyed buzzing sound", "You hear an electronic buzzing sound.")
-					playsound(src.loc, 'buzz-two.ogg', 50, 0)
+					playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
 					//world << "Bad turf."
 					mode = 5
 					return
@@ -693,11 +693,11 @@
 					blockcount = 0
 					mode = 4
 					src.visible_message("[src] makes a delighted ping!", "You hear a ping.")
-					playsound(src.loc, 'ping.ogg', 50, 0)
+					playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
 
 				else
 					src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
-					playsound(src.loc, 'buzz-sigh.ogg', 50, 0)
+					playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
 
 					mode = 7
 		//if(6)
@@ -743,7 +743,7 @@
 /obj/machinery/bot/mulebot/proc/at_target()
 	if(!reached_target)
 		src.visible_message("[src] makes a chiming sound!", "You hear a chime.")
-		playsound(src.loc, 'chime.ogg', 50, 0)
+		playsound(src.loc, 'sound/machines/chime.ogg', 50, 0)
 		reached_target = 1
 
 		if(load)		// if loaded, unload at target
@@ -797,7 +797,7 @@
 // when mulebot is in the same loc
 /obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H)
 	src.visible_message("\red [src] drives over [H]!")
-	playsound(src.loc, 'splat.ogg', 50, 1)
+	playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
 
 	var/damage = rand(5,15)
 	H.apply_damage(2*damage, BRUTE, "head")

code/game/machinery/bots/secbot.dm

@@ -216,7 +216,7 @@ Auto Patrol: []"},
 
 			if(target)		// make sure target exists
 				if(get_dist(src, src.target) <= 1)		// if right next to perp
-					playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
+					playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
 					src.icon_state = "secbot-c"
 					spawn(2)
 						src.icon_state = "secbot[src.on]"
@@ -259,7 +259,7 @@ Auto Patrol: []"},
 				return
 
 			if(!src.target.handcuffed && !src.arrest_type)
-				playsound(src.loc, 'handcuffs.ogg', 30, 1, -2)
+				playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
 				mode = SECBOT_ARREST
 				for(var/mob/O in viewers(src, null))
 					O.show_message("\red <B>[src] is trying to put handcuffs on [src.target]!</B>", 1)
@@ -279,7 +279,7 @@ Auto Patrol: []"},
 						src.last_found = world.time
 						src.frustration = 0
 
-						playsound(src.loc, pick('bgod.ogg', 'biamthelaw.ogg', 'bsecureday.ogg', 'bradio.ogg', 'binsult.ogg', 'bcreep.ogg'), 50, 0)
+						playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
 	//					var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.")
 	//					src.speak(arrest_message)
 
@@ -571,7 +571,7 @@ Auto Patrol: []"},
 			src.target = C
 			src.oldtarget_name = C.name
 			src.speak("Level [src.threatlevel] infraction alert!")
-			playsound(src.loc, pick('bcriminal.ogg', 'bjustice.ogg', 'bfreeze.ogg'), 50, 0)
+			playsound(src.loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
 			src.visible_message("<b>[src]</b> points at [C.name]!")
 			mode = SECBOT_HUNT
 			spawn(0)

code/game/machinery/camera.dm

@@ -276,7 +276,7 @@ var/global/list/obj/machinery/camera/Cameras = list()
 	status = 0
 	for(var/mob/O in viewers(user, null))
 		O.show_message("<span class='warning'>\The [user] slashes at [src]!</span>", 1)
-		playsound(src.loc, 'slash.ogg', 100, 1)
+		playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
 	icon_state = "camera1"
 	add_hiddenprint(user)
 	deactivate(user,0)
@@ -343,7 +343,7 @@ var/global/list/obj/machinery/camera/Cameras = list()
 		var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 		spark_system.set_up(5, 0, loc)
 		spark_system.start()
-		playsound(loc, 'blade1.ogg', 50, 1)
+		playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
 		playsound(loc, "sparks", 50, 1)
 
 		var/obj/item/weapon/grenade/chem_grenade/case = new /obj/item/weapon/grenade/chem_grenade(loc)
@@ -369,13 +369,13 @@ var/global/list/obj/machinery/camera/Cameras = list()
 		if (!(src.status))
 			for(var/mob/O in viewers(user, null))
 				O.show_message(text("\red [] has deactivated []!", user, src), 1)
-				playsound(src.loc, 'Wirecutter.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
 			icon_state = "camera1"
 			add_hiddenprint(user)
 		else
 			for(var/mob/O in viewers(user, null))
 				O.show_message(text("\red [] has reactivated []!", user, src), 1)
-				playsound(src.loc, 'Wirecutter.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
 			icon_state = "camera"
 			add_hiddenprint(user)
 	// now disconnect anyone using the camera

code/game/machinery/cell_charger.dm

@@ -66,7 +66,7 @@
 
 			anchored = !anchored
 			user << "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground"
-			playsound(src.loc, 'Ratchet.ogg', 75, 1)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 
 	attack_hand(mob/user)
 		if(charging)

code/game/machinery/computer/HolodeckControl.dm

@@ -127,7 +127,7 @@
 //Warning, uncommenting this can have concequences. For example, deconstructing the computer may cause holographic eswords to never derez
 
 /*		if(istype(D, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				if (src.stat & BROKEN)
 					user << "\blue The broken glass falls out."
@@ -155,7 +155,7 @@
 
 */
 	if(istype(D, /obj/item/weapon/card/emag) && !emagged)
-		playsound(src.loc, 'sparks4.ogg', 75, 1)
+		playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
 		emagged = 1
 		user << "\blue You vastly increase projector power and override the safety and security protocols."
 		user << "Warning.  Automatic shutoff and derezing protocols have been corrupted.  Please call Nanotrasen maintenance and do not use the simulator."
@@ -477,13 +477,13 @@
 		force = 30
 		icon_state = "sword[color]"
 		w_class = 4
-		playsound(user, 'saberon.ogg', 50, 1)
+		playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 		user << "\blue [src] is now active."
 	else
 		force = 3
 		icon_state = "sword0"
 		w_class = 2
-		playsound(user, 'saberoff.ogg', 50, 1)
+		playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 		user << "\blue [src] can now be concealed."
 	add_fingerprint(user)
 	return

code/game/machinery/computer/ai_core.dm

@@ -14,7 +14,7 @@
 	switch(state)
 		if(0)
 			if(istype(P, /obj/item/weapon/wrench))
-				playsound(loc, 'Ratchet.ogg', 50, 1)
+				playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 				if(do_after(user, 20))
 					user << "\blue You wrench the frame into place."
 					anchored = 1
@@ -24,7 +24,7 @@
 				if(!WT.isOn())
 					user << "The welder must be on for this task."
 					return
-				playsound(loc, 'Welder.ogg', 50, 1)
+				playsound(loc, 'sound/items/Welder.ogg', 50, 1)
 				if(do_after(user, 20))
 					if(!src || !WT.remove_fuel(0, user)) return
 					user << "\blue You deconstruct the frame."
@@ -32,25 +32,25 @@
 					del(src)
 		if(1)
 			if(istype(P, /obj/item/weapon/wrench))
-				playsound(loc, 'Ratchet.ogg', 50, 1)
+				playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 				if(do_after(user, 20))
 					user << "\blue You unfasten the frame."
 					anchored = 0
 					state = 0
 			if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit)
-				playsound(loc, 'Deconstruct.ogg', 50, 1)
+				playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 				user << "\blue You place the circuit board inside the frame."
 				icon_state = "1"
 				circuit = P
 				user.drop_item()
 				P.loc = src
 			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
-				playsound(loc, 'Screwdriver.ogg', 50, 1)
+				playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				user << "\blue You screw the circuit board into place."
 				state = 2
 				icon_state = "2"
 			if(istype(P, /obj/item/weapon/crowbar) && circuit)
-				playsound(loc, 'Crowbar.ogg', 50, 1)
+				playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
 				user << "\blue You remove the circuit board."
 				state = 1
 				icon_state = "0"
@@ -58,13 +58,13 @@
 				circuit = null
 		if(2)
 			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
-				playsound(loc, 'Screwdriver.ogg', 50, 1)
+				playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				user << "\blue You unfasten the circuit board."
 				state = 1
 				icon_state = "1"
 			if(istype(P, /obj/item/weapon/cable_coil))
 				if(P:amount >= 5)
-					playsound(loc, 'Deconstruct.ogg', 50, 1)
+					playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					if(do_after(user, 20))
 						P:amount -= 5
 						if(!P:amount) del(P)
@@ -76,7 +76,7 @@
 				if (brain)
 					user << "Get that brain out of there first"
 				else
-					playsound(loc, 'wirecutter.ogg', 50, 1)
+					playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
 					user << "\blue You remove the cables."
 					state = 2
 					icon_state = "2"
@@ -85,7 +85,7 @@
 
 			if(istype(P, /obj/item/stack/sheet/rglass))
 				if(P:amount >= 2)
-					playsound(loc, 'Deconstruct.ogg', 50, 1)
+					playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					if(do_after(user, 20))
 						if (P)
 							P:amount -= 2
@@ -133,7 +133,7 @@
 				icon_state = "3b"
 
 			if(istype(P, /obj/item/weapon/crowbar) && brain)
-				playsound(loc, 'Crowbar.ogg', 50, 1)
+				playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
 				user << "\blue You remove the brain."
 				brain.loc = loc
 				brain = null
@@ -141,7 +141,7 @@
 
 		if(4)
 			if(istype(P, /obj/item/weapon/crowbar))
-				playsound(loc, 'Crowbar.ogg', 50, 1)
+				playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
 				user << "\blue You remove the glass panel."
 				state = 3
 				if (brain)
@@ -152,7 +152,7 @@
 				return
 
 			if(istype(P, /obj/item/weapon/screwdriver))
-				playsound(loc, 'Screwdriver.ogg', 50, 1)
+				playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				user << "\blue You connect the monitor."
 				new /mob/living/silicon/ai ( loc, laws, brain )
 				feedback_inc("cyborg_ais_created",1)

code/game/machinery/computer/aifixer.dm

@@ -13,7 +13,7 @@
 /obj/machinery/computer/aifixer/attackby(I as obj, user as mob)
 /*
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			if (src.stat & BROKEN)
 				user << "\blue The broken glass falls out."

code/game/machinery/computer/arcade.dm

@@ -250,7 +250,7 @@
 
 		src.updateUsrDialog()
 	else if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 			var/obj/item/weapon/circuitboard/arcade/M = new /obj/item/weapon/circuitboard/arcade( A )

code/game/machinery/computer/atmos_alert.dm

@@ -108,7 +108,7 @@
 
 	attackby(I as obj, user as mob)
 		if(istype(I, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				var/obj/item/weapon/circuitboard/atmos_alert/M = new /obj/item/weapon/circuitboard/atmos_alert( A )

code/game/machinery/computer/buildandrepair.dm

@@ -244,7 +244,7 @@
 	switch(state)
 		if(0)
 			if(istype(P, /obj/item/weapon/wrench))
-				playsound(src.loc, 'Ratchet.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 				if(do_after(user, 20))
 					user << "\blue You wrench the frame into place."
 					src.anchored = 1
@@ -254,7 +254,7 @@
 				if(!WT.remove_fuel(0, user))
 					user << "The welding tool must be on to complete this task."
 					return
-				playsound(src.loc, 'Welder.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
 				if(do_after(user, 20))
 					if(!src || !WT.isOn()) return
 					user << "\blue You deconstruct the frame."
@@ -262,7 +262,7 @@
 					del(src)
 		if(1)
 			if(istype(P, /obj/item/weapon/wrench))
-				playsound(src.loc, 'Ratchet.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 				if(do_after(user, 20))
 					user << "\blue You unfasten the frame."
 					src.anchored = 0
@@ -270,7 +270,7 @@
 			if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
 				var/obj/item/weapon/circuitboard/B = P
 				if(B.board_type == "computer")
-					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					user << "\blue You place the circuit board inside the frame."
 					src.icon_state = "1"
 					src.circuit = P
@@ -279,12 +279,12 @@
 				else
 					user << "\red This frame does not accept circuit boards of this type!"
 			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
-				playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				user << "\blue You screw the circuit board into place."
 				src.state = 2
 				src.icon_state = "2"
 			if(istype(P, /obj/item/weapon/crowbar) && circuit)
-				playsound(src.loc, 'Crowbar.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 				user << "\blue You remove the circuit board."
 				src.state = 1
 				src.icon_state = "0"
@@ -292,13 +292,13 @@
 				src.circuit = null
 		if(2)
 			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
-				playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				user << "\blue You unfasten the circuit board."
 				src.state = 1
 				src.icon_state = "1"
 			if(istype(P, /obj/item/weapon/cable_coil))
 				if(P:amount >= 5)
-					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					if(do_after(user, 20))
 						if(P)
 							P:amount -= 5
@@ -308,7 +308,7 @@
 							src.icon_state = "3"
 		if(3)
 			if(istype(P, /obj/item/weapon/wirecutters))
-				playsound(src.loc, 'wirecutter.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
 				user << "\blue You remove the cables."
 				src.state = 2
 				src.icon_state = "2"
@@ -317,7 +317,7 @@
 
 			if(istype(P, /obj/item/stack/sheet/glass))
 				if(P:amount >= 2)
-					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					if(do_after(user, 20))
 						if(P)
 							P:use(2)
@@ -326,13 +326,13 @@
 							src.icon_state = "4"
 		if(4)
 			if(istype(P, /obj/item/weapon/crowbar))
-				playsound(src.loc, 'Crowbar.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 				user << "\blue You remove the glass panel."
 				src.state = 3
 				src.icon_state = "3"
 				new /obj/item/stack/sheet/glass( src.loc, 2 )
 			if(istype(P, /obj/item/weapon/screwdriver))
-				playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				user << "\blue You connect the monitor."
 				var/B = new src.circuit.build_path ( src.loc )
 				if(circuit.powernet) B:powernet = circuit.powernet

code/game/machinery/computer/cloning.dm

@@ -40,7 +40,7 @@
 
 /obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			if (src.stat & BROKEN)
 				user << "\blue The broken glass falls out."

code/game/machinery/computer/communications.dm

@@ -468,7 +468,7 @@
 	log_game("[key_name(user)] has called the shuttle.")
 	message_admins("[key_name_admin(user)] has called the shuttle.", 1)
 	captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
-	world << sound('shuttlecalled.ogg')
+	world << sound('sound/AI/shuttlecalled.ogg')
 
 	return
 
@@ -527,7 +527,7 @@
 	log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
 	message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
 	captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
-	world << sound('shuttlecalled.ogg')
+	world << sound('sound/AI/shuttlecalled.ogg')
 
 	..()
 
@@ -552,6 +552,6 @@
 	log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
 	message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
 	captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
-	world << sound('shuttlecalled.ogg')
+	world << sound('sound/AI/shuttlecalled.ogg')
 
 	..()

code/game/machinery/computer/computer.dm

@@ -102,7 +102,7 @@
 
 	attackby(I as obj, user as mob)
 		if(istype(I, /obj/item/weapon/screwdriver) && circuit)
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 				var/obj/item/weapon/circuitboard/M = new circuit( A )

code/game/machinery/computer/message.dm

@@ -445,7 +445,7 @@
 							src.linkedServer.send_pda_message("[customrecepient.owner]", "[customsender]","[custommessage]")
 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[src]'>[customsender]</a> ([customjob]):</b></i><br>[custommessage]<br>"
 							if (!customrecepient.silent)
-								playsound(customrecepient.loc, 'twobeep.ogg', 50, 1)
+								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
 								for (var/mob/O in hearers(3, customrecepient.loc))
 									O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*"))
 								if( customrecepient.loc && ishuman(customrecepient.loc) )
@@ -459,7 +459,7 @@
 							src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]")
 							customrecepient.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[customrecepient];choice=Message;target=\ref[PDARec]'>[PDARec.owner]</a> ([customjob]):</b></i><br>[custommessage]<br>"
 							if (!customrecepient.silent)
-								playsound(customrecepient.loc, 'twobeep.ogg', 50, 1)
+								playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1)
 								for (var/mob/O in hearers(3, customrecepient.loc))
 									O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*"))
 								if( customrecepient.loc && ishuman(customrecepient.loc) )

code/game/machinery/computer/pod.dm

@@ -53,7 +53,7 @@
 
 /obj/machinery/computer/pod/attackby(I as obj, user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(loc, 'Screwdriver.ogg', 50, 1)
+		playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			if (stat & BROKEN)
 				user << "\blue The broken glass falls out."

code/game/machinery/computer/power.dm

@@ -39,7 +39,7 @@
 
 /obj/machinery/power/monitor/attackby(I as obj, user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			if (src.stat & BROKEN)
 				user << "\blue The broken glass falls out."

code/game/machinery/constructable_frame.dm

@@ -21,7 +21,7 @@
 			if(1)
 				if(istype(P, /obj/item/weapon/cable_coil))
 					if(P:amount >= 5)
-						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+						playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 						user << "\blue You start to add cables to the frame."
 						if(do_after(user, 20))
 							P:amount -= 5
@@ -30,7 +30,7 @@
 							state = 2
 							icon_state = "box_1"
 				if(istype(P, /obj/item/weapon/wrench))
-					playsound(src.loc, 'Ratchet.ogg', 75, 1)
+					playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 					user << "\blue You dismantle the frame"
 					new /obj/item/stack/sheet/metal(src.loc, 5)
 					del(src)
@@ -38,7 +38,7 @@
 				if(istype(P, /obj/item/weapon/circuitboard))
 					var/obj/item/weapon/circuitboard/B = P
 					if(B.board_type == "machine")
-						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+						playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 						user << "\blue You add the circuit board to the frame."
 						circuit = P
 						user.drop_item()
@@ -53,7 +53,7 @@
 					else
 						user << "\red This frame does not accept circuit boards of this type!"
 				if(istype(P, /obj/item/weapon/wirecutters))
-					playsound(src.loc, 'wirecutter.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
 					user << "\blue You remove the cables."
 					state = 1
 					icon_state = "box_0"
@@ -62,7 +62,7 @@
 
 			if(3)
 				if(istype(P, /obj/item/weapon/crowbar))
-					playsound(src.loc, 'Crowbar.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 					state = 2
 					circuit.loc = src.loc
 					circuit = null
@@ -84,7 +84,7 @@
 							component_check = 0
 							break
 					if(component_check)
-						playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+						playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 						var/obj/machinery/new_machine = new src.circuit.build_path(src.loc)
 						for(var/obj/O in new_machine.component_parts)
 							del(O)

code/game/machinery/doors/airlock.dm

@@ -813,7 +813,7 @@ About the new airlock wires panel:
 	if(ishuman(user) && prob(40) && src.density)
 		var/mob/living/carbon/human/H = user
 		if(H.getBrainLoss() >= 60)
-			playsound(src.loc, 'bang.ogg', 25, 1)
+			playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
 			if(!istype(H.head, /obj/item/clothing/head/helmet))
 				for(var/mob/M in viewers(src, null))
 					M << "\red [user] headbutts the airlock."
@@ -1141,7 +1141,7 @@ About the new airlock wires panel:
 		else
 			beingcrowbarred = 0
 		if( beingcrowbarred && (density && welded && !operating && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) )
-			playsound(src.loc, 'Crowbar.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 			user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
 			if(do_after(user,40))
 				user << "\blue You removed the airlock electronics!"
@@ -1276,11 +1276,11 @@ About the new airlock wires panel:
 		return 0
 	use_power(50)
 	if(istype(src, /obj/machinery/door/airlock/glass))
-		playsound(src.loc, 'windowdoor.ogg', 100, 1)
+		playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
 	if(istype(src, /obj/machinery/door/airlock/clown))
-		playsound(src.loc, 'bikehorn.ogg', 30, 1)
+		playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
 	else
-		playsound(src.loc, 'airlock.ogg', 30, 1)
+		playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
 	if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
 		src.closeOther.close()
 	return ..()
@@ -1290,7 +1290,7 @@ About the new airlock wires panel:
 		return
 	if(safe)
 		if(locate(/mob/living) in get_turf(src))
-		//	playsound(src.loc, 'buzz-two.ogg', 50, 0)	//THE BUZZING IT NEVER STOPS	-Pete
+		//	playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)	//THE BUZZING IT NEVER STOPS	-Pete
 			spawn (60)
 				close()
 			return
@@ -1315,11 +1315,11 @@ About the new airlock wires panel:
 
 	use_power(50)
 	if(istype(src, /obj/machinery/door/airlock/glass))
-		playsound(src.loc, 'windowdoor.ogg', 30, 1)
+		playsound(src.loc, 'sound/machines/windowdoor.ogg', 30, 1)
 	if(istype(src, /obj/machinery/door/airlock/clown))
-		playsound(src.loc, 'bikehorn.ogg', 30, 1)
+		playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
 	else
-		playsound(src.loc, 'airlock.ogg', 30, 1)
+		playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
 	var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src))
 	if(killthis)
 		killthis.ex_act(2)//Smashin windows

code/game/machinery/doors/windowdoor.dm

@@ -101,7 +101,7 @@
 	if(!src.operating) //in case of emag
 		src.operating = 1
 	flick(text("[]opening", src.base_state), src)
-	playsound(src.loc, 'windowdoor.ogg', 100, 1)
+	playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
 	src.icon_state = text("[]open", src.base_state)
 	sleep(10)
 
@@ -118,7 +118,7 @@
 		return 0
 	src.operating = 1
 	flick(text("[]closing", src.base_state), src)
-	playsound(src.loc, 'windowdoor.ogg', 100, 1)
+	playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
 	src.icon_state = text("[]", src.base_state)
 
 	src.density = 1
@@ -142,7 +142,7 @@
 		tforce = 40
 	else
 		tforce = AM:throwforce
-	playsound(src.loc, 'Glasshit.ogg', 100, 1)
+	playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
 	src.health = max(0, src.health - tforce)
 	if (src.health <= 0)
 		new /obj/item/weapon/shard(src.loc)
@@ -163,7 +163,7 @@
 		if(src.operating)
 			return
 		src.health = max(0, src.health - 25)
-		playsound(src.loc, 'Glasshit.ogg', 75, 1)
+		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>[user] smashes against the [src.name].</B>", 1)
 		if (src.health <= 0)
@@ -193,7 +193,7 @@
 			spark_system.set_up(5, 0, src.loc)
 			spark_system.start()
 			playsound(src.loc, "sparks", 50, 1)
-			playsound(src.loc, 'blade1.ogg', 50, 1)
+			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
 			for(var/mob/O in viewers(user, 5))
 				O.show_message(text("\blue The glass door was sliced open by []!", user), 1, text("\red You hear glass being sliced and sparks flying."), 2)
 		flick(text("[]spark", src.base_state), src)
@@ -206,7 +206,7 @@
 		var/aforce = I.force
 		if(I.damtype == BRUTE || I.damtype == BURN)
 			src.health = max(0, src.health - aforce)
-		playsound(src.loc, 'Glasshit.ogg', 75, 1)
+		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\red <B>[src] was hit by [I].</B>", 1)
 		if (src.health <= 0)

code/game/machinery/flasher.dm

@@ -60,7 +60,7 @@
 	if ((src.disable) || (src.last_flash && world.time < src.last_flash + 150))
 		return
 
-	playsound(src.loc, 'flash.ogg', 100, 1)
+	playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
 	flick("[base_state]_flash", src)
 	src.last_flash = world.time
 	use_power(1000)

code/game/machinery/hydroponics.dm

@@ -444,7 +444,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				b_amount = 100 - src.waterlevel
 			O.reagents.remove_reagent("water", b_amount)
 			src.waterlevel += b_amount
-			playsound(src.loc, 'slosh.ogg', 25, 1)
+			playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1)
 			user << "You fill the [src] with [b_amount] units of water."
 
 	//		Toxicity dilutation code. The more water you put in, the lesser the toxin concentration.
@@ -701,7 +701,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				src.weedlevel = 0
 			src.toxic += 4 // Oops
 			src.visible_message("\red <B>\The [src] has been sprayed with \the [O][(user ? " by [user]." : ".")]")
-			playsound(src.loc, 'spray3.ogg', 50, 1, -6)
+			playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 
 	else if (istype(O, /obj/item/weapon/minihoe))  // The minihoe
 		//var/deweeding
@@ -721,7 +721,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 		if (src.toxic > 100 ) // Make sure it won't go overoboard
 			src.toxic = 100
 		user << "You apply the weedkiller solution into the [src]."
-		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
+		playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 		del(O)
 		src.updateicon()
 
@@ -735,11 +735,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 		if (src.toxic > 100 ) // Make sure it won't go overoboard
 			src.toxic = 100
 		user << "You apply the pestkiller solution into the [src]."
-		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
+		playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 		del(O)
 		src.updateicon()
 	else if(istype(O, /obj/item/weapon/wrench))
-		playsound(loc, 'Ratchet.ogg', 50, 1)
+		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		anchored = !anchored
 		user << "You [anchored ? "wrench" : "unwrench"] \the [src]."
 	else if(istype(O, /obj/item/weapon/shovel))

code/game/machinery/kitchen/blender.dm

@@ -94,7 +94,7 @@ the blender or the processor: Processor items are solid objects and Blender resu
 	if(!src.container)
 		usr << "\red The blender doesn't have an attached container!"
 		return
-	playsound(src.loc, 'blender.ogg', 50, 1)
+	playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
 	src.processing = 1
 	usr << "\blue You turn on the blender."
 	use_power(250)

code/game/machinery/kitchen/gibber.dm

@@ -162,7 +162,7 @@
 	src.occupant.ghostize()
 	del(src.occupant)
 	spawn(src.gibtime)
-		playsound(src.loc, 'splat.ogg', 50, 1)
+		playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
 		operating = 0
 		for (var/i=1 to totalslabs)
 			var/obj/item/meatslab = allmeat[i]

code/game/machinery/kitchen/juicer.dm

@@ -147,7 +147,7 @@
 		return
 	if (!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 		return
-	playsound(src.loc, 'juicer.ogg', 50, 1)
+	playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
 	for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents)
 		var/r_id = get_juice_id(O)
 		beaker.reagents.add_reagent(r_id,get_juice_amount(O))

code/game/machinery/kitchen/microwave.dm

@@ -303,7 +303,7 @@
 	src.updateUsrDialog()
 
 /obj/machinery/microwave/proc/stop()
-	playsound(src.loc, 'ding.ogg', 50, 1)
+	playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
 	src.operating = 0 // Turn it off again aferwards
 	src.icon_state = "mw"
 	src.updateUsrDialog()
@@ -318,11 +318,11 @@
 	src.updateUsrDialog()
 
 /obj/machinery/microwave/proc/muck_start()
-	playsound(src.loc, 'splat.ogg', 50, 1) // Play a splat sound
+	playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound
 	src.icon_state = "mwbloody1" // Make it look dirty!!
 
 /obj/machinery/microwave/proc/muck_finish()
-	playsound(src.loc, 'ding.ogg', 50, 1)
+	playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
 	src.visible_message("\red The microwave gets covered in muck!")
 	src.dirty = 100 // Make it dirty so it can't be used util cleaned
 	src.flags = null //So you can't add condiments

code/game/machinery/kitchen/processor.dm

@@ -151,7 +151,7 @@
 		user.visible_message("\blue [user] turns on \a [src].", \
 			"You turn on \a [src].", \
 			"You hear a food processor")
-		playsound(src.loc, 'blender.ogg', 50, 1)
+		playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
 		use_power(500)
 		sleep(P.time)
 		P.process(src.loc, O)

code/game/machinery/morgue.dm

@@ -43,11 +43,11 @@
 		for(var/atom/movable/A as mob|obj in src.connected.loc)
 			if (!( A.anchored ))
 				A.loc = src
-		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		//src.connected = null
 		del(src.connected)
 	else
-		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		src.connected = new /obj/structure/m_tray( src.loc )
 		step(src.connected, EAST)
 		src.connected.layer = OBJ_LAYER
@@ -188,11 +188,11 @@
 		for(var/atom/movable/A as mob|obj in src.connected.loc)
 			if (!( A.anchored ))
 				A.loc = src
-		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		//src.connected = null
 		del(src.connected)
 	else if (src.locked == 0)
-		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		src.connected = new /obj/structure/c_tray( src.loc )
 		step(src.connected, SOUTH)
 		src.connected.layer = OBJ_LAYER
@@ -284,7 +284,7 @@
 		sleep(30)
 		cremating = 0
 		locked = 0
-		playsound(src.loc, 'ding.ogg', 50, 1)
+		playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
 	return
 
 /obj/structure/c_tray/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)

code/game/machinery/newscaster.dm

@@ -623,7 +623,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
 				src.screen=2*/  //Obsolete after autorecognition
 
 	if (src.isbroken)
-		playsound(src.loc, 'hit_on_shattered_glass.ogg', 100, 1)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1)
 		for (var/mob/O in hearers(5, src.loc))
 			O.show_message("<EM>[user.name]</EM> further abuses the shattered [src.name].")
 	else
@@ -632,18 +632,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
 			if(W.force <15)
 				for (var/mob/O in hearers(5, src.loc))
 					O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." )
-					playsound(src.loc, 'Glasshit.ogg', 100, 1)
+					playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
 			else
 				src.hitstaken++
 				if(src.hitstaken==3)
 					for (var/mob/O in hearers(5, src.loc))
 						O.show_message("[user.name] smashes the [src.name]!" )
 					src.isbroken=1
-					playsound(src.loc, 'Glassbr3.ogg', 100, 1)
+					playsound(src.loc, 'sound/effects/Glassbr3.ogg', 100, 1)
 				else
 					for (var/mob/O in hearers(5, src.loc))
 						O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" )
-					playsound(src.loc, 'Glasshit.ogg', 100, 1)
+					playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
 		else
 			user << "<FONT COLOR='blue'>This does nothing.</FONT>"
 	src.update_icon()
@@ -849,4 +849,4 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	else
 		for(var/mob/O in hearers(world.view-1, T))
 			O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"Wanted notice posted!\"</span>",2)
-	playsound(src.loc, 'twobeep.ogg', 75, 1)
+	playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)

code/game/machinery/pipe/construction.dm

@@ -451,7 +451,7 @@ Buildable meters
 				P.node2.initialize()
 				P.node2.build_network()
 
-	playsound(src.loc, 'Ratchet.ogg', 50, 1)
+	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	user.visible_message( \
 		"[user] fastens the [src].", \
 		"\blue You have fastened the [src].", \
@@ -483,7 +483,7 @@ Buildable meters
 		user << "\red You need to fasten it to a pipe"
 		return 1
 	new/obj/machinery/meter( src.loc )
-	playsound(src.loc, 'Ratchet.ogg', 50, 1)
+	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	user << "\blue You have fastened the meter to the pipe"
 	del(src)
 

code/game/machinery/pipe/pipe_dispenser.dm

@@ -76,7 +76,7 @@
 		return
 	else if (istype(W, /obj/item/weapon/wrench))
 		if (unwrenched==0)
-			playsound(src.loc, 'Ratchet.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			user << "\blue You begin to unfasten \the [src] from the floor..."
 			if (do_after(user, 40))
 				user.visible_message( \
@@ -89,7 +89,7 @@
 				if (usr.machine==src)
 					usr << browse(null, "window=pipedispenser")
 		else /*if (unwrenched==1)*/
-			playsound(src.loc, 'Ratchet.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 			user << "\blue You begin to fasten \the [src] to the floor..."
 			if (do_after(user, 20))
 				user.visible_message( \

code/game/machinery/portable_turret.dm

@@ -661,7 +661,7 @@ Status: []<BR>"},
 	else
 		icon_state = "[lasercolor]orange_target_prism"
 	if(sound)
-		playsound(src.loc, 'Taser.ogg', 75, 1)
+		playsound(src.loc, 'sound/weapons/Taser.ogg', 75, 1)
 	var/obj/item/projectile/A
 	if(emagged)
 		A = new eprojectile( loc )
@@ -708,14 +708,14 @@ Status: []<BR>"},
 	switch(build_step)
 		if(0) // first step
 			if(istype(W, /obj/item/weapon/wrench) && !anchored)
-				playsound(src.loc, 'Ratchet.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 				user << "\blue You secure the external bolts."
 				anchored = 1
 				build_step = 1
 				return
 
 			else if(istype(W, /obj/item/weapon/crowbar) && !anchored)
-				playsound(src.loc, 'Crowbar.ogg', 75, 1)
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1)
 				user << "You dismantle the turret construction."
 				new /obj/item/stack/sheet/metal( loc, 5)
 				del(src)
@@ -733,7 +733,7 @@ Status: []<BR>"},
 					return
 
 			else if(istype(W, /obj/item/weapon/wrench))
-				playsound(src.loc, 'Ratchet.ogg', 75, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 				user << "You unfasten the external bolts."
 				anchored = 0
 				build_step = 0
@@ -742,7 +742,7 @@ Status: []<BR>"},
 
 		if(2)
 			if(istype(W, /obj/item/weapon/wrench))
-				playsound(src.loc, 'Ratchet.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 				user << "\blue You bolt the metal armor into place."
 				build_step = 3
 				return
@@ -754,7 +754,7 @@ Status: []<BR>"},
 					user << "\red You need more fuel to complete this task."
 					return
 
-				playsound(src.loc, pick('Welder.ogg', 'Welder2.ogg'), 50, 1)
+				playsound(src.loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
 				if(do_after(user, 20))
 					if(!src || !WT.remove_fuel(5, user)) return
 					build_step = 1
@@ -775,7 +775,7 @@ Status: []<BR>"},
 				return
 
 			else if(istype(W, /obj/item/weapon/wrench))
-				playsound(src.loc, 'Ratchet.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 				user << "You remove the turret's metal armor bolts."
 				build_step = 2
 				return
@@ -791,7 +791,7 @@ Status: []<BR>"},
 
 		if(5)
 			if(istype(W, /obj/item/weapon/screwdriver))
-				playsound(src.loc, 'Screwdriver.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				build_step = 6
 				user << "\blue You close the internal access hatch."
 				return
@@ -809,7 +809,7 @@ Status: []<BR>"},
 					return
 
 			else if(istype(W, /obj/item/weapon/screwdriver))
-				playsound(src.loc, 'Screwdriver.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				build_step = 5
 				user << "You open the internal access hatch."
 				return
@@ -821,7 +821,7 @@ Status: []<BR>"},
 				if (WT.get_fuel() < 5)
 					user << "\red You need more fuel to complete this task."
 
-				playsound(src.loc, pick('Welder.ogg', 'Welder2.ogg'), 50, 1)
+				playsound(src.loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
 				if(do_after(user, 30))
 					if(!src || !WT.remove_fuel(5, user)) return
 					build_step = 8
@@ -840,7 +840,7 @@ Status: []<BR>"},
 					del(src)
 
 			else if(istype(W, /obj/item/weapon/crowbar))
-				playsound(src.loc, 'Crowbar.ogg', 75, 1)
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1)
 				user << "You pry off the turret's exterior armor."
 				new /obj/item/stack/sheet/metal( loc, 2)
 				build_step = 6

code/game/machinery/recharger.dm

@@ -40,7 +40,7 @@ obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob)
 			return
 		anchored = !anchored
 		user << "You [anchored ? "attached" : "detached"] the recharger."
-		playsound(loc, 'Ratchet.ogg', 75, 1)
+		playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
 
 obj/machinery/recharger/attack_hand(mob/user as mob)
 	add_fingerprint(user)

code/game/machinery/requests_console.dm

@@ -265,7 +265,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 									Console.newmessagepriority = 2
 									Console.icon_state = "req_comp2"
 								if(!Console.silent)
-									playsound(Console.loc, 'twobeep.ogg', 50, 1)
+									playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
 									for (var/mob/O in hearers(5, Console.loc))
 										O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [department]'"))
 								Console.messages += "<B><FONT color='red'>High Priority message from <A href='?src=\ref[Console];write=[ckey(department)]'>[department]</A></FONT></B><BR>[sending]"
@@ -275,7 +275,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		//							Console.newmessagepriority = 3
 		//							Console.icon_state = "req_comp3"
 		//						if(!Console.silent)
-		//							playsound(Console.loc, 'twobeep.ogg', 50, 1)
+		//							playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
 		//							for (var/mob/O in hearers(7, Console.loc))
 		//								O.show_message(text("\icon[Console] *The Requests Console yells: 'EXTREME PRIORITY alert in [department]'"))
 		//						Console.messages += "<B><FONT color='red'>Extreme Priority message from [ckey(department)]</FONT></B><BR>[message]"
@@ -285,7 +285,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 									Console.newmessagepriority = 1
 									Console.icon_state = "req_comp1"
 								if(!Console.silent)
-									playsound(Console.loc, 'twobeep.ogg', 50, 1)
+									playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
 									for (var/mob/O in hearers(4, Console.loc))
 										O.show_message(text("\icon[Console] *The Requests Console beeps: 'Message from [department]'"))
 								Console.messages += "<B>Message from <A href='?src=\ref[Console];write=[ckey(department)]'>[department]</A></FONT></B><BR>[message]"

code/game/machinery/shieldgen.dm

@@ -80,7 +80,7 @@
 		src.health -= aforce
 
 	//Play a fitting sound
-	playsound(src.loc, 'EMPulse.ogg', 75, 1)
+	playsound(src.loc, 'sound/effects/EMPulse.ogg', 75, 1)
 
 
 	if (src.health <= 0)
@@ -158,7 +158,7 @@
 	src.health -= tforce
 
 	//This seemed to be the best sound for hitting a force field.
-	playsound(src.loc, 'EMPulse.ogg', 100, 1)
+	playsound(src.loc, 'sound/effects/EMPulse.ogg', 100, 1)
 
 	//Handle the destruction of the shield
 	if (src.health <= 0)
@@ -298,7 +298,7 @@
 		update_icon()
 
 	else if(istype(W, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 		if(is_open)
 			user << "\blue You close the panel."
 			is_open = 0
@@ -323,7 +323,7 @@
 			user << "The bolts are covered, unlocking this would retract the covers."
 			return
 		if(anchored)
-			playsound(src.loc, 'Ratchet.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 			user << "\blue You unsecure the [src] from the floor!"
 			if(active)
 				user << "\blue The [src] shuts off!"
@@ -331,7 +331,7 @@
 			anchored = 0
 		else
 			if(istype(get_turf(src), /turf/space)) return //No wrenching these in space!
-			playsound(src.loc, 'Ratchet.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
 			user << "\blue You secure the [src] to the floor!"
 			anchored = 1
 
@@ -531,14 +531,14 @@
 
 		else if(state == 0)
 			state = 1
-			playsound(src.loc, 'Ratchet.ogg', 75, 1)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 			user << "You secure the external reinforcing bolts to the floor."
 			src.anchored = 1
 			return
 
 		else if(state == 1)
 			state = 0
-			playsound(src.loc, 'Ratchet.ogg', 75, 1)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 			user << "You undo the external reinforcing bolts."
 			src.anchored = 0
 			return

code/game/machinery/suit_storage_unit.dm

@@ -477,7 +477,7 @@
 		return
 	if(istype(I, /obj/item/weapon/screwdriver))
 		src.panelopen = !src.panelopen
-		playsound(src.loc, 'Screwdriver.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 		user << text("<font color='blue'>You [] the unit's maintenance panel.</font>",(src.panelopen ? "open up" : "close") )
 		src.updateUsrDialog()
 		return

code/game/machinery/telecomms/logbrowser.dm

@@ -212,7 +212,7 @@
 
 	attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
 		if(istype(D, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				if (src.stat & BROKEN)
 					user << "\blue The broken glass falls out."
@@ -238,7 +238,7 @@
 					A.anchored = 1
 					del(src)
 		else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
-			playsound(src.loc, 'sparks4.ogg', 75, 1)
+			playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
 			emagged = 1
 			user << "\blue You you disable the security protocols"
 		src.updateUsrDialog()

code/game/machinery/telecomms/machine_interactions.dm

@@ -23,24 +23,24 @@
 		if(0)
 			if(istype(P, /obj/item/weapon/screwdriver))
 				user << "You unfasten the bolts."
-				playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				construct_op ++
 		if(1)
 			if(istype(P, /obj/item/weapon/screwdriver))
 				user << "You fasten the bolts."
-				playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 				construct_op --
 			if(istype(P, /obj/item/weapon/wrench))
 				user << "You dislodge the external plating."
-				playsound(src.loc, 'Ratchet.ogg', 75, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 				construct_op ++
 		if(2)
 			if(istype(P, /obj/item/weapon/wrench))
 				user << "You secure the external plating."
-				playsound(src.loc, 'Ratchet.ogg', 75, 1)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 				construct_op --
 			if(istype(P, /obj/item/weapon/wirecutters))
-				playsound(src.loc, 'wirecutter.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
 				user << "You remove the cables."
 				construct_op ++
 				var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( user.loc )
@@ -59,7 +59,7 @@
 					stat &= ~BROKEN // the machine's not borked anymore!
 			if(istype(P, /obj/item/weapon/crowbar))
 				user << "You begin prying out the circuit board other components..."
-				playsound(src.loc, 'Crowbar.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
 				if(do_after(user,60))
 					user << "You finish prying out the components."
 

code/game/machinery/telecomms/telemonitor.dm

@@ -125,7 +125,7 @@
 
 	attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
 		if(istype(D, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				if (src.stat & BROKEN)
 					user << "\blue The broken glass falls out."
@@ -151,7 +151,7 @@
 					A.anchored = 1
 					del(src)
 		else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
-			playsound(src.loc, 'sparks4.ogg', 75, 1)
+			playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
 			emagged = 1
 			user << "\blue You you disable the security protocols"
 		src.updateUsrDialog()

code/game/machinery/telecomms/traffic_control.dm

@@ -208,7 +208,7 @@
 
 	attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
 		if(istype(D, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
 				if (src.stat & BROKEN)
 					user << "\blue The broken glass falls out."
@@ -234,7 +234,7 @@
 					A.anchored = 1
 					del(src)
 		else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
-			playsound(src.loc, 'sparks4.ogg', 75, 1)
+			playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
 			emagged = 1
 			user << "\blue You you disable the security protocols"
 		src.updateUsrDialog()

code/game/machinery/turrets.dm

@@ -272,7 +272,7 @@
 
 /obj/machinery/turret/attackby(obj/item/weapon/W, mob/user)//I can't believe no one added this before/N
 	..()
-	playsound(src.loc, 'smash.ogg', 60, 1)
+	playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1)
 	src.spark_system.start()
 	src.health -= W.force * 0.5
 	if (src.health <= 0)
@@ -418,7 +418,7 @@
 
 /obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
 	if(!(stat & BROKEN))
-		playsound(src.loc, 'slash.ogg', 25, 1, -1)
+		playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 		for(var/mob/O in viewers(src, null))
 			if ((O.client && !( O.blinded )))
 				O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
@@ -632,7 +632,7 @@
 				continue
 			if (targloc == curloc)
 				continue
-			playsound(src, 'Gunshot.ogg', 50, 1)
+			playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
 			var/obj/item/projectile/A = new /obj/item/projectile(curloc)
 			src.projectiles--
 			A.current = curloc

code/game/magic/cultist/runes.dm

@@ -144,7 +144,7 @@ var/list/sacrificed = list()
 				usr.say("Ta'gh fara[pick("'","`")]qha fel d'amar det!")
 			else
 				usr.whisper("Ta'gh fara[pick("'","`")]qha fel d'amar det!")
-			playsound(U, 'Welder2.ogg', 25, 1)
+			playsound(U, 'sound/items/Welder2.ogg', 25, 1)
 			var/turf/T = get_turf(U)
 			if(T)
 				T.hotspot_expose(700,125)