diff --git a/addons b/addons
deleted file mode 120000
index 473b8cc6..00000000
--- a/addons
+++ /dev/null
@@ -1 +0,0 @@
-../escoria-demo-game/addons/
\ No newline at end of file
diff --git a/addons/escoria-core b/addons/escoria-core
new file mode 120000
index 00000000..bda2872d
--- /dev/null
+++ b/addons/escoria-core
@@ -0,0 +1 @@
+../../escoria-demo-game/addons/escoria-core
\ No newline at end of file
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn
rename to addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg
rename to addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres b/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
rename to addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn
rename to addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd
rename to addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn
rename to addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/MusicButton.gd b/addons/escoria-ui-return-monkey-island/MusicButton.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/MusicButton.gd
rename to addons/escoria-ui-return-monkey-island/MusicButton.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd b/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd
rename to addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_left.png b/addons/escoria-ui-return-monkey-island/cursors/mouse_left.png
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_left.png
rename to addons/escoria-ui-return-monkey-island/cursors/mouse_left.png
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_right.png b/addons/escoria-ui-return-monkey-island/cursors/mouse_right.png
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_right.png
rename to addons/escoria-ui-return-monkey-island/cursors/mouse_right.png
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png b/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png
rename to addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png b/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png
rename to addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd b/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd
rename to addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd b/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd
rename to addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd b/addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd
rename to addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd
rename to addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd b/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd
rename to addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd b/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd
rename to addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd
rename to addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd
rename to addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd
rename to addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn
rename to addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres b/addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres
rename to addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf b/addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf
rename to addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/addons/escoria-ui-return-monkey-island/game.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/game.gd
rename to addons/escoria-ui-return-monkey-island/game.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn b/addons/escoria-ui-return-monkey-island/game.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/game.tscn
rename to addons/escoria-ui-return-monkey-island/game.tscn
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-32.svg b/addons/escoria-ui-return-monkey-island/icons/cog-32.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-32.svg
rename to addons/escoria-ui-return-monkey-island/icons/cog-32.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg b/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg
rename to addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg b/addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg
rename to addons/escoria-ui-return-monkey-island/icons/cog-64-press.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg b/addons/escoria-ui-return-monkey-island/icons/cog-64.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg
rename to addons/escoria-ui-return-monkey-island/icons/cog-64.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/cog.svg b/addons/escoria-ui-return-monkey-island/icons/cog.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/cog.svg
rename to addons/escoria-ui-return-monkey-island/icons/cog.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg b/addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg
rename to addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg b/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg
rename to addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg b/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg
rename to addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg b/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg
rename to addons/escoria-ui-return-monkey-island/icons/music-double-note.svg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png b/addons/escoria-ui-return-monkey-island/images/grey.png
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png
rename to addons/escoria-ui-return-monkey-island/images/grey.png
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory-bg.png b/addons/escoria-ui-return-monkey-island/images/inventory-bg.png
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/images/inventory-bg.png
rename to addons/escoria-ui-return-monkey-island/images/inventory-bg.png
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_bg.png b/addons/escoria-ui-return-monkey-island/images/inventory_bg.png
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_bg.png
rename to addons/escoria-ui-return-monkey-island/images/inventory_bg.png
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd
rename to addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn
rename to addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd
rename to addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd
rename to addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd b/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd
rename to addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/item_outline.gd b/addons/escoria-ui-return-monkey-island/item_outline.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/item_outline.gd
rename to addons/escoria-ui-return-monkey-island/item_outline.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd
rename to addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn
rename to addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn
diff --git a/addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd b/addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd
new file mode 100644
index 00000000..e492969b
--- /dev/null
+++ b/addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd
@@ -0,0 +1,16 @@
+# Basic information about an inventory item
+class_name ESCInventoryItem
+
+
+# Global ID of the ESCItem that uses this ESCInventoryItem
+var global_id: String = ""
+
+# The texture for the item
+var texture: Texture = null
+
+
+func _init(p_item: ESCItem) -> void:
+	global_id = p_item.global_id
+	texture = p_item._get_inventory_texture()
+	p_item.register_components()
+
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/plugin.cfg b/addons/escoria-ui-return-monkey-island/plugin.cfg
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/plugin.cfg
rename to addons/escoria-ui-return-monkey-island/plugin.cfg
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/plugin.gd b/addons/escoria-ui-return-monkey-island/plugin.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/plugin.gd
rename to addons/escoria-ui-return-monkey-island/plugin.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd b/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd
rename to addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/theme.tres b/addons/escoria-ui-return-monkey-island/theme.tres
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/theme.tres
rename to addons/escoria-ui-return-monkey-island/theme.tres
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.gd b/addons/escoria-ui-return-monkey-island/video_player/video_player.gd
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.gd
rename to addons/escoria-ui-return-monkey-island/video_player/video_player.gd
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn b/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn
similarity index 100%
rename from gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn
rename to addons/escoria-ui-return-monkey-island/video_player/video_player.tscn
diff --git a/project.godot b/project.godot
index f5d66ec1..f5244fa6 100644
--- a/project.godot
+++ b/project.godot
@@ -117,7 +117,7 @@ _global_script_classes=[ {
 "base": "ESCActionManager",
 "class": "ESCActionManagerMonkey",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd"
 }, {
 "base": "Resource",
 "class": "ESCAnimationName",
@@ -287,27 +287,27 @@ _global_script_classes=[ {
 "base": "Node",
 "class": "ESCItemComponent",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponent.gd"
 }, {
 "base": "ESCItemComponent",
 "class": "ESCItemComponentInventoryChecker",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentInventoryChecker.gd"
 }, {
 "base": "ESCItemComponent",
 "class": "ESCItemComponentOutline",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/item_components/ESCItemComponentOutline.gd"
 }, {
 "base": "Resource",
 "class": "ESCItemCountManager",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc/esc_item_count_manager.gd"
 }, {
 "base": "ESCItem",
 "class": "ESCItemWithTooltip",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd"
 }, {
 "base": "Position2D",
 "class": "ESCLocation",
@@ -357,7 +357,7 @@ _global_script_classes=[ {
 "base": "ESCItemWithTooltip",
 "class": "ESCPlayerWithTooltip",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd"
 }, {
 "base": "Resource",
 "class": "ESCProjectSettingsManager",
@@ -377,12 +377,12 @@ _global_script_classes=[ {
 "base": "ESCDialogManager",
 "class": "ESCReturnToMonekyIslandDialogs",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd"
+"path": "res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd"
 }, {
 "base": "Node2D",
 "class": "ESCRichTooltip",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd"
 }, {
 "base": "Node2D",
 "class": "ESCRoom",
@@ -527,17 +527,17 @@ _global_script_classes=[ {
 "base": "ESCBaseCommand",
 "class": "ItemCountAddCommand",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc/commands/item_count_add.gd"
 }, {
 "base": "Polygon2D",
 "class": "ItemOutline",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/item_outline.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/item_outline.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "PlayLibSound",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc/commands/play_lib_snd.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "PlaySndCommand",
@@ -547,7 +547,7 @@ _global_script_classes=[ {
 "base": "ESCBaseCommand",
 "class": "PlayVideoCommand",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc/commands/play_video.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "PrintCommand",
@@ -567,17 +567,17 @@ _global_script_classes=[ {
 "base": "EditorPlugin",
 "class": "RTMISimpleDialogPlugin",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd"
+"path": "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd"
 }, {
 "base": "Resource",
 "class": "RTMISimpleDialogSettings",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd"
+"path": "res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd"
 }, {
 "base": "Resource",
 "class": "RTMIUiSettings",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/rtmi_ui_settings.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "RandGlobalCommand",
@@ -607,17 +607,17 @@ _global_script_classes=[ {
 "base": "ESCBaseCommand",
 "class": "SayLastDialogOptionCommand",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd"
+"path": "res://addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "SayRandomCommand",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd"
+"path": "res://addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "SaySequenceCommand",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd"
+"path": "res://addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "SchedEventCommand",
@@ -682,7 +682,7 @@ _global_script_classes=[ {
 "base": "ESCBaseCommand",
 "class": "SetTooltipCommand",
 "language": "GDScript",
-"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd"
+"path": "res://addons/escoria-ui-return-monkey-island/esc/commands/set_tooltip.gd"
 }, {
 "base": "ESCBaseCommand",
 "class": "ShowMenuCommand",
@@ -962,14 +962,14 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
 
 [editor_plugins]
 
-enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://gymkhana/addons/escoria-ui-return-monkey-island/plugin.cfg", "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg", "res://addons/escoria-wizard/plugin.cfg" )
+enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg", "res://addons/escoria-wizard/plugin.cfg" )
 
 [escoria]
 
 main/game_version="0.1.0"
 main/game_start_script="res://gymkhana/start_game.esc"
 main/force_quit=true
-main/command_directories=[ "res://addons/escoria-core/game/core-scripts/esc/commands", "res://gymkhana/addons/escoria-ui-return-monkey-island/esc/commands", "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/commands" ]
+main/command_directories=[ "res://addons/escoria-core/game/core-scripts/esc/commands", "res://addons/escoria-ui-return-monkey-island/esc/commands", "res://addons/escoria-ui-return-monkey-island-dialog-simple/commands" ]
 main/text_lang="es_ES"
 main/voice_lang="es_ES"
 main/savegames_path="res://saves/"
@@ -985,12 +985,12 @@ debug/crash_message="We're sorry, but the game crashed. Please send us the follo
 %s"
 debug/enable_room_selector=true
 debug/room_selector_room_dir="res://gymkhana/rooms/turno_cocina"
-ui/game_scene="res://gymkhana/addons/escoria-ui-return-monkey-island/game.tscn"
+ui/game_scene="res://addons/escoria-ui-return-monkey-island/game.tscn"
 ui/inventory_items_path="res://gymkhana/items/inventory"
 ui/default_transition="instant"
 ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ]
 ui/inventory_item_size=Vector2( 72, 72 )
-ui/dialog_managers=[ "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd" ]
+ui/dialog_managers=[ "res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd" ]
 sound/master_volume=1
 sound/music_volume=1
 sound/sfx_volume=1