diff --git a/tv-player/src/core/animate.js b/tv-player/src/core/animate.js
index caabe07..2ac70aa 100644
--- a/tv-player/src/core/animate.js
+++ b/tv-player/src/core/animate.js
@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import { state } from '../state.js';
-import { updateVcrDisplay } from '../vcr-display.js';
+import { updateVcrDisplay } from '../scene/vcr-display.js';
 
 
 function updateCamera() {
diff --git a/tv-player/src/core/init.js b/tv-player/src/core/init.js
index 88a2f7b..de82611 100644
--- a/tv-player/src/core/init.js
+++ b/tv-player/src/core/init.js
@@ -1,9 +1,9 @@
 import * as THREE from 'three';
 import { state, initState } from '../state.js';
-import { EffectsManager } from '../EffectsManager.js';
-import { createSceneObjects } from '../scene.js';
+import { EffectsManager } from '../effects/EffectsManager.js';
+import { createSceneObjects } from '../scene/scene.js';
 import { animate, onWindowResize } from './animate.js';
-import { loadVideoFile, playNextVideo } from '../video-player.js';
+import { loadVideoFile, playNextVideo } from './video-player.js';
 
 // --- Initialization ---
 export function init() {
diff --git a/tv-player/src/video-player.js b/tv-player/src/core/video-player.js
similarity index 99%
rename from tv-player/src/video-player.js
rename to tv-player/src/core/video-player.js
index 09439d8..4b2c364 100644
--- a/tv-player/src/video-player.js
+++ b/tv-player/src/core/video-player.js
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { state } from './state.js';
+import { state } from '../state.js';
 
 // --- Play video by index ---
 export function playVideoByIndex(index) {
diff --git a/tv-player/src/EffectsManager.js b/tv-player/src/effects/EffectsManager.js
similarity index 84%
rename from tv-player/src/EffectsManager.js
rename to tv-player/src/effects/EffectsManager.js
index 96f2db6..a118f7e 100644
--- a/tv-player/src/EffectsManager.js
+++ b/tv-player/src/effects/EffectsManager.js
@@ -1,5 +1,5 @@
-import { DustEffect } from './effects_dust.js';
-import { FliesEffect } from './effects_flies.js';
+import { DustEffect } from './dust.js';
+import { FliesEffect } from './flies.js';
 
 export class EffectsManager {
     constructor(scene) {
diff --git a/tv-player/src/effects_dust.js b/tv-player/src/effects/dust.js
similarity index 100%
rename from tv-player/src/effects_dust.js
rename to tv-player/src/effects/dust.js
diff --git a/tv-player/src/effects_flies.js b/tv-player/src/effects/flies.js
similarity index 98%
rename from tv-player/src/effects_flies.js
rename to tv-player/src/effects/flies.js
index 85ca40f..2f5f0a0 100644
--- a/tv-player/src/effects_flies.js
+++ b/tv-player/src/effects/flies.js
@@ -1,6 +1,6 @@
 import * as THREE from 'three';
-import { state } from './state.js';
-import { degToRad } from './utils.js';
+import { state } from '../state.js';
+import { degToRad } from '../utils.js';
 
 const FLIES_COUNT = 2;
 
diff --git a/tv-player/src/scene.js b/tv-player/src/scene/scene.js
similarity index 99%
rename from tv-player/src/scene.js
rename to tv-player/src/scene/scene.js
index 80ae955..2e7ce98 100644
--- a/tv-player/src/scene.js
+++ b/tv-player/src/scene/scene.js
@@ -1,6 +1,6 @@
 import * as THREE from 'three';
-import { state } from './state.js';
-import { getRandomColor, seededRandom } from './utils.js';
+import { state } from '../state.js';
+import { getRandomColor, seededRandom } from '../utils.js';
 import { createVcrDisplay } from './vcr-display.js';
 
 // --- Room Walls Function ---
diff --git a/tv-player/src/vcr-display.js b/tv-player/src/scene/vcr-display.js
similarity index 98%
rename from tv-player/src/vcr-display.js
rename to tv-player/src/scene/vcr-display.js
index 0e6ca74..9ed2351 100644
--- a/tv-player/src/vcr-display.js
+++ b/tv-player/src/scene/vcr-display.js
@@ -1,6 +1,6 @@
 import * as THREE from 'three';
-import { state } from './state.js';
-import { formatTime } from './utils.js';
+import { state } from '../state.js';
+import { formatTime } from '../utils.js';
 
 // --- Segment Display Definitions ---