diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 1cad48981a7..4348ef5ccf9 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -293,7 +293,7 @@
 			to_chat(traitor_mob, "Unfortunately, [employer] wasn't able to get you an Uplink.")
 		. = 0
 	else
-		uplink_loc.LoadComponent(/datum/component/uplink, traitor_mob.key)
+		uplink_loc.AddComponent(/datum/component/uplink, traitor_mob.key)
 
 		if(uplink_loc == R)
 			R.traitor_frequency = sanitize_frequency(rand(MIN_FREQ, MAX_FREQ))
diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm
index e28f6676e80..a678e414451 100644
--- a/code/game/objects/items/devices/PDA/virus_cart.dm
+++ b/code/game/objects/items/devices/PDA/virus_cart.dm
@@ -95,7 +95,7 @@
 		to_chat(U, "<span class='notice'>Virus Sent!  The unlock code to the target is: [lock_code]</span>")
 		GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, target)
 		if(!hidden_uplink)
-			hidden_uplink = target.LoadComponent(/datum/component/uplink)
+			hidden_uplink = target.AddComponent(/datum/component/uplink)
 			target.lock_code = lock_code
 		else
 			hidden_uplink.hidden_crystals += hidden_uplink.telecrystals //Temporarially hide the PDA's crystals, so you can't steal telecrystals.
diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm
index 4ef25c28a94..e3f08dd9199 100644
--- a/code/game/objects/items/implants/implantuplink.dm
+++ b/code/game/objects/items/implants/implantuplink.dm
@@ -9,7 +9,7 @@
 
 /obj/item/implant/uplink/Initialize(mapload, _owner)
 	. = ..()
-	LoadComponent(/datum/component/uplink, _owner, TRUE, FALSE, null, starting_tc)
+	AddComponent(/datum/component/uplink, _owner, TRUE, FALSE, null, starting_tc)
 
 /obj/item/implant/uplink/implant(mob/living/target, mob/user, silent = 0)
 	GET_COMPONENT(hidden_uplink, /datum/component/uplink)
diff --git a/code/datums/components/uplink.dm b/code/modules/uplink/uplink.dm
similarity index 100%
rename from code/datums/components/uplink.dm
rename to code/modules/uplink/uplink.dm
diff --git a/code/game/objects/items/devices/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm
similarity index 80%
rename from code/game/objects/items/devices/uplink_devices.dm
rename to code/modules/uplink/uplink_devices.dm
index 3f3970fe512..737f92a9efa 100644
--- a/code/game/objects/items/devices/uplink_devices.dm
+++ b/code/modules/uplink/uplink_devices.dm
@@ -5,7 +5,7 @@
 	icon_state = "radio"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
+	AddComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
 
 /obj/item/device/radio/uplink/nuclear/Initialize()
 	. = ..()
@@ -14,11 +14,11 @@
 
 /obj/item/device/multitool/uplink/Initialize(mapload, _owner, _tc_amount = 20)
 	. = ..()
-	LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
+	AddComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
 
 /obj/item/pen/uplink/Initialize(mapload, _owner, _tc_amount = 20)
 	. = ..()
-	LoadComponent(/datum/component/uplink)
+	AddComponent(/datum/component/uplink)
 	traitor_unlock_degrees = 360
 
 /obj/item/device/radio/uplink/old
diff --git a/code/datums/uplink_items.dm b/code/modules/uplink/uplink_items.dm
similarity index 100%
rename from code/datums/uplink_items.dm
rename to code/modules/uplink/uplink_items.dm
diff --git a/code/datums/uplink_purchase_log.dm b/code/modules/uplink/uplink_purchase_log.dm
similarity index 100%
rename from code/datums/uplink_purchase_log.dm
rename to code/modules/uplink/uplink_purchase_log.dm
diff --git a/tgstation.dme b/tgstation.dme
index c26b15fbd4e..2d859ff1b22 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -270,8 +270,6 @@
 #include "code\datums\shuttles.dm"
 #include "code\datums\soullink.dm"
 #include "code\datums\spawners_menu.dm"
-#include "code\datums\uplink_items.dm"
-#include "code\datums\uplink_purchase_log.dm"
 #include "code\datums\verbs.dm"
 #include "code\datums\weakrefs.dm"
 #include "code\datums\world_topic.dm"
@@ -307,7 +305,6 @@
 #include "code\datums\components\spooky.dm"
 #include "code\datums\components\squeek.dm"
 #include "code\datums\components\thermite.dm"
-#include "code\datums\components\uplink.dm"
 #include "code\datums\diseases\_disease.dm"
 #include "code\datums\diseases\_MobProcs.dm"
 #include "code\datums\diseases\anxiety.dm"
@@ -868,7 +865,6 @@
 #include "code\game\objects\items\devices\taperecorder.dm"
 #include "code\game\objects\items\devices\traitordevices.dm"
 #include "code\game\objects\items\devices\transfer_valve.dm"
-#include "code\game\objects\items\devices\uplink_devices.dm"
 #include "code\game\objects\items\devices\PDA\cart.dm"
 #include "code\game\objects\items\devices\PDA\PDA.dm"
 #include "code\game\objects\items\devices\PDA\PDA_types.dm"
@@ -2317,6 +2313,10 @@
 #include "code\modules\tgui\states\zlevel.dm"
 #include "code\modules\tooltip\tooltip.dm"
 #include "code\modules\vehicles\_vehicle.dm"
+#include "code\modules\uplink\uplink.dm"
+#include "code\modules\uplink\uplink_devices.dm"
+#include "code\modules\uplink\uplink_items.dm"
+#include "code\modules\uplink\uplink_purchase_log.dm""
 #include "code\modules\vehicles\atv.dm"
 #include "code\modules\vehicles\bicycle.dm"
 #include "code\modules\vehicles\entered.dm"