diff --git a/Neuron-GUI/Neuron-GUI.lua → Neuron-GUI.lua b/Neuron-GUI/Neuron-GUI.lua → Neuron-GUI.lua
diff --git a/Neuron-GUI/Neuron-GUI.xml → Neuron-GUI.xml b/Neuron-GUI/Neuron-GUI.xml → Neuron-GUI.xml
diff --git a/Neuron-GUI/Images/UI-Tooltip-Border.tga b/Neuron-GUI/Images/UI-Tooltip-Border.tga
diff --git a/Neuron-GUI/Neuron-GUI.toc b/Neuron-GUI/Neuron-GUI.toc
diff --git a/Neuron.lua b/Neuron.lua
@@ -308,6 +308,8 @@ function NEURON:OnInitialize()
 	frame:SetFrameStrata("TOOLTIP")
 	frame:Hide()
 
+
+
 end
 
 --- **OnEnable** which gets called during the PLAYER_LOGIN event, when most of the data provided by the game is already present.
@@ -1087,7 +1089,7 @@ end
 
 
 
-
+--TODO: This should be moved to Neuron-GUI
 function NEURON.EditBox_PopUpInitialize(popupFrame, data)
 	popupFrame.func = NEURON.PopUp_Update
 	popupFrame.data = data

diff --git a/Neuron.toc b/Neuron.toc
@@ -28,6 +28,9 @@ Neuron-SnapTo.lua
 Neuron-MinimapIcon.lua
 Neuron-Flyouts.lua
 
+Neuron-GUI.lua
+Neuron-GUI.xml
+
 Neuron.xml
 
 Bar-Modules/Neuron-Extra.lua

diff --git a/Neuron.xml b/Neuron.xml