diff --git a/app/pages/PageEnigma/PageEnigma.tsx b/app/pages/PageEnigma/PageEnigma.tsx
index 66417a7408..6507fd86fe 100644
--- a/app/pages/PageEnigma/PageEnigma.tsx
+++ b/app/pages/PageEnigma/PageEnigma.tsx
@@ -1,5 +1,5 @@
 import { PageEnigmaComponent } from "./PageEnigmaComponent";
-import { TrackProvider } from "~/contexts/TrackContext/TrackProvider";
+import { TrackProvider } from "~/pages/PageEnigma/contexts/TrackContext/TrackProvider";
 
 export const PageEnigma = () => {
   return (
diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/ClipElement.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/ClipElement.tsx
index f578affb13..747d64434d 100644
--- a/app/pages/PageEnigma/comps/SidePanelTabs/ClipElement.tsx
+++ b/app/pages/PageEnigma/comps/SidePanelTabs/ClipElement.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useContext, useEffect, useState } from "react";
 import { BaseClip } from "~/models/track";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 
 interface Props {
   clip: BaseClip;
diff --git a/app/pages/PageEnigma/comps/SidePanelTabs/ClipElements.tsx b/app/pages/PageEnigma/comps/SidePanelTabs/ClipElements.tsx
index e53f54744e..defcb65ac3 100644
--- a/app/pages/PageEnigma/comps/SidePanelTabs/ClipElements.tsx
+++ b/app/pages/PageEnigma/comps/SidePanelTabs/ClipElements.tsx
@@ -1,6 +1,6 @@
 import { useContext } from "react";
 import { ClipElement } from "./ClipElement";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 
 export const ClipElements = () => {
   const { animationClips } = useContext(TrackContext);
diff --git a/app/pages/PageEnigma/comps/Timeline/Audio.tsx b/app/pages/PageEnigma/comps/Timeline/Audio.tsx
index f747e19046..2b7550edd6 100644
--- a/app/pages/PageEnigma/comps/Timeline/Audio.tsx
+++ b/app/pages/PageEnigma/comps/Timeline/Audio.tsx
@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
 
 export const Audio = () => {
@@ -9,7 +9,7 @@ export const Audio = () => {
 
   return (
     <div
-      className="bg-audio-groupBg block rounded-lg pb-5 pl-2 pr-4"
+      className="block rounded-lg bg-audio-groupBg pb-5 pl-2 pr-4"
       style={{ width: fullWidth + 90 }}
     >
       <div className="prevent-select mb-5 pt-2 text-xs font-medium text-white">
diff --git a/app/pages/PageEnigma/comps/Timeline/Camera.tsx b/app/pages/PageEnigma/comps/Timeline/Camera.tsx
index aa947fb3a6..65f7fc59f9 100644
--- a/app/pages/PageEnigma/comps/Timeline/Camera.tsx
+++ b/app/pages/PageEnigma/comps/Timeline/Camera.tsx
@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
 
 export const Camera = () => {
@@ -8,7 +8,7 @@ export const Camera = () => {
 
   return (
     <div
-      className="bg-camera-groupBg block rounded-lg pb-5 pl-2 pr-4"
+      className="block rounded-lg bg-camera-groupBg pb-5 pl-2 pr-4"
       style={{ width: fullWidth + 90 }}
     >
       <div className="mb-5 pt-2 text-xs font-medium text-white">Camera</div>
diff --git a/app/pages/PageEnigma/comps/Timeline/Character.tsx b/app/pages/PageEnigma/comps/Timeline/Character.tsx
index 97c9864122..9956e22b25 100644
--- a/app/pages/PageEnigma/comps/Timeline/Character.tsx
+++ b/app/pages/PageEnigma/comps/Timeline/Character.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useContext, useMemo } from "react";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
 
 function buildUpdaters(
diff --git a/app/pages/PageEnigma/comps/Timeline/Objects.tsx b/app/pages/PageEnigma/comps/Timeline/Objects.tsx
index 4daa784041..39304866ce 100644
--- a/app/pages/PageEnigma/comps/Timeline/Objects.tsx
+++ b/app/pages/PageEnigma/comps/Timeline/Objects.tsx
@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 import { Track } from "~/pages/PageEnigma/comps/Timeline/Track";
 
 export const Objects = () => {
@@ -7,7 +7,7 @@ export const Objects = () => {
 
   return (
     <div
-      className="bg-objects-groupBg block rounded-lg pb-5 pl-2 pr-4"
+      className="block rounded-lg bg-objects-groupBg pb-5 pl-2 pr-4"
       style={{ width: fullWidth + 90 }}
     >
       <div className="prevent-select mb-5 pt-2 text-xs font-medium text-white">
diff --git a/app/pages/PageEnigma/comps/Timeline/Timeline.tsx b/app/pages/PageEnigma/comps/Timeline/Timeline.tsx
index 84bf292199..c310970174 100644
--- a/app/pages/PageEnigma/comps/Timeline/Timeline.tsx
+++ b/app/pages/PageEnigma/comps/Timeline/Timeline.tsx
@@ -1,5 +1,5 @@
 import { Fragment, useContext } from "react";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 import { LowerPanel } from "~/modules/LowerPanel";
 import { Character } from "./Character";
 
@@ -44,7 +44,7 @@ export const Timeline = ({ timelineHeight }: Props) => {
                   00:{index < 10 ? "0" + index.toString() : index.toString()}
                 </div>
                 <div
-                  className="bg-ui-divider absolute block h-full"
+                  className="absolute block h-full bg-ui-divider"
                   style={{
                     width: 1,
                     left: index * sectionWidth + 88,
@@ -60,7 +60,7 @@ export const Timeline = ({ timelineHeight }: Props) => {
             00:{length < 10 ? "0" + length.toString() : length.toString()}
           </div>
           <div
-            className="bg-ui-divider absolute block h-full"
+            className="absolute block h-full bg-ui-divider"
             style={{
               width: 1,
               left: length * sectionWidth + 88,
diff --git a/app/pages/PageEnigma/comps/Timeline/Track.tsx b/app/pages/PageEnigma/comps/Timeline/Track.tsx
index eea8a20506..00f117d1a8 100644
--- a/app/pages/PageEnigma/comps/Timeline/Track.tsx
+++ b/app/pages/PageEnigma/comps/Timeline/Track.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faVolume, faVolumeSlash } from "@fortawesome/pro-solid-svg-icons";
 import { BaseClip } from "~/models/track";
 import { useContext } from "react";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 
 interface Props {
   clips: BaseClip[];
diff --git a/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx b/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx
index 1f123bc70b..ddee7ec65c 100644
--- a/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx
+++ b/app/pages/PageEnigma/comps/Timeline/TrackClip.tsx
@@ -1,6 +1,6 @@
 import { useMouseEventsClip } from "./utils/useMouseEventsClip";
 import { BaseClip } from "~/models/track";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 import { useContext, useState } from "react";
 
 interface Props {
diff --git a/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsAnimation.ts b/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsAnimation.ts
index 29ac2aa478..131cd4740a 100644
--- a/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsAnimation.ts
+++ b/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsAnimation.ts
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useState } from "react";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 
 export const useMouseEventsAnimation = () => {
   const { currentTime, updateCurrentTime, length, scale } =
diff --git a/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsClip.ts b/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsClip.ts
index 7f39d23f82..cad387f83b 100644
--- a/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsClip.ts
+++ b/app/pages/PageEnigma/comps/Timeline/utils/useMouseEventsClip.ts
@@ -6,7 +6,7 @@ import React, {
   useRef,
 } from "react";
 import { BaseClip } from "~/models/track";
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 
 export const useMouseEventsClip = (
   clip: BaseClip,
diff --git a/app/contexts/TrackContext/TrackContext.tsx b/app/pages/PageEnigma/contexts/TrackContext/TrackContext.tsx
similarity index 100%
rename from app/contexts/TrackContext/TrackContext.tsx
rename to app/pages/PageEnigma/contexts/TrackContext/TrackContext.tsx
diff --git a/app/contexts/TrackContext/TrackProvider.tsx b/app/pages/PageEnigma/contexts/TrackContext/TrackProvider.tsx
similarity index 86%
rename from app/contexts/TrackContext/TrackProvider.tsx
rename to app/pages/PageEnigma/contexts/TrackContext/TrackProvider.tsx
index af05181e2c..ecdcd15063 100644
--- a/app/contexts/TrackContext/TrackProvider.tsx
+++ b/app/pages/PageEnigma/contexts/TrackContext/TrackProvider.tsx
@@ -1,9 +1,9 @@
-import { TrackContext } from "~/contexts/TrackContext/TrackContext";
+import { TrackContext } from "~/pages/PageEnigma/contexts/TrackContext/TrackContext";
 import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
-import useUpdateCharacters from "~/contexts/TrackContext/utils/useUpdateCharacters";
-import useUpdateCamera from "~/contexts/TrackContext/utils/useUpdateCamera";
-import useUpdateAudio from "~/contexts/TrackContext/utils/useUpdateAudio";
-import useUpdateObject from "~/contexts/TrackContext/utils/useUpdateObject";
+import useUpdateCharacters from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCharacters";
+import useUpdateCamera from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCamera";
+import useUpdateAudio from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateAudio";
+import useUpdateObject from "~/pages/PageEnigma/contexts/TrackContext/utils/useUpdateObject";
 import { AnimationClip, AudioClip } from "~/models/track";
 
 interface Props {
diff --git a/app/contexts/TrackContext/utils/useUpdateAudio.ts b/app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateAudio.ts
similarity index 100%
rename from app/contexts/TrackContext/utils/useUpdateAudio.ts
rename to app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateAudio.ts
diff --git a/app/contexts/TrackContext/utils/useUpdateCamera.ts b/app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCamera.ts
similarity index 100%
rename from app/contexts/TrackContext/utils/useUpdateCamera.ts
rename to app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCamera.ts
diff --git a/app/contexts/TrackContext/utils/useUpdateCharacters.ts b/app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCharacters.ts
similarity index 100%
rename from app/contexts/TrackContext/utils/useUpdateCharacters.ts
rename to app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateCharacters.ts
diff --git a/app/contexts/TrackContext/utils/useUpdateObject.ts b/app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateObject.ts
similarity index 100%
rename from app/contexts/TrackContext/utils/useUpdateObject.ts
rename to app/pages/PageEnigma/contexts/TrackContext/utils/useUpdateObject.ts