diff --git a/scripts/DropsBase.gd b/scripts/DropsBase.gd
index ed0b742..1738efc 100644
--- a/scripts/DropsBase.gd
+++ b/scripts/DropsBase.gd
@@ -12,8 +12,8 @@ var _sfx_player: AudioStreamPlayer
 
 func _ready() -> void:
 	body_entered.connect(_on_body_entered)
-	witch = get_node_or_null("/root/Game/Witch")
-	player = get_node_or_null("/root/Game/Player")
+	witch = get_node_or_null("/root/Game/World/Witch")
+	player = get_node_or_null("/root/Game/World/Player")
 	if witch == null or player == null:
 		queue_free()
 		return
diff --git a/scripts/cauldron_bar.gd b/scripts/cauldron_bar.gd
index 6553097..63478d7 100644
--- a/scripts/cauldron_bar.gd
+++ b/scripts/cauldron_bar.gd
@@ -13,7 +13,7 @@ var progres_index = 0
 var is_brewing 
 var brew_explosion = true
 @onready var witch = get_parent()
-@onready var player = get_node("/root/Game/Player")
+@onready var player = get_node("/root/Game/World/Player")
 var explosion_scene = preload("res://scenes/explosion.tscn")
 var _ignite_sfx = preload("res://assets/music&sfx/sfx/data_pion-sfx9-fwoosh-324525.mp3")
 var _ignite_player: AudioStreamPlayer
diff --git a/scripts/debug_menu.gd b/scripts/debug_menu.gd
index 3cefc53..60e59de 100644
--- a/scripts/debug_menu.gd
+++ b/scripts/debug_menu.gd
@@ -1,9 +1,9 @@
 extends CanvasLayer
 
 @onready var _spawn_control = get_node("/root/Game/SpawnControl")
-@onready var _witch = get_node("/root/Game/Witch")
+@onready var _witch = get_node("/root/Game/World/Witch")
 @onready var _drop_manager = get_node("/root/Game/DropManager")
-@onready var _player = get_node("/root/Game/Player")
+@onready var _player = get_node("/root/Game/World/Player")
 
 var _fruit_scenes: Dictionary = {
 	"Apple": preload("res://scenes/apple.tscn"),
diff --git a/scripts/drop_manager.gd b/scripts/drop_manager.gd
index e60d251..3d43c0e 100644
--- a/scripts/drop_manager.gd
+++ b/scripts/drop_manager.gd
@@ -1,6 +1,6 @@
 extends Node2D
 
-@onready var player = get_node("/root/Game/Player")
+@onready var player = get_node("/root/Game/World/Player")
 @onready var bar = get_node("/root/Game/CanvasLayer/ProgressBar")
 signal leveled_up
 @export var fruit_drop_threshold: int = 7
diff --git a/scripts/enemy_base.gd b/scripts/enemy_base.gd
index c192a4f..bd8a809 100644
--- a/scripts/enemy_base.gd
+++ b/scripts/enemy_base.gd
@@ -23,8 +23,8 @@ var xp = 1
 func _ready() -> void:
 	add_to_group("enemies")
 	died.connect(get_node("/root/Game/DropManager").on_enemy_died)
-	witch = get_node("/root/Game/Witch")
-	player = get_node("/root/Game/Player")
+	witch = get_node("/root/Game/World/Witch")
+	player = get_node("/root/Game/World/Player")
 	animated_sprite_2d.sprite_frames = animated_sprite_2d.sprite_frames.duplicate()
 	hp = max_hp
 	$Area2D.body_entered.connect(_on_base_body_entered)
diff --git a/scripts/level_up_manager.gd b/scripts/level_up_manager.gd
index a5d6dbf..7dabd37 100644
--- a/scripts/level_up_manager.gd
+++ b/scripts/level_up_manager.gd
@@ -51,8 +51,8 @@ func show_perks():
 func select_perk(perk):
 	perk.effect.call()
 	get_tree().paused = false
-	_spawn_level_up_particles(get_node("/root/Game/Witch").global_position)
-	_spawn_level_up_particles(get_node("/root/Game/Player").global_position)
+	_spawn_level_up_particles(get_node("/root/Game/World/Witch").global_position)
+	_spawn_level_up_particles(get_node("/root/Game/World/Player").global_position)
 	perks.erase(perk)
 	for child in $HBoxContainer.get_children():
 		child.animate_out()
diff --git a/scripts/perk_effects.gd b/scripts/perk_effects.gd
index caa8584..1511a5e 100644
--- a/scripts/perk_effects.gd
+++ b/scripts/perk_effects.gd
@@ -1,7 +1,7 @@
 extends Node2D
 
-@onready var witch = get_node("/root/Game/Witch")
-@onready var player = get_node("/root/Game/Player")
+@onready var witch = get_node("/root/Game/World/Witch")
+@onready var player = get_node("/root/Game/World/Player")
 var fireball = preload("res://scenes/fireball.tscn")
 var throwing_knife = preload("res://scenes/throwing_knive.tscn")
 var cauldron
diff --git a/scripts/throwing_knive.gd b/scripts/throwing_knive.gd
index 26be2fd..470589a 100644
--- a/scripts/throwing_knive.gd
+++ b/scripts/throwing_knive.gd
@@ -6,7 +6,7 @@ func _ready() -> void:
 	super()
 	speed = 400.0
 	damage = 12
-	var witch = get_node("/root/Game/Witch")
+	var witch = get_node("/root/Game/World/Witch")
 	_target_enemy = witch.get_nearest_enemy(witch.global_position, _knife_filter)
 	if _target_enemy == null:
 		queue_free()