diff --git a/modular_nova/modules/customization/modules/client/augment/organs.dm b/modular_nova/modules/customization/modules/client/augment/organs.dm
index ad90326d9bd..42451d497d9 100644
--- a/modular_nova/modules/customization/modules/client/augment/organs.dm
+++ b/modular_nova/modules/customization/modules/client/augment/organs.dm
@@ -164,11 +164,11 @@
 //FF add, for auto-accent for anthropomorphs
 /datum/augment_item/organ/tongue/cat
 	name = "Cat tongue"
-	path = /obj/item/organ/internal/tongue/cat
+	path = /obj/item/organ/tongue/cat
 
 /datum/augment_item/organ/tongue/dog
 	name = "Dog tongue"
-	path = /obj/item/organ/internal/tongue/dog
+	path = /obj/item/organ/tongue/dog
 //FF add ends.
 
 //EARS
diff --git a/tff_modular/modules/autoaccent/code/autoaccent.dm b/tff_modular/modules/autoaccent/code/autoaccent.dm
index 87048a77423..239de67a25a 100644
--- a/tff_modular/modules/autoaccent/code/autoaccent.dm
+++ b/tff_modular/modules/autoaccent/code/autoaccent.dm
@@ -19,14 +19,14 @@
 		. += text
 	return jointext(., "")
 
-/obj/item/organ/internal/tongue/cat
+/obj/item/organ/tongue/cat
 	modifies_speech = TRUE
 	languages_native = list(/datum/language/nekomimetic, /datum/language/yangyu, /datum/language/primitive_catgirl) //IDK, Yangyu is native to Felinids? WHY?
 
 /proc/pick_cat_rawr(match)
 	return match[1] + text_mult(lowertext(match[1]), rand(1, 3))
 
-/obj/item/organ/internal/tongue/cat/modify_speech(datum/source, list/speech_args)
+/obj/item/organ/tongue/cat/modify_speech(datum/source, list/speech_args)
 	var/message = speech_args[SPEECH_MESSAGE]
 	var/static/regex/cat_rawrs = new(@"[рРrR]+", "g")
 	if(message[1] != "*")
@@ -34,9 +34,9 @@
 	speech_args[SPEECH_MESSAGE] = message
 
 /datum/species/vulpkanin
-	mutanttongue = /obj/item/organ/internal/tongue/dog
+	mutanttongue = /obj/item/organ/tongue/dog
 
-/obj/item/organ/internal/tongue/dog
+/obj/item/organ/tongue/dog
 	modifies_speech = TRUE
 	languages_native = list(/datum/language/canilunzt)
 
@@ -44,7 +44,7 @@
 	return match[1] + text_mult(lowertext(match[1]), rand(0, 2))
 
 // Almost same as /obj/item/organ/internal/tongue/cat/modify_speech. Maybe there is way to uniform replaces for any tongue with maps.
-/obj/item/organ/internal/tongue/dog/modify_speech(datum/source, list/speech_args)
+/obj/item/organ/tongue/dog/modify_speech(datum/source, list/speech_args)
 	var/message = speech_args[SPEECH_MESSAGE]
 	var/static/regex/dog_rawrs = new(@"[рРrR]+", "g")
 	if(message[1] != "*")
diff --git a/tff_modular/modules/nabbers/code/_nabbers.dm b/tff_modular/modules/nabbers/code/_nabbers.dm
index a41e631eaac..f5d167c09c6 100644
--- a/tff_modular/modules/nabbers/code/_nabbers.dm
+++ b/tff_modular/modules/nabbers/code/_nabbers.dm
@@ -25,7 +25,7 @@
 	digitigrade_customization = DIGITIGRADE_NEVER
 	no_equip_flags = ITEM_SLOT_FEET | ITEM_SLOT_OCLOTHING | ITEM_SLOT_SUITSTORE | ITEM_SLOT_EYES | ITEM_SLOT_LEGCUFFED
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
-	mutanttongue = /obj/item/organ/internal/tongue/nabber
+	mutanttongue = /obj/item/organ/tongue/nabber
 	always_customizable = TRUE
 	hair_alpha = 0
 	facial_hair_alpha = 0
@@ -33,12 +33,12 @@
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
 	species_cookie = /obj/item/food/grown/cabbage
 	bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT - 10)
