moved a bunch of files

src/Augmentation/Augmentation.tsx

@@ -8,7 +8,7 @@ import { Factions } from "../Faction/Factions";
 import { numeralWrapper } from "../ui/numeralFormat";
 import { Money } from "../ui/React/Money";
 
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export interface IConstructorParams {
   info: string | JSX.Element;

src/Augmentation/AugmentationHelpers.tsx

@@ -11,8 +11,8 @@ import { prestigeAugmentation } from "../Prestige";
 import { Programs } from "../Programs/Programs";
 import { SourceFileFlags } from "../SourceFile/SourceFileFlags";
 
-import { dialogBoxCreate } from "../../utils/DialogBox";
-import { clearObject } from "../../utils/helpers/clearObject";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+import { clearObject } from "../utils/helpers/clearObject";
 
 import { WHRNG } from "../Casino/RNG";
 

src/Bladeburner/Action.ts

@@ -1,7 +1,7 @@
 import { Player } from "../Player";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
-import { addOffset } from "../../utils/helpers/addOffset";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
+import { addOffset } from "../utils/helpers/addOffset";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 import { BladeburnerConstants } from "./data/Constants";
 import { IBladeburner } from "./IBladeburner";
 import { IAction, ISuccessChanceParams } from "./IAction";

src/Bladeburner/ActionIdentifier.ts

@@ -1,5 +1,5 @@
 import { IActionIdentifier } from "./IActionIdentifier";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 interface IParams {
   name?: string;

src/Bladeburner/BlackOperation.ts

@@ -1,5 +1,5 @@
 import { Operation, IOperationParams } from "./Operation";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export class BlackOperation extends Operation {
   constructor(params: IOperationParams | null = null) {

src/Bladeburner/Bladeburner.ts

@@ -1,4 +1,4 @@
-import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../utils/JSONReviver";
+import { Reviver, Generic_toJSON, Generic_fromJSON } from "../utils/JSONReviver";
 import { IBladeburner } from "./IBladeburner";
 import { IActionIdentifier } from "./IActionIdentifier";
 import { ActionIdentifier } from "./ActionIdentifier";
@@ -9,7 +9,7 @@ import { BlackOperation } from "./BlackOperation";
 import { Operation } from "./Operation";
 import { Contract } from "./Contract";
 import { GeneralActions } from "./GeneralActions";
-import { formatNumber } from "../../utils/StringHelperFunctions";
+import { formatNumber } from "../utils/StringHelperFunctions";
 import { Skills } from "./Skills";
 import { Skill } from "./Skill";
 import { City } from "./City";
@@ -17,21 +17,21 @@ import { IAction } from "./IAction";
 import { IPlayer } from "../PersonObjects/IPlayer";
 import { IRouter } from "../ui/Router";
 import { ConsoleHelpText } from "./data/Help";
-import { exceptionAlert } from "../../utils/helpers/exceptionAlert";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
+import { exceptionAlert } from "../utils/helpers/exceptionAlert";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
 import { BladeburnerConstants } from "./data/Constants";
 import { numeralWrapper } from "../ui/numeralFormat";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
-import { addOffset } from "../../utils/helpers/addOffset";
+import { addOffset } from "../utils/helpers/addOffset";
 import { Faction } from "../Faction/Faction";
 import { Factions, factionExists } from "../Faction/Factions";
 import { calculateHospitalizationCost } from "../Hospital/Hospital";
 import { redPillFlag } from "../RedPill";
-import { dialogBoxCreate } from "../../utils/DialogBox";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
 import { Settings } from "../Settings/Settings";
 import { Augmentations } from "../Augmentation/Augmentations";
 import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
-import { getTimestamp } from "../../utils/helpers/getTimestamp";
+import { getTimestamp } from "../utils/helpers/getTimestamp";
 import { joinFaction } from "../Faction/FactionHelpers";
 import { WorkerScript } from "../Netscript/WorkerScript";
 

src/Bladeburner/City.ts

@@ -1,7 +1,7 @@
 import { BladeburnerConstants } from "./data/Constants";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
-import { addOffset } from "../../utils/helpers/addOffset";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
+import { addOffset } from "../utils/helpers/addOffset";
 
 interface IChangePopulationByCountParams {
   estChange: number;

src/Bladeburner/Contract.ts

@@ -1,6 +1,6 @@
 import { IBladeburner } from "./IBladeburner";
 import { Action, IActionParams } from "./Action";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export class Contract extends Action {
   constructor(params: IActionParams | null = null) {

src/Bladeburner/Operation.ts

@@ -1,7 +1,7 @@
 import { IBladeburner } from "./IBladeburner";
 import { BladeburnerConstants } from "./data/Constants";
 import { Action, IActionParams } from "./Action";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export interface IOperationParams extends IActionParams {
   reqdRank?: number;

src/Bladeburner/data/Growths.ts

@@ -1,4 +1,4 @@
-import { getRandomInt } from "../../../utils/helpers/getRandomInt";
+import { getRandomInt } from "../../utils/helpers/getRandomInt";
 
 export const Growths: {
   [key: string]: (() => number) | undefined;

src/Bladeburner/ui/BlackOpElem.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
-import { formatNumber, convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 import { ActionTypes } from "../data/ActionTypes";
-import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
+import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
 import { stealthIcon, killIcon } from "../data/Icons";
 import { createPopup } from "../../ui/React/createPopup";
 import { TeamSizePopup } from "./TeamSizePopup";

src/Bladeburner/ui/BladeburnerCinematic.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { use } from "../../ui/Context";
 import { CinematicText } from "../../ui/React/CinematicText";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 export function BladeburnerCinematic(): React.ReactElement {
   const router = use.Router();

src/Bladeburner/ui/ContractElem.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { ActionTypes } from "../data/ActionTypes";
-import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
-import { formatNumber, convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
+import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 import { stealthIcon, killIcon } from "../data/Icons";
 import { BladeburnerConstants } from "../data/Constants";
 import { IBladeburner } from "../IBladeburner";

src/Bladeburner/ui/GeneralActionElem.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { ActionTypes } from "../data/ActionTypes";
-import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
-import { formatNumber, convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
+import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 import { IBladeburner } from "../IBladeburner";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { CopyableText } from "../../ui/React/CopyableText";

src/Bladeburner/ui/OperationElem.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { ActionTypes } from "../data/ActionTypes";
-import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
-import { formatNumber, convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
+import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 import { stealthIcon, killIcon } from "../data/Icons";
 import { BladeburnerConstants } from "../data/Constants";
 import { createPopup } from "../../ui/React/createPopup";

src/Bladeburner/ui/SkillElem.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { CopyableText } from "../../ui/React/CopyableText";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { IBladeburner } from "../IBladeburner";
 
 interface IProps {

src/Bladeburner/ui/SkillPage.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { SkillList } from "./SkillList";
 import { BladeburnerConstants } from "../data/Constants";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { IBladeburner } from "../IBladeburner";
 
 interface IProps {

src/Bladeburner/ui/Stats.tsx

@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from "react";
-import { formatNumber, convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 import { BladeburnerConstants } from "../data/Constants";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { Money } from "../../ui/React/Money";
 import { StatsTable } from "../../ui/React/StatsTable";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { createPopup } from "../../ui/React/createPopup";
 import { Factions } from "../../Faction/Factions";
 import { IRouter } from "../../ui/Router";

src/Bladeburner/ui/SuccessChance.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 
 interface IProps {
   chance: number[];

src/Bladeburner/ui/TeamSizePopup.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { removePopup } from "../../ui/React/createPopup";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { Action } from "../Action";
 import { IBladeburner } from "../IBladeburner";
 

src/Casino/Game.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { IPlayer } from "../PersonObjects/IPlayer";
-import { dialogBoxCreate } from "../../utils/DialogBox";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
 
 const gainLimit = 10e9;
 

src/CodingContractGenerator.ts

@@ -12,7 +12,7 @@ import { SpecialServerNames } from "./Server/SpecialServerIps";
 import { Server } from "./Server/Server";
 import { HacknetServer } from "./Hacknet/HacknetServer";
 
-import { getRandomInt } from "../utils/helpers/getRandomInt";
+import { getRandomInt } from "./utils/helpers/getRandomInt";
 
 export function generateRandomContract(): void {
   // First select a random problem type

src/CodingContracts.ts

@@ -2,7 +2,7 @@ import { codingContractTypesMetadata, DescriptionFunc, GeneratorFunc, SolverFunc
 
 import { IMap } from "./types";
 
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "./utils/JSONReviver";
 import { createPopup, removePopup } from "./ui/React/createPopup";
 import { CodingContractPopup } from "./ui/React/CodingContractPopup";
 

src/Company/Companies.ts

@@ -2,7 +2,7 @@
 import { companiesMetadata } from "./data/CompaniesMetadata";
 import { Company, IConstructorParams } from "./Company";
 import { IMap } from "../types";
-import { Reviver } from "../../utils/JSONReviver";
+import { Reviver } from "../utils/JSONReviver";
 
 export let Companies: IMap<Company> = {};
 

src/Company/Company.ts

@@ -4,7 +4,7 @@ import * as posNames from "./data/companypositionnames";
 import { CONSTANTS } from "../Constants";
 import { IMap } from "../types";
 
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export interface IConstructorParams {
   name: string;

src/Corporation/Corporation.tsx

@@ -10,9 +10,9 @@ import { showLiterature } from "../Literature/LiteratureHelpers";
 import { LiteratureNames } from "../Literature/data/LiteratureNames";
 import { IPlayer } from "../PersonObjects/IPlayer";
 
-import { dialogBoxCreate } from "../../utils/DialogBox";
-import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../utils/JSONReviver";
-import { isString } from "../../utils/helpers/isString";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+import { Reviver, Generic_toJSON, Generic_fromJSON } from "../utils/JSONReviver";
+import { isString } from "../utils/helpers/isString";
 
 // UI Related Imports
 

src/Corporation/CorporationState.ts

@@ -1,4 +1,4 @@
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 // Array of all valid states
 const AllCorporationStates: string[] = ["START", "PURCHASE", "PRODUCTION", "SALE", "EXPORT"];

src/Corporation/Employee.ts

@@ -1,11 +1,11 @@
 import { CorporationConstants } from "./data/Constants";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
-import { createElement } from "../../utils/uiHelpers/createElement";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
+import { createElement } from "../ui/uiHelpers/createElement";
 import { EmployeePositions } from "./EmployeePositions";
 import { ICorporation } from "./ICorporation";
 import { numeralWrapper } from "../ui/numeralFormat";
-import { formatNumber } from "../../utils/StringHelperFunctions";
+import { formatNumber } from "../utils/StringHelperFunctions";
 import { OfficeSpace } from "./OfficeSpace";
 import { IIndustry } from "./IIndustry";
 

src/Corporation/Industry.ts

@@ -1,22 +1,22 @@
-import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../utils/JSONReviver";
+import { Reviver, Generic_toJSON, Generic_fromJSON } from "../utils/JSONReviver";
 import { CityName } from "../Locations/data/CityNames";
 import Decimal from "decimal.js";
 import { Industries, IndustryStartingCosts, IndustryResearchTrees } from "./IndustryData";
 import { CorporationConstants } from "./data/Constants";
 import { EmployeePositions } from "./EmployeePositions";
 import { Material } from "./Material";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
 import { calculateEffectWithFactors } from "../utils/calculateEffectWithFactors";
 import { OfficeSpace } from "./OfficeSpace";
 import { Product } from "./Product";
-import { dialogBoxCreate } from "../../utils/DialogBox";
-import { isString } from "../../utils/helpers/isString";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+import { isString } from "../utils/helpers/isString";
 import { MaterialSizes } from "./MaterialSizes";
 import { Warehouse } from "./Warehouse";
 import { ICorporation } from "./ICorporation";
 import { IIndustry } from "./IIndustry";
 import { IndustryUpgrade, IndustryUpgrades } from "./IndustryUpgrades";
-import { formatNumber } from "../../utils/StringHelperFunctions";
+import { formatNumber } from "../utils/StringHelperFunctions";
 
 interface IParams {
   name?: string;

src/Corporation/Material.ts

@@ -1,4 +1,4 @@
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 import { Export } from "./Export";
 
 interface IConstructorParams {

src/Corporation/OfficeSpace.ts

@@ -1,8 +1,8 @@
 import { EmployeePositions } from "./EmployeePositions";
 import { CorporationConstants } from "./data/Constants";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
-import { generateRandomString } from "../../utils/StringHelperFunctions";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
+import { generateRandomString } from "../utils/StringHelperFunctions";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 import { Employee } from "./Employee";
 import { IIndustry } from "./IIndustry";
 import { ICorporation } from "./ICorporation";

src/Corporation/Product.ts

@@ -6,8 +6,8 @@ import { ProductRatingWeights, IProductRatingWeight } from "./ProductRatingWeigh
 import { createCityMap } from "../Locations/createCityMap";
 import { IMap } from "../types";
 
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
 
 interface IConstructorParams {
   name?: string;

src/Corporation/Warehouse.ts

@@ -4,8 +4,8 @@ import { IIndustry } from "./IIndustry";
 import { MaterialSizes } from "./MaterialSizes";
 import { IMap } from "../types";
 import { numeralWrapper } from "../ui/numeralFormat";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
-import { exceptionAlert } from "../../utils/helpers/exceptionAlert";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
+import { exceptionAlert } from "../utils/helpers/exceptionAlert";
 
 interface IConstructorParams {
   corp?: ICorporation;

src/Corporation/ui/BribeFactionPopup.tsx

@@ -4,7 +4,7 @@ import { Factions } from "../../Faction/Factions";
 import { CorporationConstants } from "../data/Constants";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { removePopup } from "../../ui/React/createPopup";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { ICorporation } from "../ICorporation";
 
 interface IProps {

src/Corporation/ui/BuybackSharesPopup.tsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { removePopup } from "../../ui/React/createPopup";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { ICorporation } from "../ICorporation";
 
 interface IProps {

src/Corporation/ui/CreateCorporationPopup.tsx

@@ -3,7 +3,7 @@ import React, { useState } from "react";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { removePopup } from "../../ui/React/createPopup";
 import { Money } from "../../ui/React/Money";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { IRouter } from "../../ui/Router";
 
 interface IProps {

src/Corporation/ui/ExpandNewCityPopup.tsx

@@ -2,7 +2,7 @@ import React, { useRef } from "react";
 import { IIndustry } from "../IIndustry";
 import { CorporationConstants } from "../data/Constants";
 import { removePopup } from "../../ui/React/createPopup";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { ICorporation } from "../ICorporation";
 import { NewCity } from "../Actions";
 import { MoneyCost } from "./MoneyCost";

src/Corporation/ui/ExportPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { ICorporation } from "../ICorporation";
 import { Material } from "../Material";

src/Corporation/ui/GoPublicPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { ICorporation } from "../ICorporation";

src/Corporation/ui/HireEmployeePopup.tsx

@@ -5,10 +5,10 @@ import { CorporationConstants } from "../data/Constants";
 import { ICorporation } from "../ICorporation";
 import { OfficeSpace } from "../OfficeSpace";
 import { IPlayer } from "../../PersonObjects/IPlayer";
-import { getRandomInt } from "../../../utils/helpers/getRandomInt";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { getRandomInt } from "../../utils/helpers/getRandomInt";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { Employee } from "../Employee";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 interface INameEmployeeProps {
   office: OfficeSpace;

src/Corporation/ui/IndustryOffice.tsx

@@ -9,7 +9,7 @@ import { EmployeePositions } from "../EmployeePositions";
 
 import { numeralWrapper } from "../../ui/numeralFormat";
 
-import { getSelectText } from "../../../utils/uiHelpers/getSelectData";
+import { getSelectText } from "../../ui/uiHelpers/getSelectData";
 import { createPopup } from "../../ui/React/createPopup";
 import { UpgradeOfficeSizePopup } from "./UpgradeOfficeSizePopup";
 import { HireEmployeePopup } from "./HireEmployeePopup";

src/Corporation/ui/IndustryOverview.tsx

@@ -7,8 +7,8 @@ import { Industries } from "../IndustryData";
 import { IndustryUpgrades } from "../IndustryUpgrades";
 import { IIndustry } from "../IIndustry";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
-import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
+import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
 import { MakeProductPopup } from "./MakeProductPopup";
 import { ResearchPopup } from "./ResearchPopup";
 import { createPopup } from "../../ui/React/createPopup";

src/Corporation/ui/IndustryWarehouse.tsx

@@ -20,7 +20,7 @@ import { SmartSupplyPopup } from "./SmartSupplyPopup";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { createPopup } from "../../ui/React/createPopup";
 
-import { isString } from "../../../utils/helpers/isString";
+import { isString } from "../../utils/helpers/isString";
 import { ICorporation } from "../ICorporation";
 import { IIndustry } from "../IIndustry";
 import { IPlayer } from "../../PersonObjects/IPlayer";

src/Corporation/ui/IssueDividendsPopup.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { removePopup } from "../../ui/React/createPopup";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { CorporationConstants } from "../data/Constants";
 import { ICorporation } from "../ICorporation";
 import { IssueDividends } from "../Actions";

src/Corporation/ui/IssueNewSharesPopup.tsx

@@ -1,8 +1,8 @@
 import React, { useState } from "react";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
-import { getRandomInt } from "../../../utils/helpers/getRandomInt";
+import { getRandomInt } from "../../utils/helpers/getRandomInt";
 import { CorporationConstants } from "../data/Constants";
 import { ICorporation } from "../ICorporation";
 

src/Corporation/ui/LevelableUpgrade.tsx

@@ -1,7 +1,7 @@
 // React components for the levelable upgrade buttons on the overview panel
 import React from "react";
 
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { ICorporation } from "../ICorporation";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { CorporationUpgrade } from "../data/CorporationUpgrades";

src/Corporation/ui/MakeProductPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { Industries } from "../IndustryData";
 import { ICorporation } from "../ICorporation";

src/Corporation/ui/NewIndustryPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { Industries, IndustryDescriptions } from "../IndustryData";
 import { ICorporation } from "../ICorporation";

src/Corporation/ui/Overview.tsx

@@ -16,7 +16,7 @@ import { CorporationUpgrade, CorporationUpgrades } from "../data/CorporationUpgr
 
 import { CONSTANTS } from "../../Constants";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 import { createPopup } from "../../ui/React/createPopup";
 import { Money } from "../../ui/React/Money";
 import { IPlayer } from "../../PersonObjects/IPlayer";

src/Corporation/ui/PurchaseMaterialPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { MaterialSizes } from "../MaterialSizes";
 import { Warehouse } from "../Warehouse";

src/Corporation/ui/ResearchPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { IndustryResearchTrees } from "../IndustryData";
 import { CorporationConstants } from "../data/Constants";

src/Corporation/ui/SellMaterialPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { ICorporation } from "../ICorporation";
 import { Material } from "../Material";

src/Corporation/ui/SellProductPopup.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { removePopup } from "../../ui/React/createPopup";
 import { Product } from "../Product";
 import { SellProduct } from "../Actions";

src/Corporation/ui/SellSharesPopup.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { removePopup } from "../../ui/React/createPopup";
 import { CorporationConstants } from "../data/Constants";

src/Corporation/ui/SmartSupplyPopup.tsx

@@ -6,7 +6,7 @@ import { IIndustry } from "../IIndustry";
 import { SetSmartSupply, SetSmartSupplyUseLeftovers } from "../Actions";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { Material } from "../Material";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 interface ILeftoverProps {
   matName: string;

src/Corporation/ui/ThrowPartyPopup.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { removePopup } from "../../ui/React/createPopup";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { OfficeSpace } from "../OfficeSpace";
 import { ICorporation } from "../ICorporation";
 import { ThrowParty } from "../Actions";

src/Corporation/ui/UnlockUpgrade.tsx

@@ -1,7 +1,7 @@
 // React Components for the Unlock upgrade buttons on the overview page
 import React from "react";
 
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { CorporationUnlockUpgrade } from "../data/CorporationUnlockUpgrades";
 import { ICorporation } from "../ICorporation";
 import { IPlayer } from "../../PersonObjects/IPlayer";

src/Corporation/ui/UpgradeOfficeSizePopup.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { removePopup } from "../../ui/React/createPopup";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { CorporationConstants } from "../data/Constants";
 import { OfficeSpace } from "../OfficeSpace";
 import { ICorporation } from "../ICorporation";

src/Crime/CrimeHelpers.ts

@@ -2,7 +2,7 @@ import { Crimes } from "./Crimes";
 import { Crime } from "./Crime";
 import { IPlayer } from "../PersonObjects/IPlayer";
 
-import { dialogBoxCreate } from "../../utils/DialogBox";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
 
 export function determineCrimeSuccess(p: IPlayer, type: string): boolean {
   let chance = 0;

src/DarkWeb/DarkWeb.tsx

@@ -5,7 +5,7 @@ import { Terminal } from "../Terminal";
 import { SpecialServerIps } from "../Server/SpecialServerIps";
 import { numeralWrapper } from "../ui/numeralFormat";
 
-import { isValidIPAddress } from "../../utils/helpers/isValidIPAddress";
+import { isValidIPAddress } from "../utils/helpers/isValidIPAddress";
 
 //Posts a "help" message if connected to DarkWeb
 export function checkIfConnectedToDarkweb(): void {

src/DevMenu/ui/StockMarket.tsx

@@ -8,7 +8,7 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import Button from "@mui/material/Button";
 import TextField from "@mui/material/TextField";
 import { Money } from "../../ui/React/Money";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { StockMarket as SM } from "../../StockMarket/StockMarket";
 import { Stock } from "../../StockMarket/Stock";
 

src/Faction/Faction.ts

@@ -1,6 +1,6 @@
 import { FactionInfo, FactionInfos } from "./FactionInfo";
 import { favorToRep, repToFavor } from "./formulas/favor";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export class Faction {
   /**

src/Faction/FactionHelpers.tsx

@@ -17,7 +17,7 @@ import {
 } from "../PersonObjects/formulas/reputation";
 import { SourceFileFlags } from "../SourceFile/SourceFileFlags";
 
-import { dialogBoxCreate } from "../../utils/DialogBox";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
 import { createPopup } from "../ui/React/createPopup";
 import { InvitationPopup } from "./ui/InvitationPopup";
 

src/Faction/Factions.ts

@@ -7,7 +7,7 @@ import { FactionInfos } from "./FactionInfo";
 
 import { IMap } from "../types";
 
-import { Reviver } from "../../utils/JSONReviver";
+import { Reviver } from "../utils/JSONReviver";
 
 export let Factions: IMap<Faction> = {};
 

src/Faction/ui/DonateOption.tsx

@@ -14,7 +14,7 @@ import { Reputation } from "../../ui/React/Reputation";
 
 import { numeralWrapper } from "../../ui/numeralFormat";
 
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { MathComponent } from "mathjax-react";
 
 import Typography from "@mui/material/Typography";

src/Gang/AllGangs.ts

@@ -1,4 +1,4 @@
-import { Reviver } from "../../utils/JSONReviver";
+import { Reviver } from "../utils/JSONReviver";
 
 interface GangTerritory {
   power: number;

src/Gang/Gang.ts

@@ -7,11 +7,11 @@
 import { Faction } from "../Faction/Faction";
 import { Factions } from "../Faction/Factions";
 
-import { dialogBoxCreate } from "../../utils/DialogBox";
-import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../utils/JSONReviver";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+import { Reviver, Generic_toJSON, Generic_fromJSON } from "../utils/JSONReviver";
 
-import { exceptionAlert } from "../../utils/helpers/exceptionAlert";
-import { getRandomInt } from "../../utils/helpers/getRandomInt";
+import { exceptionAlert } from "../utils/helpers/exceptionAlert";
+import { getRandomInt } from "../utils/helpers/getRandomInt";
 
 import { GangMemberUpgrade } from "./GangMemberUpgrade";
 import { GangConstants } from "./data/Constants";

src/Gang/GangMember.ts

@@ -6,7 +6,7 @@ import { IAscensionResult } from "./IAscensionResult";
 import { IPlayer } from "../PersonObjects/IPlayer";
 import { AllGangs } from "./AllGangs";
 import { IGang } from "./IGang";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 interface IMults {
   hack: number;

src/Gang/ui/AscensionPopup.tsx

@@ -7,7 +7,7 @@ import { Gang } from "../Gang";
 import { GangMember } from "../GangMember";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { removePopup } from "../../ui/React/createPopup";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 interface IProps {
   member: GangMember;

src/Gang/ui/BonusTime.tsx

@@ -4,7 +4,7 @@
 import * as React from "react";
 import { Gang } from "../Gang";
 import { CONSTANTS } from "../../Constants";
-import { convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 
 interface IProps {
   gang: Gang;

src/Gang/ui/GangMemberStats.tsx

@@ -3,8 +3,8 @@
  * Contains skills and exp.
  */
 import React from "react";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { createPopup } from "../../ui/React/createPopup";
 import { Gang } from "../Gang";

src/Gang/ui/GangMemberUpgradePopup.tsx

@@ -2,7 +2,7 @@
  * React Component for the popup that manages gang members upgrades
  */
 import React, { useState, useEffect } from "react";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { GangMemberUpgrades } from "../GangMemberUpgrades";
 import { GangMemberUpgrade } from "../GangMemberUpgrade";

src/Gang/ui/GangStats.tsx

@@ -6,7 +6,7 @@ import React from "react";
 import { Factions } from "../../Faction/Factions";
 import { Gang } from "../Gang";
 
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { MoneyRate } from "../../ui/React/MoneyRate";
 import { Reputation } from "../../ui/React/Reputation";

src/Gang/ui/RecruitButton.tsx

@@ -5,7 +5,7 @@ import React from "react";
 import { Gang } from "../Gang";
 import { RecruitPopup } from "./RecruitPopup";
 import { GangConstants } from "../data/Constants";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { createPopup } from "../../ui/React/createPopup";
 
 interface IProps {

src/Gang/ui/RecruitPopup.tsx

@@ -4,7 +4,7 @@
 import React, { useState } from "react";
 import { Gang } from "../Gang";
 import { removePopup } from "../../ui/React/createPopup";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 interface IRecruitPopupProps {
   gang: Gang;

src/Gang/ui/TerritorySubpage.tsx

@@ -3,8 +3,8 @@
  */
 import React from "react";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
-import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
+import { formatNumber } from "../../utils/StringHelperFunctions";
 import { AllGangs } from "../AllGangs";
 import { Gang } from "../Gang";
 

src/Hacknet/HacknetNode.ts

@@ -16,8 +16,8 @@ import {
 } from "./formulas/HacknetNodes";
 import { HacknetNodeConstants } from "./data/Constants";
 
-import { dialogBoxCreate } from "../../utils/DialogBox";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export class HacknetNode implements IHacknetNode {
   // Node's number of cores

src/Hacknet/HacknetServer.ts

@@ -16,9 +16,9 @@ import {
   calculateCacheUpgradeCost,
 } from "./formulas/HacknetServers";
 
-import { createRandomIp } from "../../utils/IPAddress";
+import { createRandomIp } from "../utils/IPAddress";
 
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 interface IConstructorParams {
   adminRights?: boolean;

src/Hacknet/HashManager.ts

@@ -10,7 +10,7 @@ import { HashUpgrades } from "./HashUpgrades";
 import { HashUpgrade } from "./HashUpgrade";
 
 import { IMap } from "../types";
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
 export class HashManager {
   // Max number of hashes this can hold. Equal to the sum of capacities of

src/Hacknet/ui/HacknetUpgradeElem.tsx

@@ -8,7 +8,7 @@ import { IPlayer } from "../../PersonObjects/IPlayer";
 
 import { ServerDropdown, ServerType } from "../../ui/React/ServerDropdown";
 
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 import { CopyableText } from "../../ui/React/CopyableText";
 import { Hashes } from "../../ui/React/Hashes";
 

src/Literature/LiteratureHelpers.ts

@@ -1,5 +1,5 @@
 import { Literatures } from "./Literatures";
-import { dialogBoxCreate } from "../../utils/DialogBox";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
 
 export function showLiterature(fn: string): void {
   const litObj = Literatures[fn];

src/Locations/LocationsHelpers.tsx

@@ -9,7 +9,7 @@ import { AddToAllServers, createUniqueRandomIp } from "../Server/AllServers";
 import { safetlyCreateUniqueServer } from "../Server/ServerHelpers";
 import { SpecialServerIps } from "../Server/SpecialServerIps";
 
-import { dialogBoxCreate } from "../../utils/DialogBox";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
 
 /**
  * Attempt to purchase a TOR router

src/Locations/ui/HospitalLocation.tsx

@@ -11,7 +11,7 @@ import { getHospitalizationCost } from "../../Hospital/Hospital";
 import { AutoupdatingStdButton } from "../../ui/React/AutoupdatingStdButton";
 import { Money } from "../../ui/React/Money";
 
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 type IProps = {
   p: IPlayer;

src/Locations/ui/SpecialLocation.tsx

@@ -22,7 +22,7 @@ import { use } from "../../ui/Context";
 import { AutoupdatingStdButton } from "../../ui/React/AutoupdatingStdButton";
 import { StdButton } from "../../ui/React/StdButton";
 
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 type IProps = {
   loc: Location;

src/Locations/ui/TravelAgencyRoot.tsx

@@ -17,7 +17,7 @@ import { StdButton } from "../../ui/React/StdButton";
 import { use } from "../../ui/Context";
 import { Money } from "../../ui/React/Money";
 import { WorldMap } from "../../ui/React/WorldMap";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
 
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";

src/Message/Message.ts

@@ -1,4 +1,4 @@
-import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../utils/JSONReviver";
+import { Reviver, Generic_toJSON, Generic_fromJSON } from "../utils/JSONReviver";
 
 export class Message {
   // Name of Message file

src/Message/MessageHelpers.ts

@@ -7,8 +7,8 @@ import { Player } from "../Player";
 import { redPillFlag } from "../RedPill";
 import { GetServerByHostname } from "../Server/ServerHelpers";
 import { Settings } from "../Settings/Settings";
-import { dialogBoxCreate } from "../../utils/DialogBox";
-import { Reviver } from "../../utils/JSONReviver";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+import { Reviver } from "../utils/JSONReviver";
 
 //Sends message to player, including a pop up
 function sendMessage(msg: Message, forced = false): void {

src/Missions.jsx

@@ -1,15 +1,15 @@
 import { CONSTANTS } from "./Constants";
 import { Player } from "./Player";
 
-import { dialogBoxCreate } from "../utils/DialogBox";
-import { formatNumber } from "../utils/StringHelperFunctions";
+import { dialogBoxCreate } from "./ui/React/DialogBox";
+import { formatNumber } from "./utils/StringHelperFunctions";
 import { Reputation } from "./ui/React/Reputation";
 
-import { addOffset } from "../utils/helpers/addOffset";
-import { getRandomInt } from "../utils/helpers/getRandomInt";
-import { isString } from "../utils/helpers/isString";
+import { addOffset } from "./utils/helpers/addOffset";
+import { getRandomInt } from "./utils/helpers/getRandomInt";
+import { isString } from "./utils/helpers/isString";
 
-import { clearEventListeners } from "../utils/uiHelpers/clearEventListeners";
+import { clearEventListeners } from "./ui/uiHelpers/clearEventListeners";
 import { Router } from "./ui/GameRoot";
 
 // For some reason `jsplumb` needs to be imported exactly like this,

src/Netscript/killWorkerScript.ts

@@ -9,8 +9,8 @@ import { WorkerScriptStartStopEventEmitter } from "./WorkerScriptStartStopEventE
 import { RunningScript } from "../Script/RunningScript";
 import { AllServers } from "../Server/AllServers";
 
-import { compareArrays } from "../../utils/helpers/compareArrays";
-import { roundToTwo } from "../../utils/helpers/roundToTwo";
+import { compareArrays } from "../utils/helpers/compareArrays";
+import { roundToTwo } from "../utils/helpers/roundToTwo";
 
 export function killWorkerScript(runningScriptObj: RunningScript, serverIp: string, rerenderUi?: boolean): boolean;
 export function killWorkerScript(workerScript: WorkerScript): boolean;

src/NetscriptEvaluator.ts

@@ -1,6 +1,6 @@
 import { setTimeoutRef } from "./utils/SetTimeoutRef";
 
-import { isString } from "../utils/helpers/isString";
+import { isString } from "./utils/helpers/isString";
 import { AllServers } from "./Server/AllServers";
 import { WorkerScript } from "./Netscript/WorkerScript";
 

src/NetscriptFunctions.ts

@@ -144,15 +144,15 @@ import { Router } from "./ui/GameRoot";
 import { numeralWrapper } from "./ui/numeralFormat";
 import { setTimeoutRef } from "./utils/SetTimeoutRef";
 import { is2DArray } from "./utils/helpers/is2DArray";
-import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
+import { convertTimeMsToTimeElapsedString } from "./utils/StringHelperFunctions";
 
-import { logBoxCreate } from "../utils/LogBox";
-import { arrayToString } from "../utils/helpers/arrayToString";
-import { isString } from "../utils/helpers/isString";
+import { logBoxCreate } from "./ui/React/LogBox";
+import { arrayToString } from "./utils/helpers/arrayToString";
+import { isString } from "./utils/helpers/isString";
 
-import { createElement } from "../utils/uiHelpers/createElement";
-import { createPopup } from "../utils/uiHelpers/createPopup";
-import { removeElementById } from "../utils/uiHelpers/removeElementById";
+import { createElement } from "./ui/uiHelpers/createElement";
+import { createPopup } from "./ui/uiHelpers/createPopup";
+import { removeElementById } from "./ui/uiHelpers/removeElementById";
 
 import { OfficeSpace } from "./Corporation/OfficeSpace";
 import { Employee } from "./Corporation/Employee";

src/NetscriptWorker.ts

@@ -25,10 +25,10 @@ import { setTimeoutRef } from "./utils/SetTimeoutRef";
 
 import { generate } from "escodegen";
 
-import { dialogBoxCreate } from "../utils/DialogBox";
-import { arrayToString } from "../utils/helpers/arrayToString";
-import { roundToTwo } from "../utils/helpers/roundToTwo";
-import { isString } from "../utils/helpers/isString";
+import { dialogBoxCreate } from "./ui/React/DialogBox";
+import { arrayToString } from "./utils/helpers/arrayToString";
+import { roundToTwo } from "./utils/helpers/roundToTwo";
+import { isString } from "./utils/helpers/isString";
 import { sprintf } from "sprintf-js";
 
 import { parse } from "acorn";

src/PersonObjects/Player/PlayerObject.ts

@@ -32,7 +32,7 @@ import { HashManager } from "../../Hacknet/HashManager";
 import { CityName } from "../../Locations/data/CityNames";
 
 import { MoneySourceTracker } from "../../utils/MoneySourceTracker";
-import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../../utils/JSONReviver";
+import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../utils/JSONReviver";
 
 import Decimal from "decimal.js";
 

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -50,8 +50,8 @@ import Decimal from "decimal.js";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { IRouter } from "../../ui/Router";
 import { MoneySourceTracker } from "../../utils/MoneySourceTracker";
-import { dialogBoxCreate } from "../../../utils/DialogBox";
-import { convertTimeMsToTimeElapsedString } from "../../../utils/StringHelperFunctions";
+import { dialogBoxCreate } from "../../ui/React/DialogBox";
+import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
 
 import { Reputation } from "../../ui/React/Reputation";
 import { Money } from "../../ui/React/Money";

src/PersonObjects/Resleeving/Resleeve.ts

@@ -7,7 +7,7 @@ import { Person } from "../Person";
 import { Augmentation } from "../../Augmentation/Augmentation";
 import { Augmentations } from "../../Augmentation/Augmentations";
 
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
 
 export class Resleeve extends Person {
   constructor() {

src/PersonObjects/Resleeving/Resleeving.ts

@@ -18,7 +18,7 @@ import { Augmentations } from "../../Augmentation/Augmentations";
 import { IPlayerOwnedAugmentation, PlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
 import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
 
-import { getRandomInt } from "../../../utils/helpers/getRandomInt";
+import { getRandomInt } from "../../utils/helpers/getRandomInt";
 
 // Executes the actual re-sleeve when one is purchased
 export function purchaseResleeve(r: Resleeve, p: IPlayer): boolean {

src/PersonObjects/Resleeving/ui/ResleeveElem.tsx

@@ -6,7 +6,7 @@ import { purchaseResleeve } from "../Resleeving";
 import { Money } from "../../../ui/React/Money";
 
 import { numeralWrapper } from "../../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 
 interface IProps {
   resleeve: Resleeve;

src/PersonObjects/Sleeve/Sleeve.ts

@@ -32,7 +32,7 @@ import { FactionWorkType } from "../../Faction/FactionWorkTypeEnum";
 import { CityName } from "../../Locations/data/CityNames";
 import { LocationName } from "../../Locations/data/LocationNames";
 
-import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../../utils/JSONReviver";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
 
 export class Sleeve extends Person {
   /**

src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx

@@ -14,7 +14,7 @@ import { PopupCloseButton } from "../../../ui/React/PopupCloseButton";
 import { StdButton } from "../../../ui/React/StdButton";
 import { Money } from "../../../ui/React/Money";
 
-import { dialogBoxCreate } from "../../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 
 interface IProps {
   closeFn: () => void;

src/PersonObjects/Sleeve/ui/SleeveElem.tsx

@@ -10,9 +10,9 @@ import { Crimes } from "../../../Crime/Crimes";
 
 import { numeralWrapper } from "../../../ui/numeralFormat";
 
-import { dialogBoxCreate } from "../../../../utils/DialogBox";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 
-import { createProgressBarText } from "../../../../utils/helpers/createProgressBarText";
+import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
 
 import { createPopup } from "../../../ui/React/createPopup";