diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/organs/internal/brain.dm
similarity index 96%
rename from code/modules/mob/living/carbon/brain/brain_item.dm
rename to code/modules/organs/internal/brain.dm
index 973e55a48b..edc6f6e47f 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -1,122 +1,122 @@
-/obj/item/organ/internal/brain
- name = "brain"
- health = 400 //They need to live awhile longer than other organs. Is this even used by organ code anymore?
- desc = "A piece of juicy meat found in a person's head."
- organ_tag = "brain"
- parent_organ = BP_HEAD
- vital = 1
- icon_state = "brain2"
- force = 1.0
- w_class = ITEMSIZE_SMALL
- throwforce = 1.0
- throw_speed = 3
- throw_range = 5
- origin_tech = list(TECH_BIO = 3)
- attack_verb = list("attacked", "slapped", "whacked")
- var/mob/living/carbon/brain/brainmob = null
-
-/obj/item/organ/internal/brain/robotize()
- replace_self_with(/obj/item/organ/internal/mmi_holder/posibrain)
-
-/obj/item/organ/internal/brain/mechassist()
- replace_self_with(/obj/item/organ/internal/mmi_holder)
-
-/obj/item/organ/internal/brain/digitize()
- replace_self_with(/obj/item/organ/internal/mmi_holder/robot)
-
-/obj/item/organ/internal/brain/proc/replace_self_with(replace_path)
- var/mob/living/carbon/human/tmp_owner = owner
- qdel(src)
- if(tmp_owner)
- tmp_owner.internal_organs_by_name[organ_tag] = new replace_path(tmp_owner, 1)
- tmp_owner = null
-
-/obj/item/organ/internal/pariah_brain
- name = "brain remnants"
- desc = "Did someone tread on this? It looks useless for cloning or cyborgification."
- organ_tag = "brain"
- parent_organ = BP_HEAD
- icon = 'icons/mob/alien.dmi'
- icon_state = "chitin"
- vital = 1
-
-/obj/item/organ/internal/brain/xeno
- name = "thinkpan"
- desc = "It looks kind of like an enormous wad of purple bubblegum."
- icon = 'icons/mob/alien.dmi'
- icon_state = "chitin"
-
-/obj/item/organ/internal/brain/New()
- ..()
- health = config.default_brain_health
- spawn(5)
- if(brainmob && brainmob.client)
- brainmob.client.screen.len = null //clear the hud
-
-/obj/item/organ/internal/brain/Destroy()
- if(brainmob)
- qdel(brainmob)
- brainmob = null
- ..()
-
-/obj/item/organ/internal/brain/proc/transfer_identity(var/mob/living/carbon/H)
-
- if(!brainmob)
- brainmob = new(src)
- brainmob.name = H.real_name
- brainmob.real_name = H.real_name
- brainmob.dna = H.dna.Clone()
- brainmob.timeofhostdeath = H.timeofdeath
-
- if(H.mind)
- H.mind.transfer_to(brainmob)
-
- brainmob << "You feel slightly disoriented. That's normal when you're just \a [initial(src.name)]."
- callHook("debrain", list(brainmob))
-
-/obj/item/organ/internal/brain/examine(mob/user) // -- TLE
- ..(user)
- if(brainmob && brainmob.client)//if thar be a brain inside... the brain.
- user << "You can feel the small spark of life still left in this one."
- else
- user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.."
-
-/obj/item/organ/internal/brain/removed(var/mob/living/user)
-
- if(name == initial(name))
- name = "\the [owner.real_name]'s [initial(name)]"
-
- var/mob/living/simple_animal/borer/borer = owner.has_brain_worms()
-
- if(borer)
- borer.detatch() //Should remove borer if the brain is removed - RR
-
- var/obj/item/organ/internal/brain/B = src
- if(istype(B) && istype(owner))
- B.transfer_identity(owner)
-
- ..()
-
-/obj/item/organ/internal/brain/replaced(var/mob/living/target)
-
- if(target.key)
- target.ghostize()
-
- if(brainmob)
- if(brainmob.mind)
- brainmob.mind.transfer_to(target)
- else
- target.key = brainmob.key
- ..()
-
-/obj/item/organ/internal/brain/slime
- name = "slime core"
- desc = "A complex, organic knot of jelly and crystalline particles."
- icon = 'icons/mob/slimes.dmi'
- icon_state = "green slime extract"
-
-/obj/item/organ/internal/brain/golem
- name = "chem"
- desc = "A tightly furled roll of paper, covered with indecipherable runes."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "scroll"
+/obj/item/organ/internal/brain
+ name = "brain"
+ health = 400 //They need to live awhile longer than other organs. Is this even used by organ code anymore?
+ desc = "A piece of juicy meat found in a person's head."
+ organ_tag = "brain"
+ parent_organ = BP_HEAD
+ vital = 1
+ icon_state = "brain2"
+ force = 1.0
+ w_class = ITEMSIZE_SMALL
+ throwforce = 1.0
+ throw_speed = 3
+ throw_range = 5
+ origin_tech = list(TECH_BIO = 3)
+ attack_verb = list("attacked", "slapped", "whacked")
+ var/mob/living/carbon/brain/brainmob = null
+
+/obj/item/organ/internal/brain/robotize()
+ replace_self_with(/obj/item/organ/internal/mmi_holder/posibrain)
+
+/obj/item/organ/internal/brain/mechassist()
+ replace_self_with(/obj/item/organ/internal/mmi_holder)
+
+/obj/item/organ/internal/brain/digitize()
+ replace_self_with(/obj/item/organ/internal/mmi_holder/robot)
+
+/obj/item/organ/internal/brain/proc/replace_self_with(replace_path)
+ var/mob/living/carbon/human/tmp_owner = owner
+ qdel(src)
+ if(tmp_owner)
+ tmp_owner.internal_organs_by_name[organ_tag] = new replace_path(tmp_owner, 1)
+ tmp_owner = null
+
+/obj/item/organ/internal/pariah_brain
+ name = "brain remnants"
+ desc = "Did someone tread on this? It looks useless for cloning or cyborgification."
+ organ_tag = "brain"
+ parent_organ = BP_HEAD
+ icon = 'icons/mob/alien.dmi'
+ icon_state = "chitin"
+ vital = 1
+
+/obj/item/organ/internal/brain/xeno
+ name = "thinkpan"
+ desc = "It looks kind of like an enormous wad of purple bubblegum."
+ icon = 'icons/mob/alien.dmi'
+ icon_state = "chitin"
+
+/obj/item/organ/internal/brain/New()
+ ..()
+ health = config.default_brain_health
+ spawn(5)
+ if(brainmob && brainmob.client)
+ brainmob.client.screen.len = null //clear the hud
+
+/obj/item/organ/internal/brain/Destroy()
+ if(brainmob)
+ qdel(brainmob)
+ brainmob = null
+ ..()
+
+/obj/item/organ/internal/brain/proc/transfer_identity(var/mob/living/carbon/H)
+
+ if(!brainmob)
+ brainmob = new(src)
+ brainmob.name = H.real_name
+ brainmob.real_name = H.real_name
+ brainmob.dna = H.dna.Clone()
+ brainmob.timeofhostdeath = H.timeofdeath
+
+ if(H.mind)
+ H.mind.transfer_to(brainmob)
+
+ brainmob << "You feel slightly disoriented. That's normal when you're just \a [initial(src.name)]."
+ callHook("debrain", list(brainmob))
+
+/obj/item/organ/internal/brain/examine(mob/user) // -- TLE
+ ..(user)
+ if(brainmob && brainmob.client)//if thar be a brain inside... the brain.
+ user << "You can feel the small spark of life still left in this one."
+ else
+ user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.."
+
+/obj/item/organ/internal/brain/removed(var/mob/living/user)
+
+ if(name == initial(name))
+ name = "\the [owner.real_name]'s [initial(name)]"
+
+ var/mob/living/simple_animal/borer/borer = owner.has_brain_worms()
+
+ if(borer)
+ borer.detatch() //Should remove borer if the brain is removed - RR
+
+ var/obj/item/organ/internal/brain/B = src
+ if(istype(B) && istype(owner))
+ B.transfer_identity(owner)
+
+ ..()
+
+/obj/item/organ/internal/brain/replaced(var/mob/living/target)
+
+ if(target.key)
+ target.ghostize()
+
+ if(brainmob)
+ if(brainmob.mind)
+ brainmob.mind.transfer_to(target)
+ else
+ target.key = brainmob.key
+ ..()
+
+/obj/item/organ/internal/brain/slime
+ name = "slime core"
+ desc = "A complex, organic knot of jelly and crystalline particles."
+ icon = 'icons/mob/slimes.dmi'
+ icon_state = "green slime extract"
+
+/obj/item/organ/internal/brain/golem
+ name = "chem"
+ desc = "A tightly furled roll of paper, covered with indecipherable runes."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "scroll"
diff --git a/code/modules/organs/internal/organ_internal.dm b/code/modules/organs/internal/organ_internal.dm
index 100666caaa..c1bfebb673 100644
--- a/code/modules/organs/internal/organ_internal.dm
+++ b/code/modules/organs/internal/organ_internal.dm
@@ -33,4 +33,4 @@
if(istype(E)) E.internal_organs -= src
..()
-// Brain is defined in brain_item.dm.
\ No newline at end of file
+// Brain is defined in brain.dm
\ No newline at end of file
diff --git a/polaris.dme b/polaris.dme
index 1c4ff32424..d8c0ac2087 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1523,7 +1523,6 @@
#include "code\modules\mob\living\carbon\alien\diona\say_understands.dm"
#include "code\modules\mob\living\carbon\alien\diona\update_icons.dm"
#include "code\modules\mob\living\carbon\brain\brain.dm"
-#include "code\modules\mob\living\carbon\brain\brain_item.dm"
#include "code\modules\mob\living\carbon\brain\death.dm"
#include "code\modules\mob\living\carbon\brain\emote.dm"
#include "code\modules\mob\living\carbon\brain\life.dm"
@@ -1723,6 +1722,7 @@
#include "code\modules\organs\robolimbs.dm"
#include "code\modules\organs\wound.dm"
#include "code\modules\organs\internal\appendix.dm"
+#include "code\modules\organs\internal\brain.dm"
#include "code\modules\organs\internal\eyes.dm"
#include "code\modules\organs\internal\heart.dm"
#include "code\modules\organs\internal\kidneys.dm"