diff --git a/project.godot b/project.godot
index 0cc2d20..b6e7500 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Babushka"
-run/main_scene="uid://dbxy2y85r1d8x"
+run/main_scene="uid://dbgkbil1ultks"
 config/features=PackedStringArray("4.4", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 
diff --git a/scenes/babushka_scene_main.tscn b/scenes/babushka_scene_main.tscn
new file mode 100644
index 0000000..1ec9734
--- /dev/null
+++ b/scenes/babushka_scene_main.tscn
@@ -0,0 +1,17 @@
+[gd_scene load_steps=4 format=3 uid="uid://dbgkbil1ultks"]
+
+[ext_resource type="PackedScene" uid="uid://dbxy2y85r1d8x" path="res://scenes/worlds/Babushka_world_item_pickup_testing.tscn" id="1_l112d"]
+[ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="2_l45op"]
+[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="3_akoq3"]
+
+[node name="BabushkaSceneMain" type="Node"]
+
+[node name="WorldContainer" type="Node" parent="."]
+
+[node name="WorldItemPickupTest" parent="WorldContainer" instance=ExtResource("1_l112d")]
+
+[node name="Player3d" parent="." node_paths=PackedStringArray("_fieldParent") instance=ExtResource("2_l45op")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.51633, 0.725631, 3.57249)
+_fieldParent = NodePath("")
+
+[node name="Inventory" parent="." instance=ExtResource("3_akoq3")]
diff --git a/scenes/testing/Babushka_scene_item_pickup_testing.tscn b/scenes/worlds/Babushka_world_item_pickup_testing.tscn
similarity index 83%
rename from scenes/testing/Babushka_scene_item_pickup_testing.tscn
rename to scenes/worlds/Babushka_world_item_pickup_testing.tscn
index 39b37c4..a678057 100644
--- a/scenes/testing/Babushka_scene_item_pickup_testing.tscn
+++ b/scenes/worlds/Babushka_world_item_pickup_testing.tscn
@@ -1,9 +1,7 @@
-[gd_scene load_steps=12 format=3 uid="uid://dbxy2y85r1d8x"]
+[gd_scene load_steps=10 format=3 uid="uid://dbxy2y85r1d8x"]
 
-[ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="1_pdc5e"]
 [ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farming/base_field.tscn" id="2_741gk"]
 [ext_resource type="PackedScene" uid="uid://5hltxpdxmqcq" path="res://prefabs/interactions/generic_item_on_ground.tscn" id="5_sjt6k"]
-[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="6_876p1"]
 [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/bucket.tres" id="6_nvnpb"]
 [ext_resource type="Script" uid="uid://d17si23dtlg72" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
 [ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="7_hv2km"]
@@ -17,7 +15,7 @@ albedo_color = Color(0.505882, 0.588235, 0.494118, 1)
 [sub_resource type="BoxShape3D" id="BoxShape3D_t58di"]
 size = Vector3(2.01563, 0.160522, 2.00824)
 
-[node name="SceneFarmVesna" type="Node3D"]
+[node name="WorldItemPickupTest" type="Node3D"]
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
@@ -31,10 +29,6 @@ surface_material_override/0 = SubResource("StandardMaterial3D_8tgff")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000976563, -0.0739136, -0.00112915)
 shape = SubResource("BoxShape3D_t58di")
 
-[node name="Player3d" parent="." node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_pdc5e")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.51633, 0.725631, 3.57249)
-_fieldParent = NodePath("../FieldService")
-
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 0.618408, 0.785857, 0, -0.785857, 0.618408, -0.802612, 0, 4.73262)
 
@@ -42,8 +36,6 @@ transform = Transform3D(1, 0, 0, 0, 0.618408, 0.785857, 0, -0.785857, 0.618408,
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.0574723, 0)
 visible = false
 
-[node name="Inventory" parent="." instance=ExtResource("6_876p1")]
-
 [node name="FieldService" type="Node3D" parent="."]
 script = ExtResource("7_3rkjv")
 
@@ -69,6 +61,8 @@ _infiniteSupply = true
 [node name="SpawnWithItem" parent="GenericItemOnGround4" index="1"]
 _blueprint = ExtResource("8_hv2km")
 
+[node name="Spawnpoint" type="Node3D" parent="."]
+
 [editable path="GenericItemOnGround"]
 [editable path="GenericItemOnGround2"]
 [editable path="GenericItemOnGround3"]