diff --git a/package.json b/package.json
index 69d11dcb8..302315994 100755
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
     "private": true,
+    "main": "resources/js/app.ts",
     "scripts": {
         "dev": "yarn run development",
         "development": "TAILWIND_MODE=build mix",
diff --git a/resources/js/game/game.tsx b/resources/js/game/game.tsx
index 4b299dc96..59dbe8845 100755
--- a/resources/js/game/game.tsx
+++ b/resources/js/game/game.tsx
@@ -22,14 +22,14 @@ import ScreenRefresh from "./sections/screen-refresh/screen-refresh";
 import KingdomsList from "./sections/kingdoms/kingdoms-list";
 import KingdomDetails from "./lib/game/kingdoms/kingdom-details";
 import Actions from "./sections/game-actions-section/actions";
-import PositionType from "./lib/game/types/map/position-type";
+import PositionType from "./sections/map/types/map/position-type";
 import { removeCommas } from "./lib/game/format-number";
 import CharacterCurrenciesType from "./lib/game/character/character-currencies-type";
 import KingdomLogDetails from "./lib/game/kingdoms/kingdom-log-details";
 import GlobalTimeoutModal from "./sections/game-modals/global-timeout-modal";
 import MapState from "./sections/map/types/map-state";
-import MapData from "./lib/game/map/request-types/MapData";
-import MapStateManager from "./lib/game/map/state/map-state-manager";
+import MapData from "./sections/map/lib/request-types/MapData";
+import MapStateManager from "./sections/map/lib/state/map-state-manager";
 import MapTabs from "./sections/map/map-tabs";
 
 export default class Game extends React.Component<GameProps, GameState> {
diff --git a/resources/js/game/lib/game/ajax/FetchGameData.ts b/resources/js/game/lib/game/ajax/FetchGameData.ts
index e6cbb4f6b..8fcd0e6cc 100755
--- a/resources/js/game/lib/game/ajax/FetchGameData.ts
+++ b/resources/js/game/lib/game/ajax/FetchGameData.ts
@@ -2,7 +2,7 @@ import { setDefaultResultOrder } from "dns";
 import Game from "../../../game";
 import Ajax from "../../ajax/ajax";
 import { AxiosResponse } from "axios";
-import MapStateManager from "../map/state/map-state-manager";
+import MapStateManager from "../../../sections/map/lib/state/map-state-manager";
 import { CharacterType } from "../character/character-type";
 
 type AjaxUrls = { url: string, name: string }[];
diff --git a/resources/js/game/lib/game/character/character-type.ts b/resources/js/game/lib/game/character/character-type.ts
index 329925d3d..df3cc019d 100755
--- a/resources/js/game/lib/game/character/character-type.ts
+++ b/resources/js/game/lib/game/character/character-type.ts
@@ -1,4 +1,4 @@
-import PositionType from "../types/map/position-type";
+import PositionType from "../../../sections/map/types/map/position-type";
 import AttackTypes from "./attack-types";
 import ExtraActionType from "./extra-action-type";
 
diff --git a/resources/js/game/lib/game/types/game-state.ts b/resources/js/game/lib/game/types/game-state.ts
index 480e1eb6b..f0ccf7d76 100755
--- a/resources/js/game/lib/game/types/game-state.ts
+++ b/resources/js/game/lib/game/types/game-state.ts
@@ -3,7 +3,7 @@ import CharacterCurrenciesType from "../character/character-currencies-type";
 import CharacterStatusType from "../character/character-status-type";
 import QuestType from "./quests/quest-type";
 import KingdomDetails from "../kingdoms/kingdom-details";
-import PositionType from "./map/position-type";
+import PositionType from "../../../sections/map/types/map/position-type";
 import KingdomLogDetails from "../kingdoms/kingdom-log-details";
 import MonsterType from "./actions/monster/monster-type";
 import MapState from "../../../sections/map/types/map-state";
diff --git a/resources/js/game/lib/game/types/quests/quest-type.ts b/resources/js/game/lib/game/types/quests/quest-type.ts
index 70ecf6dc2..88f11e79f 100755
--- a/resources/js/game/lib/game/types/quests/quest-type.ts
+++ b/resources/js/game/lib/game/types/quests/quest-type.ts
@@ -1,4 +1,4 @@
-import {QuestDetails} from "../../map/types/quest-details";
+import {QuestDetails} from "../../../../sections/map/types/quest-details";
 
 export default interface QuestType {
 
diff --git a/resources/js/game/sections/components/kingdoms/enemy-kingdom-pin.tsx b/resources/js/game/sections/components/kingdoms/enemy-kingdom-pin.tsx
index cf8c446a8..0d418f1ed 100755
--- a/resources/js/game/sections/components/kingdoms/enemy-kingdom-pin.tsx
+++ b/resources/js/game/sections/components/kingdoms/enemy-kingdom-pin.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import EnemyKingdomPinProps from "../../../lib/game/types/map/kingdom-pins/enemy-kingdom-pin-props";
+import EnemyKingdomPinProps from "../../map/types/map/kingdom-pins/enemy-kingdom-pin-props";
 
 export default class EnemyKingdomPin extends React.Component<EnemyKingdomPinProps, {}> {
 
diff --git a/resources/js/game/sections/components/kingdoms/enemy-kingdoms.tsx b/resources/js/game/sections/components/kingdoms/enemy-kingdoms.tsx
index 4833e128c..829056bf1 100755
--- a/resources/js/game/sections/components/kingdoms/enemy-kingdoms.tsx
+++ b/resources/js/game/sections/components/kingdoms/enemy-kingdoms.tsx
@@ -1,7 +1,7 @@
 import React, {Fragment} from "react";
 import EnemyKingdomPin from "./enemy-kingdom-pin";
-import KingdomProps from "../../../lib/game/types/map/kingdom-pins/kingdom-props";
-import KingdomState from "../../../lib/game/types/map/kingdom-pins/kingdom-state";
+import KingdomProps from "../../map/types/map/kingdom-pins/kingdom-props";
+import KingdomState from "../../map/types/map/kingdom-pins/kingdom-state";
 import {viewPortWatcher} from "../../../lib/view-port-watcher";
 import KingdomModal from "./modals/kingdom-modal";
 
diff --git a/resources/js/game/sections/components/kingdoms/kingdom-pin.tsx b/resources/js/game/sections/components/kingdoms/kingdom-pin.tsx
index e06c5102d..b4e9bcf94 100755
--- a/resources/js/game/sections/components/kingdoms/kingdom-pin.tsx
+++ b/resources/js/game/sections/components/kingdoms/kingdom-pin.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import KingdomPinProps from "../../../lib/game/types/map/kingdom-pins/kingdom-pin-props";
+import KingdomPinProps from "../../map/types/map/kingdom-pins/kingdom-pin-props";
 
 export default class KingdomPin extends React.Component<KingdomPinProps, any> {
 
diff --git a/resources/js/game/sections/components/kingdoms/kingdoms.tsx b/resources/js/game/sections/components/kingdoms/kingdoms.tsx
index 65525fe58..c772191c1 100755
--- a/resources/js/game/sections/components/kingdoms/kingdoms.tsx
+++ b/resources/js/game/sections/components/kingdoms/kingdoms.tsx
@@ -1,8 +1,8 @@
 import React, {Fragment} from "react";
-import KingdomProps from "../../../lib/game/types/map/kingdom-pins/kingdom-props";
+import KingdomProps from "../../map/types/map/kingdom-pins/kingdom-props";
 import KingdomPin from "./kingdom-pin";
 import KingdomModal from "./modals/kingdom-modal";
-import KingdomState from "../../../lib/game/types/map/kingdom-pins/kingdom-state";
+import KingdomState from "../../map/types/map/kingdom-pins/kingdom-state";
 import {viewPortWatcher} from "../../../lib/view-port-watcher";
 
 export default class Kingdoms extends React.Component<KingdomProps, KingdomState> {
diff --git a/resources/js/game/sections/components/kingdoms/modals/components/kingdom-details.tsx b/resources/js/game/sections/components/kingdoms/modals/components/kingdom-details.tsx
index ca5f26176..ec401b2a5 100755
--- a/resources/js/game/sections/components/kingdoms/modals/components/kingdom-details.tsx
+++ b/resources/js/game/sections/components/kingdoms/modals/components/kingdom-details.tsx
@@ -5,7 +5,7 @@ import {formatNumber, percent} from "../../../../../lib/game/format-number";
 import KingdomHelpModal from "../kingdom-help-modal";
 import KingdomTopSection from "./kingdom-top-section";
 import KingdomDetailsProps
-    from "../../../../../lib/game/types/map/kingdom-pins/modals/components/kingdom-details-props";
+    from "../../../../map/types/map/kingdom-pins/modals/components/kingdom-details-props";
 import ComponentLoading from "../../../../../components/ui/loading/component-loading";
 import PrimaryOutlineButton from "../../../../../components/ui/buttons/primary-outline-button";
 import LoadingProgressBar from "../../../../../components/ui/progress-bars/loading-progress-bar";
diff --git a/resources/js/game/sections/components/kingdoms/modals/components/kingdom-top-section.tsx b/resources/js/game/sections/components/kingdoms/modals/components/kingdom-top-section.tsx
index 38766bde3..6b5d2c43c 100755
--- a/resources/js/game/sections/components/kingdoms/modals/components/kingdom-top-section.tsx
+++ b/resources/js/game/sections/components/kingdoms/modals/components/kingdom-top-section.tsx
@@ -1,7 +1,7 @@
 import React, {Fragment} from "react";
 import {formatNumber} from "../../../../../lib/game/format-number";
 import KingdomTopSectionProps
-    from "../../../../../lib/game/types/map/kingdom-pins/modals/components/kingdom-top-section-props";
+    from "../../../../map/types/map/kingdom-pins/modals/components/kingdom-top-section-props";
 
 export default class KingdomTopSection extends React.Component<KingdomTopSectionProps, {}> {
     constructor(props: KingdomTopSectionProps) {
diff --git a/resources/js/game/sections/components/kingdoms/modals/kingdom-modal.tsx b/resources/js/game/sections/components/kingdoms/modals/kingdom-modal.tsx
index b8ff96a5f..e3276af68 100755
--- a/resources/js/game/sections/components/kingdoms/modals/kingdom-modal.tsx
+++ b/resources/js/game/sections/components/kingdoms/modals/kingdom-modal.tsx
@@ -1,12 +1,12 @@
 import React, {Fragment} from "react";
-import {fetchCost} from "../../../../lib/game/map/teleportion-costs";
+import {fetchCost} from "../../../map/lib/teleportion-costs";
 import Dialogue from "../../../../components/ui/dialogue/dialogue";
-import KingdomModalProps from "../../../../lib/game/types/map/kingdom-pins/modals/kingdom-modal-props";
-import KingdomModalState from "../../../../lib/game/types/map/kingdom-pins/modals/kingdom-modal-state";
+import KingdomModalProps from "../../../map/types/map/kingdom-pins/modals/kingdom-modal-props";
+import KingdomModalState from "../../../map/types/map/kingdom-pins/modals/kingdom-modal-state";
 import {formatNumber} from "../../../../lib/game/format-number";
 import clsx from "clsx";
 import WarningAlert from "../../../../components/ui/alerts/simple-alerts/warning-alert";
-import KingdomDetailsType from "../../../../lib/game/map/types/kingdom-details";
+import KingdomDetailsType from "../../../map/types/kingdom-details";
 import KingdomDetails from "./components/kingdom-details";
 
 export default class KingdomModal extends React.Component<KingdomModalProps, KingdomModalState> {
diff --git a/resources/js/game/sections/components/kingdoms/npc-kingdom-pin.tsx b/resources/js/game/sections/components/kingdoms/npc-kingdom-pin.tsx
index 95d31f751..46a1b3205 100755
--- a/resources/js/game/sections/components/kingdoms/npc-kingdom-pin.tsx
+++ b/resources/js/game/sections/components/kingdoms/npc-kingdom-pin.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import NpcKingdomPinProps from "../../../lib/game/types/map/kingdom-pins/npc-kingdom-pin-props";
+import NpcKingdomPinProps from "../../map/types/map/kingdom-pins/npc-kingdom-pin-props";
 
 export default class NpcKingdomPin extends React.Component<NpcKingdomPinProps, {}> {
 
diff --git a/resources/js/game/sections/components/kingdoms/npc-kingdoms.tsx b/resources/js/game/sections/components/kingdoms/npc-kingdoms.tsx
index 7b02d6749..ad39a7461 100755
--- a/resources/js/game/sections/components/kingdoms/npc-kingdoms.tsx
+++ b/resources/js/game/sections/components/kingdoms/npc-kingdoms.tsx
@@ -1,6 +1,6 @@
 import React, {Fragment} from "react";
 import NpcKingdomPin from "./npc-kingdom-pin";
-import NpcKingdomProps from "../../../lib/game/types/map/kingdom-pins/npc-kingdom-props";
+import NpcKingdomProps from "../../map/types/map/kingdom-pins/npc-kingdom-props";
 import {viewPortWatcher} from "../../../lib/view-port-watcher";
 import KingdomModal from "./modals/kingdom-modal";
 
diff --git a/resources/js/game/sections/components/locations/location-pin.tsx b/resources/js/game/sections/components/locations/location-pin.tsx
index 3cbd3bb93..41367fccb 100755
--- a/resources/js/game/sections/components/locations/location-pin.tsx
+++ b/resources/js/game/sections/components/locations/location-pin.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import LocationPinProps from "../../../lib/game/types/map/location-pins/location-pin-props";
+import LocationPinProps from "../../map/types/map/location-pins/location-pin-props";
 
 export default class LocationPin extends React.Component<LocationPinProps, {}> {
 
diff --git a/resources/js/game/sections/components/locations/location.tsx b/resources/js/game/sections/components/locations/location.tsx
index c2026e98c..050b6c2f8 100755
--- a/resources/js/game/sections/components/locations/location.tsx
+++ b/resources/js/game/sections/components/locations/location.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment, SyntheticEvent } from "react";
-import LocationProps from "../../../lib/game/types/map/location-pins/location-props";
+import LocationProps from "../../map/types/map/location-pins/location-props";
 import LocationPin from "./location-pin";
-import LocationState from "../../../lib/game/types/map/location-pins/location-state";
+import LocationState from "../../map/types/map/location-pins/location-state";
 import LocationModal from "./modals/location-modal";
 import { viewPortWatcher } from "../../../lib/view-port-watcher";
 
diff --git a/resources/js/game/sections/components/locations/modals/location-details.tsx b/resources/js/game/sections/components/locations/modals/location-details.tsx
index be5d8ea35..586e4731e 100755
--- a/resources/js/game/sections/components/locations/modals/location-details.tsx
+++ b/resources/js/game/sections/components/locations/modals/location-details.tsx
@@ -1,7 +1,7 @@
 import React, {Fragment} from "react";
 import {formatNumber} from "../../../../lib/game/format-number";
 import SpecialLocationHelpModal from "./special-location-help-modal";
-import LocationDetailsProps from "../../../../lib/game/types/map/location-pins/modals/location-details-props";
+import LocationDetailsProps from "../../../map/types/map/location-pins/modals/location-details-props";
 import Gems from '../../npc-actions/seer-actions/deffinitions/gems';
 
 export default class LocationDetails extends React.Component<LocationDetailsProps, any> {
diff --git a/resources/js/game/sections/components/locations/modals/location-modal.tsx b/resources/js/game/sections/components/locations/modals/location-modal.tsx
index 871ecebde..8f189365a 100755
--- a/resources/js/game/sections/components/locations/modals/location-modal.tsx
+++ b/resources/js/game/sections/components/locations/modals/location-modal.tsx
@@ -1,11 +1,11 @@
 import React, {Fragment} from "react";
 import Dialogue from "../../../../components/ui/dialogue/dialogue";
-import {LocationModalPros} from "../../../../lib/game/types/map/location-pins/modals/location-modal-pros";
-import {fetchCost} from "../../../../lib/game/map/teleportion-costs";
+import {LocationModalPros} from "../../../map/types/map/location-pins/modals/location-modal-pros";
+import {fetchCost} from "../../../map/lib/teleportion-costs";
 import {formatNumber} from "../../../../lib/game/format-number";
 import clsx from "clsx";
 import WarningAlert from "../../../../components/ui/alerts/simple-alerts/warning-alert";
-import LocationModalState from "../../../../lib/game/types/map/location-pins/modals/location-modal-state";
+import LocationModalState from "../../../map/types/map/location-pins/modals/location-modal-state";
 import SpecialLocationHelpModal from "./special-location-help-modal";
 import LocationDetails from "./location-details";
 
diff --git a/resources/js/game/sections/components/quests/components/quest-node.tsx b/resources/js/game/sections/components/quests/components/quest-node.tsx
index acd07170c..5822bed19 100755
--- a/resources/js/game/sections/components/quests/components/quest-node.tsx
+++ b/resources/js/game/sections/components/quests/components/quest-node.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import QuestNodeProps from "../../../../lib/game/types/map/quests/quest-node-props";
+import QuestNodeProps from "../../../map/types/map/quests/quest-node-props";
 import QuestDetailsModal from "../modals/quest-details-modal";
 import clsx from "clsx";
 
diff --git a/resources/js/game/sections/components/quests/components/quest-tree.tsx b/resources/js/game/sections/components/quests/components/quest-tree.tsx
index 9b919cc2e..d64ebe7f2 100755
--- a/resources/js/game/sections/components/quests/components/quest-tree.tsx
+++ b/resources/js/game/sections/components/quests/components/quest-tree.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import {Tree, TreeNode} from "react-organizational-chart";
-import QuestTreeProps from "../../../../lib/game/types/map/quests/quest-tree-props";
+import QuestTreeProps from "../../../map/types/map/quests/quest-tree-props";
 import QuestNode from "./quest-node";
-import {QuestDetails} from "../../../../lib/game/map/types/quest-details";
-import {ChildQuestDetails} from "../../../../lib/game/map/types/child-quest-details";
+import {QuestDetails} from "../../../map/types/quest-details";
+import {ChildQuestDetails} from "../../../map/types/child-quest-details";
 import Tabs from "../../../../components/ui/tabs/tabs";
 import TabPanel from "../../../../components/ui/tabs/tab-panel";
 
diff --git a/resources/js/game/sections/components/quests/quests.tsx b/resources/js/game/sections/components/quests/quests.tsx
index 4f8b471e1..b1a4f5ce2 100755
--- a/resources/js/game/sections/components/quests/quests.tsx
+++ b/resources/js/game/sections/components/quests/quests.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from "react";
-import QuestsProps from "../../../lib/game/types/map/quests/quests-props";
-import QuestState from "../../../lib/game/types/map/quests/quest-state";
+import QuestsProps from "../../map/types/map/quests/quests-props";
+import QuestState from "../../map/types/map/quests/quest-state";
 import ComponentLoading from "../../../components/ui/loading/component-loading";
 import QuestTree from "./components/quest-tree";
 import DropDown from "../../../components/ui/drop-down/drop-down";
diff --git a/resources/js/game/sections/game-actions-section/components/small-actions/types/small-map-section-props.ts b/resources/js/game/sections/game-actions-section/components/small-actions/types/small-map-section-props.ts
index 5294bf423..da2a42bc0 100755
--- a/resources/js/game/sections/game-actions-section/components/small-actions/types/small-map-section-props.ts
+++ b/resources/js/game/sections/game-actions-section/components/small-actions/types/small-map-section-props.ts
@@ -1,7 +1,7 @@
 import { CharacterType } from "../../../../../lib/game/character/character-type";
 import MapState from "../../../../map/types/map-state";
 import CharacterCurrenciesDetails from "../../../../../lib/game/types/character-currencies-details";
-import PositionType from "../../../../../lib/game/types/map/position-type";
+import PositionType from "../../../../map/types/map/position-type";
 import { MapTimerData } from "../../../../../lib/game/types/game-state";
 
 export default interface SmallMapSectionProps {
diff --git a/resources/js/game/sections/game-actions-section/types/actions-props.ts b/resources/js/game/sections/game-actions-section/types/actions-props.ts
index 4f9be42ba..27cfe21b4 100755
--- a/resources/js/game/sections/game-actions-section/types/actions-props.ts
+++ b/resources/js/game/sections/game-actions-section/types/actions-props.ts
@@ -1,6 +1,6 @@
 import {CharacterType} from "../../../lib/game/character/character-type";
 import CharacterStatusType from "../../../lib/game/character/character-status-type";
-import PositionType from "../../../lib/game/types/map/position-type";
+import PositionType from "../../map/types/map/position-type";
 import { GameActionState } from "../../../lib/game/types/game-state";
 
 export default interface ActionsProps {
diff --git a/resources/js/game/sections/game-actions-section/types/small-actions-props.ts b/resources/js/game/sections/game-actions-section/types/small-actions-props.ts
index ee3a54d2e..bb66b146b 100755
--- a/resources/js/game/sections/game-actions-section/types/small-actions-props.ts
+++ b/resources/js/game/sections/game-actions-section/types/small-actions-props.ts
@@ -1,6 +1,6 @@
 import CharacterCurrenciesDetails from "../../../lib/game/types/character-currencies-details";
 import ActionsProps from "./actions-props";
-import PositionType from "../../../lib/game/types/map/position-type";
+import PositionType from "../../map/types/map/position-type";
 import MapState from "../../map/types/map-state";
 import { MapTimerData } from "../../../lib/game/types/game-state";
 
diff --git a/resources/js/game/sections/kingdoms/buildings/buildings-table.tsx b/resources/js/game/sections/kingdoms/buildings/buildings-table.tsx
index 845fb8bb8..79c8acb6a 100755
--- a/resources/js/game/sections/kingdoms/buildings/buildings-table.tsx
+++ b/resources/js/game/sections/kingdoms/buildings/buildings-table.tsx
@@ -2,7 +2,7 @@ import React, {Fragment} from "react";
 import Table from "../../../components/ui/data-tables/table";
 import BuildingDetails from "../../../lib/game/kingdoms/building-details";
 import {buildBuildingsColumns} from "../../../lib/game/kingdoms/build-buildings-columns";
-import BuildingsTableProps from "resources/js/game/lib/game/kingdoms/types/buildings-table-props";
+import BuildingsTableProps from "../../../lib/game/kingdoms/types/buildings-table-props";
 import {AxiosError, AxiosResponse} from "axios";
 import Ajax from "../../../lib/ajax/ajax";
 import LoadingProgressBar from "../../../components/ui/progress-bars/loading-progress-bar";
diff --git a/resources/js/game/sections/kingdoms/units/units-table.tsx b/resources/js/game/sections/kingdoms/units/units-table.tsx
index 5d1f416eb..19bdc1ccd 100755
--- a/resources/js/game/sections/kingdoms/units/units-table.tsx
+++ b/resources/js/game/sections/kingdoms/units/units-table.tsx
@@ -9,7 +9,7 @@ import DangerAlert from "../../../components/ui/alerts/simple-alerts/danger-aler
 import SuccessAlert from "../../../components/ui/alerts/simple-alerts/success-alert";
 import LoadingProgressBar from "../../../components/ui/progress-bars/loading-progress-bar";
 import UpgradeTablesState from "../../../lib/game/kingdoms/types/upgrade-tables-state";
-import BuildingDetails from "resources/js/game/lib/game/kingdoms/building-details";
+import BuildingDetails from "../../../lib/game/kingdoms/building-details";
 
 export default class UnitsTable extends React.Component<UnitsTableProps, UpgradeTablesState> {
 
diff --git a/resources/js/game/sections/map/actions/directional-movement.tsx b/resources/js/game/sections/map/actions/directional-movement.tsx
index 01e28a276..466bb48ea 100755
--- a/resources/js/game/sections/map/actions/directional-movement.tsx
+++ b/resources/js/game/sections/map/actions/directional-movement.tsx
@@ -1,9 +1,9 @@
 import React, {Fragment} from "react";
-import MovePlayer from "../../../lib/game/map/ajax/move-player";
+import MovePlayer from "../lib/ajax/move-player";
 import PrimaryOutlineButton from "../../../components/ui/buttons/primary-outline-button";
-import TraverseModal from "../../components/map-actions/modals/traverse-modal";
-import DirectionalMovementProps from "../../../lib/game/map/types/directional-movement-props";
-import DirectionalMovementState from "../../../lib/game/map/types/directional-movement-state";
+import TraverseModal from "../modals/traverse-modal";
+import DirectionalMovementProps from "../types/directional-movement-props";
+import DirectionalMovementState from "../types/directional-movement-state";
 import clsx from "clsx";
 
 export default class DirectionalMovement extends React.Component<DirectionalMovementProps, DirectionalMovementState> {
diff --git a/resources/js/game/sections/map/actions/map-actions.tsx b/resources/js/game/sections/map/actions/map-actions.tsx
index a0f8bce9b..5308c595e 100755
--- a/resources/js/game/sections/map/actions/map-actions.tsx
+++ b/resources/js/game/sections/map/actions/map-actions.tsx
@@ -1,16 +1,16 @@
 import React, { Fragment } from "react";
 import PrimaryOutlineButton from "../../../components/ui/buttons/primary-outline-button";
-import MapActionsProps from "../../../lib/game/map/types/map-actions-props";
-import { canSettleHere } from "../../../lib/game/map/location-helpers";
-import MapActionsState from "../../../lib/game/map/types/map-actions-state";
-import ViewLocationState from "../../../lib/game/map/state/view-location-state";
-import TeleportModal from "../../components/map-actions/modals/teleport-modal";
-import MovePlayer from "../../../lib/game/map/ajax/move-player";
-import SetSailModal from "../../components/map-actions/modals/set-sail-modal";
-import LocationDetails from "../../../lib/game/map/types/location-details";
-import Conjuration from "../../components/map-actions/modals/conjuration";
-import SettleKingdomModal from "../../components/map-actions/modals/settle-kingdom-modal";
-import ViewLocationModal from "../../components/map-actions/modals/view-location-modal";
+import MapActionsProps from "../types/map-actions-props";
+import { canSettleHere } from "../lib/location-helpers";
+import MapActionsState from "../types/map-actions-state";
+import ViewLocationState from "../lib/state/view-location-state";
+import TeleportModal from "../modals/teleport-modal";
+import MovePlayer from "../lib/ajax/move-player";
+import SetSailModal from "../modals/set-sail-modal";
+import LocationDetails from "../types/location-details";
+import Conjuration from "../modals/conjuration";
+import SettleKingdomModal from "../modals/settle-kingdom-modal";
+import ViewLocationModal from "../modals/view-location-modal";
 
 export default class MapActions extends React.Component<
     MapActionsProps,
diff --git a/resources/js/game/sections/map/helpers/merge-locations.ts b/resources/js/game/sections/map/helpers/merge-locations.ts
index 2ca4c2446..5aa3f1283 100644
--- a/resources/js/game/sections/map/helpers/merge-locations.ts
+++ b/resources/js/game/sections/map/helpers/merge-locations.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../../lib/game/map/types/location-details";
+import LocationDetails from "../types/location-details";
 
 const mergeLocations = (locations: LocationDetails[], locationsToMerge: LocationDetails[]): LocationDetails[] => {
     const mergedMap = new Map<number, LocationDetails>();
diff --git a/resources/js/game/lib/game/map/ajax/move-player.ts b/resources/js/game/sections/map/lib/ajax/move-player.ts
similarity index 92%
rename from resources/js/game/lib/game/map/ajax/move-player.ts
rename to resources/js/game/sections/map/lib/ajax/move-player.ts
index 9dd52ff5a..1b210cc8c 100755
--- a/resources/js/game/lib/game/map/ajax/move-player.ts
+++ b/resources/js/game/sections/map/lib/ajax/move-player.ts
@@ -1,13 +1,13 @@
 import {Component} from "react";
 import {movePlayer} from "../move-player";
-import {generateServerMessage} from "../../../ajax/generate-server-message";
-import Ajax from "../../../ajax/ajax";
+import {generateServerMessage} from "../../../../lib/ajax/generate-server-message";
+import Ajax from "../../../../lib/ajax/ajax";
 import {AxiosError, AxiosResponse} from "axios";
 import MapStateManager from "../state/map-state-manager";
 import {getPortLocation} from "../location-helpers";
 import {getNewXPosition, getNewYPosition} from "../map-position";
-import DirectionalMovement from "../../../../sections/map/actions/directional-movement";
-import MapActions from "../../../../sections/map/actions/map-actions";
+import DirectionalMovement from "../../actions/directional-movement";
+import MapActions from "../../actions/map-actions";
 import MapData from "../request-types/MapData";
 
 export default class MovePlayer {
diff --git a/resources/js/game/lib/game/map/location-helpers.ts b/resources/js/game/sections/map/lib/location-helpers.ts
similarity index 91%
rename from resources/js/game/lib/game/map/location-helpers.ts
rename to resources/js/game/sections/map/lib/location-helpers.ts
index 710d0a4b1..41de32bc6 100755
--- a/resources/js/game/lib/game/map/location-helpers.ts
+++ b/resources/js/game/sections/map/lib/location-helpers.ts
@@ -1,8 +1,8 @@
-import MapState from "../../../sections/map/types/map-state";
-import LocationDetails from "./types/location-details";
+import MapState from "../types/map-state";
+import LocationDetails from "../types/location-details";
 import PlayerKingdomsDetails from "../types/map/player-kingdoms-details";
 import NpcKingdomsDetails from "../types/map/npc-kingdoms-details";
-import MapActions from "../../../sections/map/actions/map-actions";
+import MapActions from "../actions/map-actions";
 
 /**
  * Gets the current port that the player is on.
diff --git a/resources/js/game/lib/game/map/map-management.ts b/resources/js/game/sections/map/lib/map-management.ts
similarity index 94%
rename from resources/js/game/lib/game/map/map-management.ts
rename to resources/js/game/sections/map/lib/map-management.ts
index 273437fc1..25da3e844 100755
--- a/resources/js/game/lib/game/map/map-management.ts
+++ b/resources/js/game/sections/map/lib/map-management.ts
@@ -1,4 +1,4 @@
-import MapSection from "../../../sections/map/map-section";
+import MapSection from "../map-section";
 
 /**
  * Fetches the player icon position for the map component.
diff --git a/resources/js/game/lib/game/map/map-position.ts b/resources/js/game/sections/map/lib/map-position.ts
similarity index 97%
rename from resources/js/game/lib/game/map/map-position.ts
rename to resources/js/game/sections/map/lib/map-position.ts
index d3d5835bd..ccdc9b24d 100755
--- a/resources/js/game/lib/game/map/map-position.ts
+++ b/resources/js/game/sections/map/lib/map-position.ts
@@ -5,7 +5,7 @@
  * @param mapPositionY
  * @type [{characterY: number, mapPositionY: number}]
  */
-import MapSection from "../../../sections/map/map-section";
+import MapSection from "../map-section";
 
 export const getNewYPosition = (characterY: number, mapPositionY: number, viewPort: number): number => {
     if (characterY < 288) {
diff --git a/resources/js/game/lib/game/map/move-player.ts b/resources/js/game/sections/map/lib/move-player.ts
similarity index 93%
rename from resources/js/game/lib/game/map/move-player.ts
rename to resources/js/game/sections/map/lib/move-player.ts
index 8756b2bec..0053ea189 100755
--- a/resources/js/game/lib/game/map/move-player.ts
+++ b/resources/js/game/sections/map/lib/move-player.ts
@@ -1,4 +1,4 @@
-import {generateServerMessage} from "../../ajax/generate-server-message";
+import {generateServerMessage} from "../../../lib/ajax/generate-server-message";
 
 /**
  * Move the player in a direction.
diff --git a/resources/js/game/lib/game/map/request-types/MapData.ts b/resources/js/game/sections/map/lib/request-types/MapData.ts
similarity index 77%
rename from resources/js/game/lib/game/map/request-types/MapData.ts
rename to resources/js/game/sections/map/lib/request-types/MapData.ts
index 6c3fa77d2..c71842445 100755
--- a/resources/js/game/lib/game/map/request-types/MapData.ts
+++ b/resources/js/game/sections/map/lib/request-types/MapData.ts
@@ -1,5 +1,5 @@
-import CharacterMapDetails from "../types/character-map-details";
-import LocationDetails from "../types/location-details";
+import CharacterMapDetails from "../../types/character-map-details";
+import LocationDetails from "../../types/location-details";
 
 export default interface MapData {
     can_move: boolean;
diff --git a/resources/js/game/lib/game/map/state/manage-teleport-modal-state.ts b/resources/js/game/sections/map/lib/state/manage-teleport-modal-state.ts
similarity index 95%
rename from resources/js/game/lib/game/map/state/manage-teleport-modal-state.ts
rename to resources/js/game/sections/map/lib/state/manage-teleport-modal-state.ts
index 52e27b39d..81006073f 100755
--- a/resources/js/game/lib/game/map/state/manage-teleport-modal-state.ts
+++ b/resources/js/game/sections/map/lib/state/manage-teleport-modal-state.ts
@@ -1,5 +1,5 @@
-import TeleportModal from "../../../../sections/components/map-actions/modals/teleport-modal";
-import LocationDetails from "../types/location-details";
+import TeleportModal from "../../modals/teleport-modal";
+import LocationDetails from "../../types/location-details";
 import PlayerKingdomsDetails from "../../types/map/player-kingdoms-details";
 import NpcKingdomsDetails from "../../types/map/npc-kingdoms-details";
 
diff --git a/resources/js/game/lib/game/map/state/map-state-manager.ts b/resources/js/game/sections/map/lib/state/map-state-manager.ts
similarity index 97%
rename from resources/js/game/lib/game/map/state/map-state-manager.ts
rename to resources/js/game/sections/map/lib/state/map-state-manager.ts
index 2e5d900de..1045feb24 100755
--- a/resources/js/game/lib/game/map/state/map-state-manager.ts
+++ b/resources/js/game/sections/map/lib/state/map-state-manager.ts
@@ -1,10 +1,10 @@
-import MapState from "../../../../sections/map/types/map-state";
+import MapState from "../../types/map-state";
 import { DateTime } from "luxon";
 import MapData from "../request-types/MapData";
 import { getPortLocation } from "../location-helpers";
 import { getNewXPosition, getNewYPosition } from "../map-position";
 import Game from "../../../../game";
-import MapSection from "../../../../sections/map/map-section";
+import MapSection from "../../map-section";
 
 export default class MapStateManager {
 
diff --git a/resources/js/game/lib/game/map/state/view-location-state.ts b/resources/js/game/sections/map/lib/state/view-location-state.ts
similarity index 98%
rename from resources/js/game/lib/game/map/state/view-location-state.ts
rename to resources/js/game/sections/map/lib/state/view-location-state.ts
index 8e67c1180..ef6bf060e 100755
--- a/resources/js/game/lib/game/map/state/view-location-state.ts
+++ b/resources/js/game/sections/map/lib/state/view-location-state.ts
@@ -1,5 +1,5 @@
-import MapActions from "../../../../sections/map/actions/map-actions";
-import LocationDetails from "../types/location-details";
+import MapActions from "../../actions/map-actions";
+import LocationDetails from "../../types/location-details";
 import PlayerKingdomsDetails from "../../types/map/player-kingdoms-details";
 import NpcKingdomsDetails from "../../types/map/npc-kingdoms-details";
 
diff --git a/resources/js/game/lib/game/map/teleportion-costs.ts b/resources/js/game/sections/map/lib/teleportion-costs.ts
similarity index 93%
rename from resources/js/game/lib/game/map/teleportion-costs.ts
rename to resources/js/game/sections/map/lib/teleportion-costs.ts
index 4bc4dc17a..7c92cff16 100755
--- a/resources/js/game/lib/game/map/teleportion-costs.ts
+++ b/resources/js/game/sections/map/lib/teleportion-costs.ts
@@ -13,8 +13,8 @@
  *     time_out: number,
  * }
  */
-import CharacterCurrenciesDetails from "../types/character-currencies-details";
-import {removeCommas} from "../format-number";
+import CharacterCurrenciesDetails from "../../../lib/game/types/character-currencies-details";
+import {removeCommas} from "../../../lib/game/format-number";
 
 export const fetchCost = (xPosition: number, yPosition: number, characterPosition?: {x: number, y: number}, currencies?: CharacterCurrenciesDetails): {
     can_afford: boolean,
diff --git a/resources/js/game/sections/map/map-section.tsx b/resources/js/game/sections/map/map-section.tsx
index 93e06dd87..560ab1683 100755
--- a/resources/js/game/sections/map/map-section.tsx
+++ b/resources/js/game/sections/map/map-section.tsx
@@ -1,24 +1,24 @@
 import React, { Fragment } from "react";
 import Snowfall from 'react-snowfall'
-import { dragMap, fetchLeftBounds } from "../../lib/game/map/map-position";
-import MapProps from "../../lib/game/types/map/map-props";
+import { dragMap, fetchLeftBounds } from "./lib/map-position";
+import MapProps from "./types/map/map-props";
 import Location from "../components/locations/location";
 import Kingdoms from "../components/kingdoms/kingdoms";
 import EnemyKingdoms from "../components/kingdoms/enemy-kingdoms";
-import MovePlayer from "../../lib/game/map/ajax/move-player";
-import MapStateManager from "../../lib/game/map/state/map-state-manager";
+import MovePlayer from "./lib/ajax/move-player";
+import MapStateManager from "./lib/state/map-state-manager";
 import NpcKingdoms from "../components/kingdoms/npc-kingdoms";
 import ComponentLoading from "../../components/ui/loading/component-loading";
-import MapData from "../../lib/game/map/request-types/MapData";
+import MapData from "./lib/request-types/MapData";
 import {
     getStyle,
     playerIconPosition,
-} from "../../lib/game/map/map-management";
+} from "./lib/map-management";
 import MapTimer from "./map-timer";
 import DirectionalMovement from "./actions/directional-movement";
 import MapActions from "./actions/map-actions";
-import NpcKingdomsDetails from "../../lib/game/types/map/npc-kingdoms-details";
-import PlayerKingdomsDetails from "../../lib/game/types/map/player-kingdoms-details";
+import NpcKingdomsDetails from "./types/map/npc-kingdoms-details";
+import PlayerKingdomsDetails from "./types/map/player-kingdoms-details";
 import clsx from "clsx";
 // @ts-ignore
 import Draggable from "react-draggable/build/web/react-draggable.min";
diff --git a/resources/js/game/sections/map/map-timer.tsx b/resources/js/game/sections/map/map-timer.tsx
index 9a2037b8b..c2ad47421 100755
--- a/resources/js/game/sections/map/map-timer.tsx
+++ b/resources/js/game/sections/map/map-timer.tsx
@@ -1,6 +1,6 @@
 import React, {Fragment} from "react";
 import TimerProgressBar from "../../components/ui/progress-bars/timer-progress-bar";
-import MapTimerProps from "../../lib/game/map/types/map-timer-props";
+import MapTimerProps from "./types/map-timer-props";
 
 export default class MapTimer extends React.Component<MapTimerProps, {}> {
 
diff --git a/resources/js/game/sections/components/map-actions/modals/components/view-details/kingdom-details.tsx b/resources/js/game/sections/map/modals/components/view-details/kingdom-details.tsx
similarity index 83%
rename from resources/js/game/sections/components/map-actions/modals/components/view-details/kingdom-details.tsx
rename to resources/js/game/sections/map/modals/components/view-details/kingdom-details.tsx
index 607d2afd6..28f4e2b19 100755
--- a/resources/js/game/sections/components/map-actions/modals/components/view-details/kingdom-details.tsx
+++ b/resources/js/game/sections/map/modals/components/view-details/kingdom-details.tsx
@@ -1,9 +1,9 @@
 import React from "react";
-import KingdomDetailsType from "../../../../../../lib/game/map/types/kingdom-details";
-import Dialogue from "../../../../../../components/ui/dialogue/dialogue";
-import KingdomDetailsProps from "../../../../../../lib/game/types/map/modals/components/view-details/kingdom-details-props";
-import KingdomDetailsState from "../../../../../../lib/game/types/map/modals/components/view-details/kingdom-details-state";
-import KingdomDetailInfo from '../../../../kingdoms/modals/components/kingdom-details'
+import KingdomDetailsType from "../../../types/kingdom-details";
+import Dialogue from "../../../../../components/ui/dialogue/dialogue";
+import KingdomDetailsProps from "../../../types/map/modals/components/view-details/kingdom-details-props";
+import KingdomDetailsState from "../../../types/map/modals/components/view-details/kingdom-details-state";
+import KingdomDetailInfo from '../../../../components/kingdoms/modals/components/kingdom-details'
 
 export default class KingdomDetails extends React.Component<KingdomDetailsProps, KingdomDetailsState> {
     constructor(props: KingdomDetailsProps) {
diff --git a/resources/js/game/sections/components/map-actions/modals/components/view-details/location-details.tsx b/resources/js/game/sections/map/modals/components/view-details/location-details.tsx
similarity index 71%
rename from resources/js/game/sections/components/map-actions/modals/components/view-details/location-details.tsx
rename to resources/js/game/sections/map/modals/components/view-details/location-details.tsx
index 1a39e5cc9..664e02182 100755
--- a/resources/js/game/sections/components/map-actions/modals/components/view-details/location-details.tsx
+++ b/resources/js/game/sections/map/modals/components/view-details/location-details.tsx
@@ -1,8 +1,8 @@
 import React from "react";
-import Dialogue from "../../../../../../components/ui/dialogue/dialogue";
+import Dialogue from "../../../../../components/ui/dialogue/dialogue";
 import LocationDetailsProps
-    from "../../../../../../lib/game/types/map/modals/components/view-details/location-details-props";
-import LocationInformation from '../../../../../components/locations/modals/location-details';
+    from "../../../types/map/modals/components/view-details/location-details-props";
+import LocationInformation from '../../../../components/locations/modals/location-details';
 
 export default class LocationDetails extends React.Component<LocationDetailsProps, any> {
     constructor(props: LocationDetailsProps) {
diff --git a/resources/js/game/sections/components/map-actions/modals/conjuration.tsx b/resources/js/game/sections/map/modals/conjuration.tsx
similarity index 90%
rename from resources/js/game/sections/components/map-actions/modals/conjuration.tsx
rename to resources/js/game/sections/map/modals/conjuration.tsx
index b2ec7fc2f..a7f09de8d 100755
--- a/resources/js/game/sections/components/map-actions/modals/conjuration.tsx
+++ b/resources/js/game/sections/map/modals/conjuration.tsx
@@ -1,15 +1,15 @@
 import React, {Fragment} from "react";
-import Dialogue from "../../../../components/ui/dialogue/dialogue";
+import Dialogue from "../../../components/ui/dialogue/dialogue";
 import {AxiosError, AxiosResponse} from "axios";
-import Ajax from "../../../../lib/ajax/ajax";
-import ComponentLoading from "../../../../components/ui/loading/component-loading";
+import Ajax from "../../../lib/ajax/ajax";
+import ComponentLoading from "../../../components/ui/loading/component-loading";
 import Select from "react-select";
-import {formatNumber} from "../../../../lib/game/format-number";
-import DangerAlert from "../../../../components/ui/alerts/simple-alerts/danger-alert";
-import LoadingProgressBar from "../../../../components/ui/progress-bars/loading-progress-bar";
-import ConjureModalProps from "../../../../lib/game/types/map/modals/conjure-modal-props";
-import ConjureModalState from "../../../../lib/game/types/map/modals/conjure-modal-state";
-import CelestialType from "../../../../lib/game/types/actions/monster/celestial-type";
+import {formatNumber} from "../../../lib/game/format-number";
+import DangerAlert from "../../../components/ui/alerts/simple-alerts/danger-alert";
+import LoadingProgressBar from "../../../components/ui/progress-bars/loading-progress-bar";
+import ConjureModalProps from "../types/map/modals/conjure-modal-props";
+import ConjureModalState from "../types/map/modals/conjure-modal-state";
+import CelestialType from "../../../lib/game/types/actions/monster/celestial-type";
 
 
 export default class Conjuration extends React.Component<ConjureModalProps, ConjureModalState> {
diff --git a/resources/js/game/sections/components/map-actions/modals/purchase-npc-kingdom.tsx b/resources/js/game/sections/map/modals/purchase-npc-kingdom.tsx
similarity index 85%
rename from resources/js/game/sections/components/map-actions/modals/purchase-npc-kingdom.tsx
rename to resources/js/game/sections/map/modals/purchase-npc-kingdom.tsx
index efc1ed0e1..5c3041a6d 100755
--- a/resources/js/game/sections/components/map-actions/modals/purchase-npc-kingdom.tsx
+++ b/resources/js/game/sections/map/modals/purchase-npc-kingdom.tsx
@@ -1,12 +1,12 @@
 import React from "react";
-import Dialogue from "../../../../components/ui/dialogue/dialogue";
-import SettleKingdomModalProps from "../../../../lib/game/types/map/modals/settle-kingdom-modal-props";
+import Dialogue from "../../../components/ui/dialogue/dialogue";
+import SettleKingdomModalProps from "../types/map/modals/settle-kingdom-modal-props";
 import {AxiosError, AxiosResponse} from "axios";
-import Ajax from "../../../../lib/ajax/ajax";
-import LoadingProgressBar from "../../../../components/ui/progress-bars/loading-progress-bar";
-import DangerAlert from "../../../../components/ui/alerts/simple-alerts/danger-alert";
-import SuccessAlert from "../../../../components/ui/alerts/simple-alerts/success-alert";
-import PurchaseNpcKingdomModalProps from "../../../../lib/game/types/map/modals/purchase-npc-kingdom-modal-props";
+import Ajax from "../../../lib/ajax/ajax";
+import LoadingProgressBar from "../../../components/ui/progress-bars/loading-progress-bar";
+import DangerAlert from "../../../components/ui/alerts/simple-alerts/danger-alert";
+import SuccessAlert from "../../../components/ui/alerts/simple-alerts/success-alert";
+import PurchaseNpcKingdomModalProps from "../types/map/modals/purchase-npc-kingdom-modal-props";
 
 
 export default class PurchaseNpcKingdom extends React.Component<PurchaseNpcKingdomModalProps, any> {
diff --git a/resources/js/game/sections/components/map-actions/modals/set-sail-modal.tsx b/resources/js/game/sections/map/modals/set-sail-modal.tsx
similarity index 90%
rename from resources/js/game/sections/components/map-actions/modals/set-sail-modal.tsx
rename to resources/js/game/sections/map/modals/set-sail-modal.tsx
index bf0b07c07..326b5e5f0 100755
--- a/resources/js/game/sections/components/map-actions/modals/set-sail-modal.tsx
+++ b/resources/js/game/sections/map/modals/set-sail-modal.tsx
@@ -1,13 +1,13 @@
 import React from "react";
-import Dialogue from "../../../../components/ui/dialogue/dialogue";
+import Dialogue from "../../../components/ui/dialogue/dialogue";
 import Select from "react-select";
 import clsx from "clsx";
-import {formatNumber} from "../../../../lib/game/format-number";
-import SetSailModalProps from "../../../../lib/game/types/map/modals/set-sail-modal-props";
-import SetSailModalState from "../../../../lib/game/types/map/modals/set-sail-modal-state";
-import {viewPortWatcher} from "../../../../lib/view-port-watcher";
+import {formatNumber} from "../../../lib/game/format-number";
+import SetSailModalProps from "../types/map/modals/set-sail-modal-props";
+import SetSailModalState from "../types/map/modals/set-sail-modal-state";
+import {viewPortWatcher} from "../../../lib/view-port-watcher";
 import TeleportHelpModal from "./teleport-help-modal";
-import SetSailComponent from "../../../../lib/game/map/components/set-sail-component";
+import SetSailComponent from "../types/set-sail-component";
 
 export default class SetSailModal extends React.Component<SetSailModalProps, SetSailModalState> {
 
diff --git a/resources/js/game/sections/components/map-actions/modals/settle-kingdom-modal.tsx b/resources/js/game/sections/map/modals/settle-kingdom-modal.tsx
similarity index 86%
rename from resources/js/game/sections/components/map-actions/modals/settle-kingdom-modal.tsx
rename to resources/js/game/sections/map/modals/settle-kingdom-modal.tsx
index 343847db4..e4acad8ab 100755
--- a/resources/js/game/sections/components/map-actions/modals/settle-kingdom-modal.tsx
+++ b/resources/js/game/sections/map/modals/settle-kingdom-modal.tsx
@@ -1,12 +1,12 @@
 import React from "react";
-import Dialogue from "../../../../components/ui/dialogue/dialogue";
-import SettleKingdomModalProps from "../../../../lib/game/types/map/modals/settle-kingdom-modal-props";
+import Dialogue from "../../../components/ui/dialogue/dialogue";
+import SettleKingdomModalProps from "../types/map/modals/settle-kingdom-modal-props";
 import {AxiosError, AxiosResponse} from "axios";
-import Ajax from "../../../../lib/ajax/ajax";
-import LoadingProgressBar from "../../../../components/ui/progress-bars/loading-progress-bar";
-import DangerAlert from "../../../../components/ui/alerts/simple-alerts/danger-alert";
-import SuccessAlert from "../../../../components/ui/alerts/simple-alerts/success-alert";
-import SettleKingdomModalState from "../../../../lib/game/types/map/modals/settle-kingdom-modal-state";
+import Ajax from "../../../lib/ajax/ajax";
+import LoadingProgressBar from "../../../components/ui/progress-bars/loading-progress-bar";
+import DangerAlert from "../../../components/ui/alerts/simple-alerts/danger-alert";
+import SuccessAlert from "../../../components/ui/alerts/simple-alerts/success-alert";
+import SettleKingdomModalState from "../types/map/modals/settle-kingdom-modal-state";
 
 
 export default class SettleKingdomModal extends React.Component<SettleKingdomModalProps, SettleKingdomModalState> {
diff --git a/resources/js/game/sections/components/map-actions/modals/teleport-help-modal.tsx b/resources/js/game/sections/map/modals/teleport-help-modal.tsx
similarity index 93%
rename from resources/js/game/sections/components/map-actions/modals/teleport-help-modal.tsx
rename to resources/js/game/sections/map/modals/teleport-help-modal.tsx
index 6536f8779..dfa897d2d 100755
--- a/resources/js/game/sections/components/map-actions/modals/teleport-help-modal.tsx
+++ b/resources/js/game/sections/map/modals/teleport-help-modal.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import HelpDialogue from "../../../../components/ui/dialogue/help-dialogue";
+import HelpDialogue from "../../../components/ui/dialogue/help-dialogue";
 
 export default class TeleportHelpModal extends React.Component<any, any> {
     constructor(props: any) {
diff --git a/resources/js/game/sections/components/map-actions/modals/teleport-modal.tsx b/resources/js/game/sections/map/modals/teleport-modal.tsx
similarity index 94%
rename from resources/js/game/sections/components/map-actions/modals/teleport-modal.tsx
rename to resources/js/game/sections/map/modals/teleport-modal.tsx
index 9f0a12e9b..0989b27ad 100755
--- a/resources/js/game/sections/components/map-actions/modals/teleport-modal.tsx
+++ b/resources/js/game/sections/map/modals/teleport-modal.tsx
@@ -1,14 +1,14 @@
 import React from "react";
-import Dialogue from "../../../../components/ui/dialogue/dialogue";
-import TeleportModalProps from "../../../../lib/game/types/map/modals/teleport-modal-props";
+import Dialogue from "../../../components/ui/dialogue/dialogue";
+import TeleportModalProps from "../types/map/modals/teleport-modal-props";
 import Select from "react-select";
 import clsx from "clsx";
-import {formatNumber} from "../../../../lib/game/format-number";
-import {viewPortWatcher} from "../../../../lib/view-port-watcher";
+import {formatNumber} from "../../../lib/game/format-number";
+import {viewPortWatcher} from "../../../lib/view-port-watcher";
 import TeleportHelpModal from "./teleport-help-modal";
-import ManageTeleportModalState from "../../../../lib/game/map/state/manage-teleport-modal-state";
-import TeleportModalState from "../../../../lib/game/types/map/modals/teleport-modal-state";
-import TeleportComponent from "../../../../lib/game/map/components/teleport-component";
+import ManageTeleportModalState from "../lib/state/manage-teleport-modal-state";
+import TeleportModalState from "../types/map/modals/teleport-modal-state";
+import TeleportComponent from "../types/teleport-component";
 
 export default class TeleportModal extends React.Component<TeleportModalProps, TeleportModalState> {
 
diff --git a/resources/js/game/sections/components/map-actions/modals/traverse-modal.tsx b/resources/js/game/sections/map/modals/traverse-modal.tsx
similarity index 95%
rename from resources/js/game/sections/components/map-actions/modals/traverse-modal.tsx
rename to resources/js/game/sections/map/modals/traverse-modal.tsx
index c00cadb57..c10255c24 100755
--- a/resources/js/game/sections/components/map-actions/modals/traverse-modal.tsx
+++ b/resources/js/game/sections/map/modals/traverse-modal.tsx
@@ -1,10 +1,10 @@
 import React, {Fragment} from "react";
-import Dialogue from "../../../../components/ui/dialogue/dialogue";
+import Dialogue from "../../../components/ui/dialogue/dialogue";
 import Select from "react-select";
-import ComponentLoading from "../../../../components/ui/loading/component-loading";
+import ComponentLoading from "../../../components/ui/loading/component-loading";
 import {AxiosError, AxiosResponse} from "axios";
-import Ajax from "../../../../lib/ajax/ajax";
-import LoadingProgressBar from "../../../../components/ui/progress-bars/loading-progress-bar";
+import Ajax from "../../../lib/ajax/ajax";
+import LoadingProgressBar from "../../../components/ui/progress-bars/loading-progress-bar";
 
 export default class TraverseModal extends React.Component<any, any> {
 
diff --git a/resources/js/game/sections/components/map-actions/modals/view-location-modal.tsx b/resources/js/game/sections/map/modals/view-location-modal.tsx
similarity index 94%
rename from resources/js/game/sections/components/map-actions/modals/view-location-modal.tsx
rename to resources/js/game/sections/map/modals/view-location-modal.tsx
index 44ac9cbfa..da1b24e43 100755
--- a/resources/js/game/sections/components/map-actions/modals/view-location-modal.tsx
+++ b/resources/js/game/sections/map/modals/view-location-modal.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import ViewLocationModalProps from "../../../../lib/game/map/types/view-location-modal-props";
+import ViewLocationModalProps from "../types/view-location-modal-props";
 import LocationDetails from "./components/view-details/location-details";
 import KingdomDetails from "./components/view-details/kingdom-details";
 
diff --git a/resources/js/game/lib/game/map/types/character-map-details.ts b/resources/js/game/sections/map/types/character-map-details.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/character-map-details.ts
rename to resources/js/game/sections/map/types/character-map-details.ts
diff --git a/resources/js/game/lib/game/map/types/child-quest-details.ts b/resources/js/game/sections/map/types/child-quest-details.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/child-quest-details.ts
rename to resources/js/game/sections/map/types/child-quest-details.ts
diff --git a/resources/js/game/lib/game/map/types/directional-movement-props.ts b/resources/js/game/sections/map/types/directional-movement-props.ts
similarity index 87%
rename from resources/js/game/lib/game/map/types/directional-movement-props.ts
rename to resources/js/game/sections/map/types/directional-movement-props.ts
index a840050ed..df761e0d4 100755
--- a/resources/js/game/lib/game/map/types/directional-movement-props.ts
+++ b/resources/js/game/sections/map/types/directional-movement-props.ts
@@ -1,4 +1,4 @@
-import MapData from "../request-types/MapData";
+import MapData from "../lib/request-types/MapData";
 
 export default interface DirectionalMovementProps {
 
diff --git a/resources/js/game/lib/game/map/types/directional-movement-state.ts b/resources/js/game/sections/map/types/directional-movement-state.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/directional-movement-state.ts
rename to resources/js/game/sections/map/types/directional-movement-state.ts
diff --git a/resources/js/game/lib/game/map/types/game-map-details.ts b/resources/js/game/sections/map/types/game-map-details.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/game-map-details.ts
rename to resources/js/game/sections/map/types/game-map-details.ts
diff --git a/resources/js/game/lib/game/map/types/kingdom-details.ts b/resources/js/game/sections/map/types/kingdom-details.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/kingdom-details.ts
rename to resources/js/game/sections/map/types/kingdom-details.ts
diff --git a/resources/js/game/lib/game/map/types/location-details.ts b/resources/js/game/sections/map/types/location-details.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/location-details.ts
rename to resources/js/game/sections/map/types/location-details.ts
diff --git a/resources/js/game/lib/game/map/types/map-actions-props.ts b/resources/js/game/sections/map/types/map-actions-props.ts
similarity index 72%
rename from resources/js/game/lib/game/map/types/map-actions-props.ts
rename to resources/js/game/sections/map/types/map-actions-props.ts
index d9d359c35..37b629458 100755
--- a/resources/js/game/lib/game/map/types/map-actions-props.ts
+++ b/resources/js/game/sections/map/types/map-actions-props.ts
@@ -1,8 +1,8 @@
 import LocationDetails from "./location-details";
-import PlayerKingdomsDetails from "../../types/map/player-kingdoms-details";
-import NpcKingdomsDetails from "../../types/map/npc-kingdoms-details";
-import CharacterCurrenciesDetails from "../../types/character-currencies-details";
-import MapData from "../request-types/MapData";
+import PlayerKingdomsDetails from "./map/player-kingdoms-details";
+import NpcKingdomsDetails from "./map/npc-kingdoms-details";
+import CharacterCurrenciesDetails from "../../../lib/game/types/character-currencies-details";
+import MapData from "../lib/request-types/MapData";
 
 export default interface MapActionsProps {
 
diff --git a/resources/js/game/lib/game/map/types/map-actions-state.ts b/resources/js/game/sections/map/types/map-actions-state.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/map-actions-state.ts
rename to resources/js/game/sections/map/types/map-actions-state.ts
diff --git a/resources/js/game/sections/map/types/map-state.ts b/resources/js/game/sections/map/types/map-state.ts
index 091a9693e..66691f4b1 100755
--- a/resources/js/game/sections/map/types/map-state.ts
+++ b/resources/js/game/sections/map/types/map-state.ts
@@ -1,6 +1,6 @@
-import NpcKingdomsDetails from "../../../lib/game/types/map/npc-kingdoms-details";
-import PlayerKingdomsDetails from "../../../lib/game/types/map/player-kingdoms-details";
-import LocationDetails from "../../../lib/game/map/types/location-details";
+import NpcKingdomsDetails from "./map/npc-kingdoms-details";
+import PlayerKingdomsDetails from "./map/player-kingdoms-details";
+import LocationDetails from "./location-details";
 
 export type MapDetails = {
     map_url: string;
diff --git a/resources/js/game/lib/game/map/types/map-timer-props.ts b/resources/js/game/sections/map/types/map-timer-props.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/map-timer-props.ts
rename to resources/js/game/sections/map/types/map-timer-props.ts
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/enemy-kingdom-pin-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/enemy-kingdom-pin-props.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/kingdom-pins/enemy-kingdom-pin-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/enemy-kingdom-pin-props.ts
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/kingdom-pin-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/kingdom-pin-props.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/kingdom-pins/kingdom-pin-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/kingdom-pin-props.ts
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/kingdom-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/kingdom-props.ts
similarity index 81%
rename from resources/js/game/lib/game/types/map/kingdom-pins/kingdom-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/kingdom-props.ts
index ff3f7474e..884fa7cff 100755
--- a/resources/js/game/lib/game/types/map/kingdom-pins/kingdom-props.ts
+++ b/resources/js/game/sections/map/types/map/kingdom-pins/kingdom-props.ts
@@ -1,4 +1,4 @@
-import CharacterCurrenciesDetails from "../../character-currencies-details";
+import CharacterCurrenciesDetails from "../../../../../lib/game/types/character-currencies-details";
 
 export default interface KingdomProps {
 
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/kingdom-state.ts b/resources/js/game/sections/map/types/map/kingdom-pins/kingdom-state.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/kingdom-pins/kingdom-state.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/kingdom-state.ts
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/modals/components/kingdom-details-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/modals/components/kingdom-details-props.ts
similarity index 82%
rename from resources/js/game/lib/game/types/map/kingdom-pins/modals/components/kingdom-details-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/modals/components/kingdom-details-props.ts
index 875b2b97c..01329e8fe 100755
--- a/resources/js/game/lib/game/types/map/kingdom-pins/modals/components/kingdom-details-props.ts
+++ b/resources/js/game/sections/map/types/map/kingdom-pins/modals/components/kingdom-details-props.ts
@@ -1,4 +1,4 @@
-import KingdomDetails from "../../../../../map/types/kingdom-details";
+import KingdomDetails from "../../../../kingdom-details";
 
 export default interface KingdomDetailsProps {
 
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/modals/components/kingdom-top-section-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/modals/components/kingdom-top-section-props.ts
similarity index 53%
rename from resources/js/game/lib/game/types/map/kingdom-pins/modals/components/kingdom-top-section-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/modals/components/kingdom-top-section-props.ts
index bc8cdc217..7bc5f10e8 100755
--- a/resources/js/game/lib/game/types/map/kingdom-pins/modals/components/kingdom-top-section-props.ts
+++ b/resources/js/game/sections/map/types/map/kingdom-pins/modals/components/kingdom-top-section-props.ts
@@ -1,4 +1,4 @@
-import KingdomDetails from "../../../../../map/types/kingdom-details";
+import KingdomDetails from "../../../../kingdom-details";
 
 export default interface KingdomTopSectionProps {
 
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/modals/kingdom-modal-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/modals/kingdom-modal-props.ts
similarity index 81%
rename from resources/js/game/lib/game/types/map/kingdom-pins/modals/kingdom-modal-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/modals/kingdom-modal-props.ts
index 833780423..3cd919d84 100755
--- a/resources/js/game/lib/game/types/map/kingdom-pins/modals/kingdom-modal-props.ts
+++ b/resources/js/game/sections/map/types/map/kingdom-pins/modals/kingdom-modal-props.ts
@@ -1,4 +1,4 @@
-import CharacterCurrenciesDetails from "../../../character-currencies-details";
+import CharacterCurrenciesDetails from "../../../../../../lib/game/types/character-currencies-details";
 
 export default interface KingdomModalProps {
     is_open: boolean;
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/modals/kingdom-modal-state.ts b/resources/js/game/sections/map/types/map/kingdom-pins/modals/kingdom-modal-state.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/kingdom-pins/modals/kingdom-modal-state.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/modals/kingdom-modal-state.ts
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/modals/other-kingdom-modal-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/modals/other-kingdom-modal-props.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/kingdom-pins/modals/other-kingdom-modal-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/modals/other-kingdom-modal-props.ts
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/npc-kingdom-pin-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/npc-kingdom-pin-props.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/kingdom-pins/npc-kingdom-pin-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/npc-kingdom-pin-props.ts
diff --git a/resources/js/game/lib/game/types/map/kingdom-pins/npc-kingdom-props.ts b/resources/js/game/sections/map/types/map/kingdom-pins/npc-kingdom-props.ts
similarity index 81%
rename from resources/js/game/lib/game/types/map/kingdom-pins/npc-kingdom-props.ts
rename to resources/js/game/sections/map/types/map/kingdom-pins/npc-kingdom-props.ts
index c9fb232df..6ffa64816 100755
--- a/resources/js/game/lib/game/types/map/kingdom-pins/npc-kingdom-props.ts
+++ b/resources/js/game/sections/map/types/map/kingdom-pins/npc-kingdom-props.ts
@@ -1,4 +1,4 @@
-import CharacterCurrenciesDetails from "../../character-currencies-details";
+import CharacterCurrenciesDetails from "../../../../../lib/game/types/character-currencies-details";
 
 export default interface NpcKingdomProps {
 
diff --git a/resources/js/game/lib/game/types/map/location-pins/location-pin-props.tsx b/resources/js/game/sections/map/types/map/location-pins/location-pin-props.tsx
similarity index 100%
rename from resources/js/game/lib/game/types/map/location-pins/location-pin-props.tsx
rename to resources/js/game/sections/map/types/map/location-pins/location-pin-props.tsx
diff --git a/resources/js/game/lib/game/types/map/location-pins/location-props.ts b/resources/js/game/sections/map/types/map/location-pins/location-props.ts
similarity index 69%
rename from resources/js/game/lib/game/types/map/location-pins/location-props.ts
rename to resources/js/game/sections/map/types/map/location-pins/location-props.ts
index 74edbadd6..eb557983e 100755
--- a/resources/js/game/lib/game/types/map/location-pins/location-props.ts
+++ b/resources/js/game/sections/map/types/map/location-pins/location-props.ts
@@ -1,5 +1,5 @@
-import LocationDetails from "../../../map/types/location-details";
-import CharacterCurrenciesDetails from "../../character-currencies-details";
+import LocationDetails from "../../location-details";
+import CharacterCurrenciesDetails from "../../../../../lib/game/types/character-currencies-details";
 
 export default interface LocationProps {
 
diff --git a/resources/js/game/lib/game/types/map/location-pins/location-state.ts b/resources/js/game/sections/map/types/map/location-pins/location-state.ts
similarity index 69%
rename from resources/js/game/lib/game/types/map/location-pins/location-state.ts
rename to resources/js/game/sections/map/types/map/location-pins/location-state.ts
index 5a79b102d..939738b95 100755
--- a/resources/js/game/lib/game/types/map/location-pins/location-state.ts
+++ b/resources/js/game/sections/map/types/map/location-pins/location-state.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../../map/types/location-details";
+import LocationDetails from "../../location-details";
 
 export default interface LocationState {
 
diff --git a/resources/js/game/lib/game/types/map/location-pins/modals/location-details-props.ts b/resources/js/game/sections/map/types/map/location-pins/modals/location-details-props.ts
similarity index 53%
rename from resources/js/game/lib/game/types/map/location-pins/modals/location-details-props.ts
rename to resources/js/game/sections/map/types/map/location-pins/modals/location-details-props.ts
index 5bb42d664..6c093c542 100755
--- a/resources/js/game/lib/game/types/map/location-pins/modals/location-details-props.ts
+++ b/resources/js/game/sections/map/types/map/location-pins/modals/location-details-props.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../../../map/types/location-details";
+import LocationDetails from "../../../location-details";
 
 export default interface LocationDetailsProps {
     location: LocationDetails;
diff --git a/resources/js/game/lib/game/types/map/location-pins/modals/location-modal-pros.ts b/resources/js/game/sections/map/types/map/location-pins/modals/location-modal-pros.ts
similarity index 74%
rename from resources/js/game/lib/game/types/map/location-pins/modals/location-modal-pros.ts
rename to resources/js/game/sections/map/types/map/location-pins/modals/location-modal-pros.ts
index 30d995143..6e6a06fb9 100755
--- a/resources/js/game/lib/game/types/map/location-pins/modals/location-modal-pros.ts
+++ b/resources/js/game/sections/map/types/map/location-pins/modals/location-modal-pros.ts
@@ -1,5 +1,5 @@
-import LocationDetails from "../../../../map/types/location-details";
-import CharacterCurrenciesDetails from "../../../character-currencies-details";
+import LocationDetails from "../../../location-details";
+import CharacterCurrenciesDetails from "../../../../../../lib/game/types/character-currencies-details";
 
 export interface LocationModalPros {
     is_open: boolean;
diff --git a/resources/js/game/lib/game/types/map/location-pins/modals/location-modal-state.ts b/resources/js/game/sections/map/types/map/location-pins/modals/location-modal-state.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/location-pins/modals/location-modal-state.ts
rename to resources/js/game/sections/map/types/map/location-pins/modals/location-modal-state.ts
diff --git a/resources/js/game/lib/game/types/map/map-actions-props.ts b/resources/js/game/sections/map/types/map/map-actions-props.ts
similarity index 94%
rename from resources/js/game/lib/game/types/map/map-actions-props.ts
rename to resources/js/game/sections/map/types/map/map-actions-props.ts
index a90a3eec1..51330400e 100755
--- a/resources/js/game/lib/game/types/map/map-actions-props.ts
+++ b/resources/js/game/sections/map/types/map/map-actions-props.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../map/types/location-details";
+import LocationDetails from "../location-details";
 import NpcKingdomsDetails from "./npc-kingdoms-details";
 import PlayerKingdomsDetails from "./player-kingdoms-details";
 
diff --git a/resources/js/game/lib/game/types/map/map-actions-state.ts b/resources/js/game/sections/map/types/map/map-actions-state.ts
similarity index 87%
rename from resources/js/game/lib/game/types/map/map-actions-state.ts
rename to resources/js/game/sections/map/types/map/map-actions-state.ts
index 9a411cb63..7f487466a 100755
--- a/resources/js/game/lib/game/types/map/map-actions-state.ts
+++ b/resources/js/game/sections/map/types/map/map-actions-state.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../map/types/location-details";
+import LocationDetails from "../location-details";
 
 export default interface MapActionsState {
 
diff --git a/resources/js/game/lib/game/types/map/map-props.ts b/resources/js/game/sections/map/types/map/map-props.ts
similarity index 77%
rename from resources/js/game/lib/game/types/map/map-props.ts
rename to resources/js/game/sections/map/types/map/map-props.ts
index 6075b319b..a4b23b407 100755
--- a/resources/js/game/lib/game/types/map/map-props.ts
+++ b/resources/js/game/sections/map/types/map/map-props.ts
@@ -1,6 +1,6 @@
-import MapState from "../../../../sections/map/types/map-state";
-import CharacterCurrenciesDetails from "../character-currencies-details";
-import { MapTimerData } from "../game-state";
+import MapState from "../map-state";
+import CharacterCurrenciesDetails from "../../../../lib/game/types/character-currencies-details";
+import { MapTimerData } from "../../../../lib/game/types/game-state";
 import PositionType from "./position-type";
 
 export default interface MapProps {
diff --git a/resources/js/game/lib/game/types/map/modals/components/view-details/kingdom-details-props.ts b/resources/js/game/sections/map/types/map/modals/components/view-details/kingdom-details-props.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/modals/components/view-details/kingdom-details-props.ts
rename to resources/js/game/sections/map/types/map/modals/components/view-details/kingdom-details-props.ts
diff --git a/resources/js/game/lib/game/types/map/modals/components/view-details/kingdom-details-state.ts b/resources/js/game/sections/map/types/map/modals/components/view-details/kingdom-details-state.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/modals/components/view-details/kingdom-details-state.ts
rename to resources/js/game/sections/map/types/map/modals/components/view-details/kingdom-details-state.ts
diff --git a/resources/js/game/lib/game/types/map/modals/components/view-details/location-details-props.ts b/resources/js/game/sections/map/types/map/modals/components/view-details/location-details-props.ts
similarity index 60%
rename from resources/js/game/lib/game/types/map/modals/components/view-details/location-details-props.ts
rename to resources/js/game/sections/map/types/map/modals/components/view-details/location-details-props.ts
index 28000f626..1748aa83e 100755
--- a/resources/js/game/lib/game/types/map/modals/components/view-details/location-details-props.ts
+++ b/resources/js/game/sections/map/types/map/modals/components/view-details/location-details-props.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../../../../map/types/location-details";
+import LocationDetails from "../../../../location-details";
 
 export default interface LocationDetailsProps {
     location: LocationDetails;
diff --git a/resources/js/game/lib/game/types/map/modals/conjure-modal-props.ts b/resources/js/game/sections/map/types/map/modals/conjure-modal-props.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/modals/conjure-modal-props.ts
rename to resources/js/game/sections/map/types/map/modals/conjure-modal-props.ts
diff --git a/resources/js/game/lib/game/types/map/modals/conjure-modal-state.ts b/resources/js/game/sections/map/types/map/modals/conjure-modal-state.ts
similarity index 69%
rename from resources/js/game/lib/game/types/map/modals/conjure-modal-state.ts
rename to resources/js/game/sections/map/types/map/modals/conjure-modal-state.ts
index 20076648f..ae3618b45 100755
--- a/resources/js/game/lib/game/types/map/modals/conjure-modal-state.ts
+++ b/resources/js/game/sections/map/types/map/modals/conjure-modal-state.ts
@@ -1,4 +1,4 @@
-import CelestialType from "../../actions/monster/celestial-type";
+import CelestialType from "../../../../../lib/game/types/actions/monster/celestial-type";
 
 export default interface ConjureModalState {
     loading: boolean;
diff --git a/resources/js/game/lib/game/types/map/modals/purchase-npc-kingdom-modal-props.ts b/resources/js/game/sections/map/types/map/modals/purchase-npc-kingdom-modal-props.ts
similarity index 81%
rename from resources/js/game/lib/game/types/map/modals/purchase-npc-kingdom-modal-props.ts
rename to resources/js/game/sections/map/types/map/modals/purchase-npc-kingdom-modal-props.ts
index f25863cbf..9b2eff6b1 100755
--- a/resources/js/game/lib/game/types/map/modals/purchase-npc-kingdom-modal-props.ts
+++ b/resources/js/game/sections/map/types/map/modals/purchase-npc-kingdom-modal-props.ts
@@ -1,5 +1,5 @@
 import {ClassArray, ClassDictionary} from "clsx";
-import LocationDetails from "../../../map/types/location-details";
+import LocationDetails from "../../location-details";
 
 export default interface PurchaseNpcKingdomModalProps {
 
diff --git a/resources/js/game/lib/game/types/map/modals/set-sail-modal-props.ts b/resources/js/game/sections/map/types/map/modals/set-sail-modal-props.ts
similarity index 71%
rename from resources/js/game/lib/game/types/map/modals/set-sail-modal-props.ts
rename to resources/js/game/sections/map/types/map/modals/set-sail-modal-props.ts
index b6f898063..648b2a00e 100755
--- a/resources/js/game/lib/game/types/map/modals/set-sail-modal-props.ts
+++ b/resources/js/game/sections/map/types/map/modals/set-sail-modal-props.ts
@@ -1,6 +1,6 @@
 import {ClassArray, ClassDictionary} from "clsx";
-import LocationDetails from "../../../map/types/location-details";
-import CharacterCurrenciesDetails from "../../character-currencies-details";
+import LocationDetails from "../../location-details";
+import CharacterCurrenciesDetails from "../../../../../lib/game/types/character-currencies-details";
 
 export default interface SetSailModalProps  {
 
diff --git a/resources/js/game/lib/game/types/map/modals/set-sail-modal-state.ts b/resources/js/game/sections/map/types/map/modals/set-sail-modal-state.ts
similarity index 89%
rename from resources/js/game/lib/game/types/map/modals/set-sail-modal-state.ts
rename to resources/js/game/sections/map/types/map/modals/set-sail-modal-state.ts
index 7623b3cfa..7cd3701e0 100755
--- a/resources/js/game/lib/game/types/map/modals/set-sail-modal-state.ts
+++ b/resources/js/game/sections/map/types/map/modals/set-sail-modal-state.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../../map/types/location-details";
+import LocationDetails from "../../location-details";
 import PlayerKingdomsDetails from "../player-kingdoms-details";
 
 export default interface SetSailModalState {
diff --git a/resources/js/game/lib/game/types/map/modals/settle-kingdom-modal-props.ts b/resources/js/game/sections/map/types/map/modals/settle-kingdom-modal-props.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/modals/settle-kingdom-modal-props.ts
rename to resources/js/game/sections/map/types/map/modals/settle-kingdom-modal-props.ts
diff --git a/resources/js/game/lib/game/types/map/modals/settle-kingdom-modal-state.ts b/resources/js/game/sections/map/types/map/modals/settle-kingdom-modal-state.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/modals/settle-kingdom-modal-state.ts
rename to resources/js/game/sections/map/types/map/modals/settle-kingdom-modal-state.ts
diff --git a/resources/js/game/lib/game/types/map/modals/teleport-modal-props.ts b/resources/js/game/sections/map/types/map/modals/teleport-modal-props.ts
similarity index 76%
rename from resources/js/game/lib/game/types/map/modals/teleport-modal-props.ts
rename to resources/js/game/sections/map/types/map/modals/teleport-modal-props.ts
index 6ca78b478..28348ed98 100755
--- a/resources/js/game/lib/game/types/map/modals/teleport-modal-props.ts
+++ b/resources/js/game/sections/map/types/map/modals/teleport-modal-props.ts
@@ -1,8 +1,8 @@
 import {ClassArray, ClassDictionary} from "clsx";
-import LocationDetails from "../../../map/types/location-details";
+import LocationDetails from "../../location-details";
 import PlayerKingdomsDetails from "../player-kingdoms-details";
-import CharacterCurrenciesType from "../../../character/character-currencies-type";
-import NpcKingdoms from "../../../../../sections/components/kingdoms/npc-kingdoms";
+import CharacterCurrenciesType from "../../../../../lib/game/character/character-currencies-type";
+import NpcKingdoms from "../../../../components/kingdoms/npc-kingdoms";
 import NpcKingdomsDetails from "../npc-kingdoms-details";
 
 export default interface TeleportModalProps  {
diff --git a/resources/js/game/lib/game/types/map/modals/teleport-modal-state.ts b/resources/js/game/sections/map/types/map/modals/teleport-modal-state.ts
similarity index 90%
rename from resources/js/game/lib/game/types/map/modals/teleport-modal-state.ts
rename to resources/js/game/sections/map/types/map/modals/teleport-modal-state.ts
index 80946794e..1f0da3bdd 100755
--- a/resources/js/game/lib/game/types/map/modals/teleport-modal-state.ts
+++ b/resources/js/game/sections/map/types/map/modals/teleport-modal-state.ts
@@ -1,4 +1,4 @@
-import LocationDetails from "../../../map/types/location-details";
+import LocationDetails from "../../location-details";
 import PlayerKingdomsDetails from "../player-kingdoms-details";
 import NpcKingdomsDetails from "../npc-kingdoms-details";
 
diff --git a/resources/js/game/lib/game/types/map/npc-kingdoms-details.ts b/resources/js/game/sections/map/types/map/npc-kingdoms-details.ts
similarity index 72%
rename from resources/js/game/lib/game/types/map/npc-kingdoms-details.ts
rename to resources/js/game/sections/map/types/map/npc-kingdoms-details.ts
index 738c70676..ff7025923 100755
--- a/resources/js/game/lib/game/types/map/npc-kingdoms-details.ts
+++ b/resources/js/game/sections/map/types/map/npc-kingdoms-details.ts
@@ -1,4 +1,4 @@
-import KingdomDetails from "../../map/types/kingdom-details";
+import KingdomDetails from "../kingdom-details";
 
 export default interface NpcKingdomsDetails extends KingdomDetails {
     id: number;
diff --git a/resources/js/game/lib/game/types/map/player-kingdoms-details.ts b/resources/js/game/sections/map/types/map/player-kingdoms-details.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/player-kingdoms-details.ts
rename to resources/js/game/sections/map/types/map/player-kingdoms-details.ts
diff --git a/resources/js/game/lib/game/types/map/position-type.ts b/resources/js/game/sections/map/types/map/position-type.ts
similarity index 100%
rename from resources/js/game/lib/game/types/map/position-type.ts
rename to resources/js/game/sections/map/types/map/position-type.ts
diff --git a/resources/js/game/lib/game/types/map/quests/quest-node-props.ts b/resources/js/game/sections/map/types/map/quests/quest-node-props.ts
similarity index 53%
rename from resources/js/game/lib/game/types/map/quests/quest-node-props.ts
rename to resources/js/game/sections/map/types/map/quests/quest-node-props.ts
index 172ae9798..cb3f75b93 100755
--- a/resources/js/game/lib/game/types/map/quests/quest-node-props.ts
+++ b/resources/js/game/sections/map/types/map/quests/quest-node-props.ts
@@ -1,6 +1,6 @@
-import {QuestDetails} from "../../../map/types/quest-details";
-import {ChildQuestDetails} from "../../../map/types/child-quest-details";
-import QuestType from "../../quests/quest-type";
+import {QuestDetails} from "../../quest-details";
+import {ChildQuestDetails} from "../../child-quest-details";
+import QuestType from "../../../../../lib/game/types/quests/quest-type";
 
 export default interface QuestNodeProps {
 
diff --git a/resources/js/game/lib/game/types/map/quests/quest-state.ts b/resources/js/game/sections/map/types/map/quests/quest-state.ts
similarity index 78%
rename from resources/js/game/lib/game/types/map/quests/quest-state.ts
rename to resources/js/game/sections/map/types/map/quests/quest-state.ts
index 6b09ed3b6..b0d669749 100755
--- a/resources/js/game/lib/game/types/map/quests/quest-state.ts
+++ b/resources/js/game/sections/map/types/map/quests/quest-state.ts
@@ -1,4 +1,4 @@
-import {QuestDetails} from "../../../map/types/quest-details";
+import {QuestDetails} from "../../quest-details";
 
 export default interface QuestState {
 
diff --git a/resources/js/game/lib/game/types/map/quests/quest-tree-props.ts b/resources/js/game/sections/map/types/map/quests/quest-tree-props.ts
similarity index 67%
rename from resources/js/game/lib/game/types/map/quests/quest-tree-props.ts
rename to resources/js/game/sections/map/types/map/quests/quest-tree-props.ts
index 91b66f58f..b7c3402e3 100755
--- a/resources/js/game/lib/game/types/map/quests/quest-tree-props.ts
+++ b/resources/js/game/sections/map/types/map/quests/quest-tree-props.ts
@@ -1,5 +1,5 @@
-import {QuestDetails} from "../../../map/types/quest-details";
-import QuestType from "../../quests/quest-type";
+import {QuestDetails} from "../../quest-details";
+import QuestType from "../../../../../lib/game/types/quests/quest-type";
 
 export default interface QuestTreeProps {
 
diff --git a/resources/js/game/lib/game/types/map/quests/quests-props.ts b/resources/js/game/sections/map/types/map/quests/quests-props.ts
similarity index 67%
rename from resources/js/game/lib/game/types/map/quests/quests-props.ts
rename to resources/js/game/sections/map/types/map/quests/quests-props.ts
index b7a1fd84a..bd4903bf6 100755
--- a/resources/js/game/lib/game/types/map/quests/quests-props.ts
+++ b/resources/js/game/sections/map/types/map/quests/quests-props.ts
@@ -1,4 +1,4 @@
-import QuestType from "../../quests/quest-type";
+import QuestType from "../../../../../lib/game/types/quests/quest-type";
 
 export default interface QuestsProps {
 
diff --git a/resources/js/game/lib/game/map/types/quest-details.ts b/resources/js/game/sections/map/types/quest-details.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/quest-details.ts
rename to resources/js/game/sections/map/types/quest-details.ts
diff --git a/resources/js/game/lib/game/map/components/set-sail-component.ts b/resources/js/game/sections/map/types/set-sail-component.ts
similarity index 92%
rename from resources/js/game/lib/game/map/components/set-sail-component.ts
rename to resources/js/game/sections/map/types/set-sail-component.ts
index a4860b99f..6995fb92a 100755
--- a/resources/js/game/lib/game/map/components/set-sail-component.ts
+++ b/resources/js/game/sections/map/types/set-sail-component.ts
@@ -1,7 +1,7 @@
-import SetSailModal from "../../../../sections/components/map-actions/modals/set-sail-modal";
-import LocationDetails from "../types/location-details";
-import SetSailModalProps from "../../types/map/modals/set-sail-modal-props";
-import {fetchCost} from "../teleportion-costs";
+import SetSailModal from "../modals/set-sail-modal";
+import LocationDetails from "./location-details";
+import SetSailModalProps from "./map/modals/set-sail-modal-props";
+import {fetchCost} from "../lib/teleportion-costs";
 
 export default class SetSailComponent {
 
diff --git a/resources/js/game/lib/game/map/components/teleport-component.ts b/resources/js/game/sections/map/types/teleport-component.ts
similarity index 96%
rename from resources/js/game/lib/game/map/components/teleport-component.ts
rename to resources/js/game/sections/map/types/teleport-component.ts
index 40e7d9961..520b9b0be 100755
--- a/resources/js/game/lib/game/map/components/teleport-component.ts
+++ b/resources/js/game/sections/map/types/teleport-component.ts
@@ -1,8 +1,8 @@
-import TeleportModal from "../../../../sections/components/map-actions/modals/teleport-modal";
-import {fetchCost} from "../teleportion-costs";
-import LocationDetails from "../types/location-details";
-import PlayerKingdomsDetails from "../../types/map/player-kingdoms-details";
-import NpcKingdomsDetails from "../../types/map/npc-kingdoms-details";
+import TeleportModal from "../modals/teleport-modal";
+import {fetchCost} from "../lib/teleportion-costs";
+import LocationDetails from "./location-details";
+import PlayerKingdomsDetails from "./map/player-kingdoms-details";
+import NpcKingdomsDetails from "./map/npc-kingdoms-details";
 
 type SelectedData = {
     label: string;
@@ -27,7 +27,7 @@ export default class TeleportComponent {
             return {
                 label: state.current_location.name + ' (X/Y): ' +
                     state.current_location.x + '/' +
-                    state.current_location.y +  
+                    state.current_location.y +
                     (state.current_location.is_corrupted ? ' (Corrupted)' : ''),
                 value: state.current_location.id
             }
diff --git a/resources/js/game/lib/game/map/types/view-location-modal-props.ts b/resources/js/game/sections/map/types/view-location-modal-props.ts
similarity index 100%
rename from resources/js/game/lib/game/map/types/view-location-modal-props.ts
rename to resources/js/game/sections/map/types/view-location-modal-props.ts