diff --git a/src/components/map/dice/DiceButton.js b/src/components/dice/DiceButton.js
similarity index 100%
rename from src/components/map/dice/DiceButton.js
rename to src/components/dice/DiceButton.js
diff --git a/src/components/map/dice/DiceButtonCount.js b/src/components/dice/DiceButtonCount.js
similarity index 100%
rename from src/components/map/dice/DiceButtonCount.js
rename to src/components/dice/DiceButtonCount.js
diff --git a/src/components/map/dice/DiceButtons.js b/src/components/dice/DiceButtons.js
similarity index 86%
rename from src/components/map/dice/DiceButtons.js
rename to src/components/dice/DiceButtons.js
index 561d830..c2900da 100644
--- a/src/components/map/dice/DiceButtons.js
+++ b/src/components/dice/DiceButtons.js
@@ -1,21 +1,21 @@
 import React, { useState, useEffect } from "react";
 import { Flex, IconButton } from "theme-ui";
 
-import D20Icon from "../../../icons/D20Icon";
-import D12Icon from "../../../icons/D12Icon";
-import D10Icon from "../../../icons/D10Icon";
-import D8Icon from "../../../icons/D8Icon";
-import D6Icon from "../../../icons/D6Icon";
-import D4Icon from "../../../icons/D4Icon";
-import D100Icon from "../../../icons/D100Icon";
-import ExpandMoreDiceTrayIcon from "../../../icons/ExpandMoreDiceTrayIcon";
+import D20Icon from "../../icons/D20Icon";
+import D12Icon from "../../icons/D12Icon";
+import D10Icon from "../../icons/D10Icon";
+import D8Icon from "../../icons/D8Icon";
+import D6Icon from "../../icons/D6Icon";
+import D4Icon from "../../icons/D4Icon";
+import D100Icon from "../../icons/D100Icon";
+import ExpandMoreDiceTrayIcon from "../../icons/ExpandMoreDiceTrayIcon";
 
 import DiceButton from "./DiceButton";
 import SelectDiceButton from "./SelectDiceButton";
 
-import Divider from "../../Divider";
+import Divider from "../Divider";
 
