diff --git a/game/player/Body.gd b/game/player/Body.gd
index 2ad0c2c6..1d05ce51 100644
--- a/game/player/Body.gd
+++ b/game/player/Body.gd
@@ -801,7 +801,7 @@ func on_c_controlled_changed():
 			
 		set_process_input(false)
 		set_process_unhandled_input(false)
-		var nameplatescn : PackedScene = ResourceLoader.load("res://ui/nameplates/NamePlate.tscn")
+		var nameplatescn : PackedScene = ResourceLoader.load("res://ui/world/nameplates/NamePlate.tscn")
 		_nameplate = nameplatescn.instance()
 		add_child(_nameplate)
 		
diff --git a/game/ui/autoload/WorldNumbers.tscn b/game/ui/autoload/WorldNumbers.tscn
index 40ef41f5..f2c4f828 100644
--- a/game/ui/autoload/WorldNumbers.tscn
+++ b/game/ui/autoload/WorldNumbers.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://ui/autoload/WorldNumbers.gd" type="Script" id=1]
-[ext_resource path="res://ui/numbers/Number.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/world/numbers/Number.tscn" type="PackedScene" id=2]
 
 
 [node name="WorldNumbers" type="Node"]
diff --git a/game/ui/nameplates/NamePlate.tscn b/game/ui/world/nameplates/NamePlate.tscn
similarity index 90%
rename from game/ui/nameplates/NamePlate.tscn
rename to game/ui/world/nameplates/NamePlate.tscn
index 43518ef3..43684365 100644
--- a/game/ui/nameplates/NamePlate.tscn
+++ b/game/ui/world/nameplates/NamePlate.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/nameplates/name_plate_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/nameplates/texture_progress_fg.tres" type="Texture" id=2]
+[ext_resource path="res://ui/world/nameplates/name_plate_theme.tres" type="Theme" id=1]
+[ext_resource path="res://ui/world/nameplates/texture_progress_fg.tres" type="Texture" id=2]
 [ext_resource path="res://player/NamePlate.gd" type="Script" id=3]
 
 [node name="NamePlate" type="VBoxContainer"]
diff --git a/game/ui/nameplates/name_plate_dynamicfont.tres b/game/ui/world/nameplates/name_plate_dynamicfont.tres
similarity index 100%
rename from game/ui/nameplates/name_plate_dynamicfont.tres
rename to game/ui/world/nameplates/name_plate_dynamicfont.tres
diff --git a/game/ui/nameplates/name_plate_theme.tres b/game/ui/world/nameplates/name_plate_theme.tres
similarity index 91%
rename from game/ui/nameplates/name_plate_theme.tres
rename to game/ui/world/nameplates/name_plate_theme.tres
index 83e58955..f503ea97 100644
--- a/game/ui/nameplates/name_plate_theme.tres
+++ b/game/ui/world/nameplates/name_plate_theme.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=4 format=2]
 
-[ext_resource path="res://ui/nameplates/name_plate_dynamicfont.tres" type="DynamicFont" id=1]
+[ext_resource path="res://ui/world/nameplates/name_plate_dynamicfont.tres" type="DynamicFont" id=1]
 
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0.0627451, 0.0627451, 0.0627451, 0.823529 )
diff --git a/game/ui/nameplates/texture_progress_bg.tres b/game/ui/world/nameplates/texture_progress_bg.tres
similarity index 100%
rename from game/ui/nameplates/texture_progress_bg.tres
rename to game/ui/world/nameplates/texture_progress_bg.tres
diff --git a/game/ui/nameplates/texture_progress_fg.tres b/game/ui/world/nameplates/texture_progress_fg.tres
similarity index 100%
rename from game/ui/nameplates/texture_progress_fg.tres
rename to game/ui/world/nameplates/texture_progress_fg.tres
diff --git a/game/ui/numbers/Number.gd b/game/ui/world/numbers/Number.gd
similarity index 100%
rename from game/ui/numbers/Number.gd
rename to game/ui/world/numbers/Number.gd
diff --git a/game/ui/numbers/Number.tscn b/game/ui/world/numbers/Number.tscn
similarity index 93%
rename from game/ui/numbers/Number.tscn
rename to game/ui/world/numbers/Number.tscn
index c9dc9dd6..40303e55 100644
--- a/game/ui/numbers/Number.tscn
+++ b/game/ui/world/numbers/Number.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://ui/numbers/Number.gd" type="Script" id=1]
-[ext_resource path="res://ui/numbers/number_font.tres" type="DynamicFont" id=2]
+[ext_resource path="res://ui/world/numbers/Number.gd" type="Script" id=1]
+[ext_resource path="res://ui/world/numbers/number_font.tres" type="DynamicFont" id=2]
 
 [sub_resource type="Animation" id=1]
 resource_name = "crit"
diff --git a/game/ui/numbers/number_font.tres b/game/ui/world/numbers/number_font.tres
similarity index 99%
rename from game/ui/numbers/number_font.tres
rename to game/ui/world/numbers/number_font.tres
index 6f185f3f..de5e337e 100644
--- a/game/ui/numbers/number_font.tres
+++ b/game/ui/world/numbers/number_font.tres
@@ -2,7 +2,6 @@
 
 [ext_resource path="res://fonts/VT323-Regular.ttf" type="DynamicFontData" id=1]
 
-
 [resource]
 size = 12
 font_data = ExtResource( 1 )