diff --git a/src/CodingContractGenerator.js b/src/CodingContractGenerator.js
index 1538703bd..135d47863 100644
--- a/src/CodingContractGenerator.js
+++ b/src/CodingContractGenerator.js
@@ -3,7 +3,7 @@ import { CodingContract,
          CodingContractTypes }          from "./CodingContracts";
 import { Factions }                     from "./Faction/Factions";
 import { Player }                       from "./Player";
-import { AllServers }                   from "./Server/Server";
+import { AllServers }                   from "./Server/AllServers";
 import { GetServerByHostname }          from "./Server/ServerHelpers";
 
 import { getRandomInt }                 from "../utils/helpers/getRandomInt";
diff --git a/src/Player.js b/src/Player.js
index a95234937..ca0c5c0ec 100644
--- a/src/Player.js
+++ b/src/Player.js
@@ -24,9 +24,9 @@ import {Gang, resetGangs}                       from "./Gang";
 import {Locations}                              from "./Locations";
 import {hasBn11SF, hasWallStreetSF,hasAISF}     from "./NetscriptFunctions";
 import { Sleeve }                               from "./PersonObjects/Sleeve/Sleeve";
-import { AllServers }                           from "./Server/AllServers";
+import { AllServers,
+         AddToAllServers }                      from "./Server/AllServers";
 import { Server }                               from "./Server/Server";
-import { AddToAllServers }                      from "./Server/ServerHelpers";
 import {Settings}                               from "./Settings/Settings";
 import {SpecialServerIps, SpecialServerNames}   from "./Server/SpecialServerIps";
 import {SourceFiles, applySourceFile}           from "./SourceFile";
diff --git a/src/Prestige.js b/src/Prestige.js
index 1b3ba168d..0f12c1e97 100755
--- a/src/Prestige.js
+++ b/src/Prestige.js
@@ -16,19 +16,19 @@ import { Factions,
 import { joinFaction }                          from "./Faction/FactionHelpers";
 import {deleteGangDisplayContent}               from "./Gang";
 import {Locations}                              from "./Location";
+import { Message }                              from "./Message/Message";
 import { initMessages,
-         Messages,
-         Message }                              from "./Message/MessageHelpers";
+         Messages }                             from "./Message/MessageHelpers";
 import {initSingularitySFFlags, hasWallStreetSF}from "./NetscriptFunctions";
 import {WorkerScript, workerScripts,
         prestigeWorkerScripts}                  from "./NetscriptWorker";
 import {Player}                                 from "./Player";
 
-import { AllServers }                           from "./Server/AllServers";
+import { AllServers,
+         AddToAllServers,
+         prestigeAllServers }                   from "./Server/AllServers";
 import { Server }                               from "./Server/Server"
-import { AddToAllServers,
-         initForeignServers,
-         prestigeAllServers,
+import { initForeignServers,
          prestigeHomeComputer }                 from "./Server/ServerHelpers";
 import { updateSourceFileFlags }                from "./SourceFile/SourceFileFlags";
 import { SpecialServerIps,
diff --git a/src/SaveObject.js b/src/SaveObject.js
index e59c0f777..27af3062a 100755
--- a/src/SaveObject.js
+++ b/src/SaveObject.js
@@ -14,8 +14,8 @@ import {processAllHacknetNodeEarnings}          from "./HacknetNode";
 import { loadMessages, initMessages, Messages } from "./Message/MessageHelpers";
 import {Player, loadPlayer}                     from "./Player";
 import { loadAllRunningScripts }                from "./Script/ScriptHelpers";
-import { AllServers }                           from "./Server/AllServers";
-import { loadAllServers }                       from "./Server/ServerHelpers";
+import { AllServers,
+         loadAllServers }                       from "./Server/AllServers";
 import { Settings }                             from "./Settings/Settings";
 import { loadSpecialServerIps,
          SpecialServerIps }                     from "./Server/SpecialServerIps";
diff --git a/src/Server/ServerPurchases.js b/src/Server/ServerPurchases.js
index 163a725d1..7805206f3 100644
--- a/src/Server/ServerPurchases.js
+++ b/src/Server/ServerPurchases.js
@@ -5,9 +5,9 @@
 import { BitNodeMultipliers }               from "../BitNode/BitNodeMultipliers";
 import { CONSTANTS }                        from "../Constants";
 import { Player }                           from "../Player";
-import { AllServers }                       from "../Server/AllServers";
+import { AllServers,
+         AddToAllServers }                  from "../Server/AllServers";
 import { Server }                           from "../Server/Server";
-import { AddToAllServers }                  from "../Server/ServerHelpers";
 import { dialogBoxCreate }                  from "../../utils/DialogBox";
 import { createRandomIp }                   from "../../utils/IPAddress";
 import { yesNoTxtInpBoxGetInput }           from "../../utils/YesNoBox";