-import { dice } from "../../../dice";
+import { dice } from "../../dice";
 
 function DiceButtons({
   diceRolls,
diff --git a/src/components/map/dice/DiceControls.js b/src/components/dice/DiceControls.js
similarity index 100%
rename from src/components/map/dice/DiceControls.js
rename to src/components/dice/DiceControls.js
diff --git a/src/components/map/dice/DiceInteraction.js b/src/components/dice/DiceInteraction.js
similarity index 98%
rename from src/components/map/dice/DiceInteraction.js
rename to src/components/dice/DiceInteraction.js
index 6346fa0..e573352 100644
--- a/src/components/map/dice/DiceInteraction.js
+++ b/src/components/dice/DiceInteraction.js
@@ -4,7 +4,7 @@ import * as AMMO from "ammo.js";
 import "babylonjs-loaders";
 import ReactResizeDetector from "react-resize-detector";
 
-import usePreventTouch from "../../../helpers/usePreventTouch";
+import usePreventTouch from "../../helpers/usePreventTouch";
 
 const diceThrowSpeed = 2;
 
diff --git a/src/components/map/dice/DiceResults.js b/src/components/dice/DiceResults.js
similarity index 95%
rename from src/components/map/dice/DiceResults.js
rename to src/components/dice/DiceResults.js
index 90ef2da..7ce4a2d 100644
--- a/src/components/map/dice/DiceResults.js
+++ b/src/components/dice/DiceResults.js
@@ -1,8 +1,8 @@
 import React, { useState } from "react";
 import { Flex, Text, Button, IconButton } from "theme-ui";
 
-import ClearDiceIcon from "../../../icons/ClearDiceIcon";
-import RerollDiceIcon from "../../../icons/RerollDiceIcon";
+import ClearDiceIcon from "../../icons/ClearDiceIcon";
+import RerollDiceIcon from "../../icons/RerollDiceIcon";
 
 const maxDiceRollsShown = 6;
 
diff --git a/src/components/map/dice/DiceTile.js b/src/components/dice/DiceTile.js
similarity index 100%
rename from src/components/map/dice/DiceTile.js
rename to src/components/dice/DiceTile.js
diff --git a/src/components/map/dice/DiceTiles.js b/src/components/dice/DiceTiles.js
similarity index 100%
rename from src/components/map/dice/DiceTiles.js
rename to src/components/dice/DiceTiles.js
diff --git a/src/components/map/dice/DiceTrayOverlay.js b/src/components/dice/DiceTrayOverlay.js
similarity index 96%
rename from src/components/map/dice/DiceTrayOverlay.js
rename to src/components/dice/DiceTrayOverlay.js
index 1be2993..911f5cc 100644
--- a/src/components/map/dice/DiceTrayOverlay.js
+++ b/src/components/dice/DiceTrayOverlay.js
@@ -8,16 +8,16 @@ import React, {
 import * as BABYLON from "babylonjs";
 import { Box } from "theme-ui";
 
-import environment from "../../../dice/environment.dds";
+import environment from "../../dice/environment.dds";
 
 import DiceInteraction from "./DiceInteraction";
 import DiceControls from "./DiceControls";
-import Dice from "../../../dice/Dice";
-import LoadingOverlay from "../../LoadingOverlay";
+import Dice from "../../dice/Dice";
+import LoadingOverlay from "../LoadingOverlay";
 
-import DiceTray from "../../../dice/diceTray/DiceTray";
+import DiceTray from "../../dice/diceTray/DiceTray";
 
-import DiceLoadingContext from "../../../contexts/DiceLoadingContext";
+import DiceLoadingContext from "../../contexts/DiceLoadingContext";
 
 function DiceTrayOverlay({ isOpen }) {
   const sceneRef = useRef();
diff --git a/src/components/map/dice/SelectDiceButton.js b/src/components/dice/SelectDiceButton.js
similarity index 87%
rename from src/components/map/dice/SelectDiceButton.js
rename to src/components/dice/SelectDiceButton.js
index 65332bf..933ccee 100644
--- a/src/components/map/dice/SelectDiceButton.js
+++ b/src/components/dice/SelectDiceButton.js
@@ -1,8 +1,8 @@
 import React, { useState } from "react";
 import { IconButton } from "theme-ui";
 
-import SelectDiceIcon from "../../../icons/SelectDiceIcon";
-import SelectDiceModal from "../../../modals/SelectDiceModal";
+import SelectDiceIcon from "../../icons/SelectDiceIcon";
+import SelectDiceModal from "../../modals/SelectDiceModal";
 
 function SelectDiceButton({ onDiceChange, currentDice }) {
   const [isModalOpen, setIsModalOpen] = useState(false);
diff --git a/src/components/map/MapDice.js b/src/components/map/MapDice.js
index 21934ef..e40f109 100644
--- a/src/components/map/MapDice.js
+++ b/src/components/map/MapDice.js
@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { Flex, IconButton } from "theme-ui";
 
 import ExpandMoreDiceIcon from "../../icons/ExpandMoreDiceIcon";
-import DiceTrayOverlay from "./dice/DiceTrayOverlay";
+import DiceTrayOverlay from "../dice/DiceTrayOverlay";
 
 import { DiceLoadingProvider } from "../../contexts/DiceLoadingContext";
 
diff --git a/src/modals/SelectDiceModal.js b/src/modals/SelectDiceModal.js
index e46840f..7a3e967 100644
--- a/src/modals/SelectDiceModal.js
+++ b/src/modals/SelectDiceModal.js
@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { Flex, Label, Button } from "theme-ui";
 
 import Modal from "../components/Modal";
-import DiceTiles from "../components/map/dice/DiceTiles";
+import DiceTiles from "../components/dice/DiceTiles";
 
 import { dice } from "../dice";