-	mutantbrain = /obj/item/organ/internal/brain/nabber
-	mutanteyes = /obj/item/organ/internal/eyes/nabber
-	mutantlungs = /obj/item/organ/internal/lungs/nabber
-	mutantheart = /obj/item/organ/internal/heart/nabber
-	mutantliver = /obj/item/organ/internal/liver/nabber
-	mutantears = /obj/item/organ/internal/ears/nabber
+	mutantbrain = /obj/item/organ/brain/nabber
+	mutanteyes = /obj/item/organ/eyes/nabber
+	mutantlungs = /obj/item/organ/lungs/nabber
+	mutantheart = /obj/item/organ/heart/nabber
+	mutantliver = /obj/item/organ/liver/nabber
+	mutantears = /obj/item/organ/ears/nabber
 	mutantappendix = null
 	bodypart_overrides = list(
 		BODY_ZONE_HEAD = /obj/item/bodypart/head/mutant/nabber,
diff --git a/tff_modular/modules/nabbers/code/abilites/nabber_welding_eyes.dm b/tff_modular/modules/nabbers/code/abilites/nabber_welding_eyes.dm
index 60a8dd241d3..22eb9a56764 100644
--- a/tff_modular/modules/nabbers/code/abilites/nabber_welding_eyes.dm
+++ b/tff_modular/modules/nabbers/code/abilites/nabber_welding_eyes.dm
@@ -2,7 +2,7 @@
 	name = "Toggle welding shield"
 	desc = "Toggle your eyes welding shield"
 
-	var/obj/item/organ/internal/eyes/nabber/eyes
+	var/obj/item/organ/eyes/nabber/eyes
 
 /datum/action/toggle_welding/Trigger(trigger_flags)
 	. = ..()
diff --git a/tff_modular/modules/nabbers/code/nabber_organs.dm b/tff_modular/modules/nabbers/code/nabber_organs.dm
index 083f1c56439..1ed4500cb08 100644
--- a/tff_modular/modules/nabbers/code/nabber_organs.dm
+++ b/tff_modular/modules/nabbers/code/nabber_organs.dm
@@ -8,7 +8,7 @@
 
 #define ORGGAN_ICON_NABBER 'tff_modular/modules/nabbers/icons/organs/nabber_organs.dmi'
 
-/obj/item/organ/internal/tongue/nabber
+/obj/item/organ/tongue/nabber
 	name = "nabber tongue"
 	liked_foodtypes = RAW | GORE | GRAIN
 	disliked_foodtypes = CLOTH | FRIED | TOXIC
@@ -18,26 +18,26 @@
 		/datum/language/nabber,
 	))
 
-/obj/item/organ/internal/tongue/nabber/get_possible_languages()
+/obj/item/organ/tongue/nabber/get_possible_languages()
 	RETURN_TYPE(/list)
 	return languages_possible_gas
 
-/obj/item/organ/internal/ears/nabber
+/obj/item/organ/ears/nabber
 	name = "nabber ears"
 	icon = ORGGAN_ICON_NABBER
 	icon_state = "ears"
 
-/obj/item/organ/internal/heart/nabber
+/obj/item/organ/heart/nabber
 	name = "nabber heart"
 	icon = ORGGAN_ICON_NABBER
 	icon_state = "heart"
 
-/obj/item/organ/internal/brain/nabber
+/obj/item/organ/brain/nabber
 	name = "nabber brain"
 	icon = ORGGAN_ICON_NABBER
 	icon_state = "brain"
 
-/obj/item/organ/internal/eyes/nabber
+/obj/item/organ/eyes/nabber
 	name = "nabber eyes"
 	desc = "Small orange orbs. With pair welding shield linses."
 	icon = ORGGAN_ICON_NABBER
@@ -46,7 +46,7 @@
 	var/datum/action/toggle_welding/shield
 	var/active = FALSE
 
-/obj/item/organ/internal/eyes/nabber/Insert(mob/living/carbon/eye_recipient, special, movement_flags)
+/obj/item/organ/eyes/nabber/Insert(mob/living/carbon/eye_recipient, special, movement_flags)
 	. = ..()
 	shield = new(eye_recipient)
 	shield.button_icon = ORGGAN_ICON_NABBER
@@ -54,7 +54,7 @@
 	shield.Grant(eye_recipient)
 	shield.eyes = src
 
-/obj/item/organ/internal/eyes/nabber/proc/toggle_shielding()
+/obj/item/organ/eyes/nabber/proc/toggle_shielding()
 	if(!owner)
 		return
 
@@ -73,13 +73,13 @@
 	owner.update_tint()
 	owner.balloon_alert(owner, "Welder eyelids open!")
 
-/obj/item/organ/internal/eyes/nabber/Remove(mob/living/carbon/eye_owner, special)
+/obj/item/organ/eyes/nabber/Remove(mob/living/carbon/eye_owner, special)
 	. = ..()
 	shield.Destroy()
 	active = FALSE
 	toggle_shielding()
 
-/obj/item/organ/internal/lungs/nabber
+/obj/item/organ/lungs/nabber
 	name = "nabber lungs"
 	icon = ORGGAN_ICON_NABBER
 	icon_state = "lungs"
@@ -103,7 +103,7 @@
 	heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
 	heat_damage_type = BURN
 
-/obj/item/organ/internal/liver/nabber
+/obj/item/organ/liver/nabber
 	name = "nabber liver"
 	icon_state = "liver"
 	icon = ORGGAN_ICON_NABBER