diff --git a/mods/buildings/computer/CHANGES.txt b/mods/furniture/computer/CHANGES.txt
similarity index 100%
rename from mods/buildings/computer/CHANGES.txt
rename to mods/furniture/computer/CHANGES.txt
diff --git a/mods/buildings/computer/README.txt b/mods/furniture/computer/README.txt
similarity index 100%
rename from mods/buildings/computer/README.txt
rename to mods/furniture/computer/README.txt
diff --git a/mods/buildings/computer/TODO.txt b/mods/furniture/computer/TODO.txt
similarity index 100%
rename from mods/buildings/computer/TODO.txt
rename to mods/furniture/computer/TODO.txt
diff --git a/mods/buildings/computer/computers.lua b/mods/furniture/computer/computers.lua
similarity index 100%
rename from mods/buildings/computer/computers.lua
rename to mods/furniture/computer/computers.lua
diff --git a/mods/buildings/computer/depends.txt b/mods/furniture/computer/depends.txt
similarity index 100%
rename from mods/buildings/computer/depends.txt
rename to mods/furniture/computer/depends.txt
diff --git a/mods/buildings/computer/init.lua b/mods/furniture/computer/init.lua
similarity index 100%
rename from mods/buildings/computer/init.lua
rename to mods/furniture/computer/init.lua
diff --git a/mods/buildings/computer/locale/es.txt b/mods/furniture/computer/locale/es.txt
similarity index 100%
rename from mods/buildings/computer/locale/es.txt
rename to mods/furniture/computer/locale/es.txt
diff --git a/mods/buildings/computer/miscitems.lua b/mods/furniture/computer/miscitems.lua
similarity index 100%
rename from mods/buildings/computer/miscitems.lua
rename to mods/furniture/computer/miscitems.lua
diff --git a/mods/buildings/computer/models/computer_laptop.obj b/mods/furniture/computer/models/computer_laptop.obj
similarity index 100%
rename from mods/buildings/computer/models/computer_laptop.obj
rename to mods/furniture/computer/models/computer_laptop.obj
diff --git a/mods/buildings/computer/models/computer_laptop_closed.obj b/mods/furniture/computer/models/computer_laptop_closed.obj
similarity index 100%
rename from mods/buildings/computer/models/computer_laptop_closed.obj
rename to mods/furniture/computer/models/computer_laptop_closed.obj
diff --git a/mods/buildings/computer/models/computer_monitor.obj b/mods/furniture/computer/models/computer_monitor.obj
similarity index 100%
rename from mods/buildings/computer/models/computer_monitor.obj
rename to mods/furniture/computer/models/computer_monitor.obj
diff --git a/mods/buildings/computer/models/computer_tower.obj b/mods/furniture/computer/models/computer_tower.obj
similarity index 100%
rename from mods/buildings/computer/models/computer_tower.obj
rename to mods/furniture/computer/models/computer_tower.obj
diff --git a/mods/buildings/computer/models/tetris_arcade.obj b/mods/furniture/computer/models/tetris_arcade.obj
similarity index 100%
rename from mods/buildings/computer/models/tetris_arcade.obj
rename to mods/furniture/computer/models/tetris_arcade.obj
diff --git a/mods/buildings/computer/recipes.lua b/mods/furniture/computer/recipes.lua
similarity index 100%
rename from mods/buildings/computer/recipes.lua
rename to mods/furniture/computer/recipes.lua
diff --git a/mods/buildings/computer/tetris.lua b/mods/furniture/computer/tetris.lua
similarity index 100%
rename from mods/buildings/computer/tetris.lua
rename to mods/furniture/computer/tetris.lua
diff --git a/mods/buildings/computer/textures/computer_ad128_inv.png b/mods/furniture/computer/textures/computer_ad128_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_ad128_inv.png
rename to mods/furniture/computer/textures/computer_ad128_inv.png
diff --git a/mods/buildings/computer/textures/computer_ad64_inv.png b/mods/furniture/computer/textures/computer_ad64_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_ad64_inv.png
rename to mods/furniture/computer/textures/computer_ad64_inv.png
diff --git a/mods/buildings/computer/textures/computer_admiral128_bk.png b/mods/furniture/computer/textures/computer_admiral128_bk.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral128_bk.png
rename to mods/furniture/computer/textures/computer_admiral128_bk.png
diff --git a/mods/buildings/computer/textures/computer_admiral128_bt.png b/mods/furniture/computer/textures/computer_admiral128_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral128_bt.png
rename to mods/furniture/computer/textures/computer_admiral128_bt.png
diff --git a/mods/buildings/computer/textures/computer_admiral128_ft.png b/mods/furniture/computer/textures/computer_admiral128_ft.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral128_ft.png
rename to mods/furniture/computer/textures/computer_admiral128_ft.png
diff --git a/mods/buildings/computer/textures/computer_admiral128_lt.png b/mods/furniture/computer/textures/computer_admiral128_lt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral128_lt.png
rename to mods/furniture/computer/textures/computer_admiral128_lt.png
diff --git a/mods/buildings/computer/textures/computer_admiral128_rt.png b/mods/furniture/computer/textures/computer_admiral128_rt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral128_rt.png
rename to mods/furniture/computer/textures/computer_admiral128_rt.png
diff --git a/mods/buildings/computer/textures/computer_admiral128_tp.png b/mods/furniture/computer/textures/computer_admiral128_tp.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral128_tp.png
rename to mods/furniture/computer/textures/computer_admiral128_tp.png
diff --git a/mods/buildings/computer/textures/computer_admiral64_bk.png b/mods/furniture/computer/textures/computer_admiral64_bk.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral64_bk.png
rename to mods/furniture/computer/textures/computer_admiral64_bk.png
diff --git a/mods/buildings/computer/textures/computer_admiral64_bt.png b/mods/furniture/computer/textures/computer_admiral64_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral64_bt.png
rename to mods/furniture/computer/textures/computer_admiral64_bt.png
diff --git a/mods/buildings/computer/textures/computer_admiral64_ft.png b/mods/furniture/computer/textures/computer_admiral64_ft.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral64_ft.png
rename to mods/furniture/computer/textures/computer_admiral64_ft.png
diff --git a/mods/buildings/computer/textures/computer_admiral64_lt.png b/mods/furniture/computer/textures/computer_admiral64_lt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral64_lt.png
rename to mods/furniture/computer/textures/computer_admiral64_lt.png
diff --git a/mods/buildings/computer/textures/computer_admiral64_rt.png b/mods/furniture/computer/textures/computer_admiral64_rt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral64_rt.png
rename to mods/furniture/computer/textures/computer_admiral64_rt.png
diff --git a/mods/buildings/computer/textures/computer_admiral64_tp.png b/mods/furniture/computer/textures/computer_admiral64_tp.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_admiral64_tp.png
rename to mods/furniture/computer/textures/computer_admiral64_tp.png
diff --git a/mods/buildings/computer/textures/computer_black.png b/mods/furniture/computer/textures/computer_black.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_black.png
rename to mods/furniture/computer/textures/computer_black.png
diff --git a/mods/buildings/computer/textures/computer_blue.png b/mods/furniture/computer/textures/computer_blue.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_blue.png
rename to mods/furniture/computer/textures/computer_blue.png
diff --git a/mods/buildings/computer/textures/computer_computer_front_old.png b/mods/furniture/computer/textures/computer_computer_front_old.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_computer_front_old.png
rename to mods/furniture/computer/textures/computer_computer_front_old.png
diff --git a/mods/buildings/computer/textures/computer_computer_top_old.png b/mods/furniture/computer/textures/computer_computer_top_old.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_computer_top_old.png
rename to mods/furniture/computer/textures/computer_computer_top_old.png
diff --git a/mods/buildings/computer/textures/computer_cyan.png b/mods/furniture/computer/textures/computer_cyan.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_cyan.png
rename to mods/furniture/computer/textures/computer_cyan.png
diff --git a/mods/buildings/computer/textures/computer_green.png b/mods/furniture/computer/textures/computer_green.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_green.png
rename to mods/furniture/computer/textures/computer_green.png
diff --git a/mods/buildings/computer/textures/computer_laptop.png b/mods/furniture/computer/textures/computer_laptop.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_laptop.png
rename to mods/furniture/computer/textures/computer_laptop.png
diff --git a/mods/buildings/computer/textures/computer_laptop_inv.png b/mods/furniture/computer/textures/computer_laptop_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_laptop_inv.png
rename to mods/furniture/computer/textures/computer_laptop_inv.png
diff --git a/mods/buildings/computer/textures/computer_magenta.png b/mods/furniture/computer/textures/computer_magenta.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_magenta.png
rename to mods/furniture/computer/textures/computer_magenta.png
diff --git a/mods/buildings/computer/textures/computer_monitor_inv.png b/mods/furniture/computer/textures/computer_monitor_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_monitor_inv.png
rename to mods/furniture/computer/textures/computer_monitor_inv.png
diff --git a/mods/buildings/computer/textures/computer_orange.png b/mods/furniture/computer/textures/computer_orange.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_orange.png
rename to mods/furniture/computer/textures/computer_orange.png
diff --git a/mods/buildings/computer/textures/computer_piepad_inv.png b/mods/furniture/computer/textures/computer_piepad_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_piepad_inv.png
rename to mods/furniture/computer/textures/computer_piepad_inv.png
diff --git a/mods/buildings/computer/textures/computer_piepad_inv_off.png b/mods/furniture/computer/textures/computer_piepad_inv_off.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_piepad_inv_off.png
rename to mods/furniture/computer/textures/computer_piepad_inv_off.png
diff --git a/mods/buildings/computer/textures/computer_printer_b.png b/mods/furniture/computer/textures/computer_printer_b.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_printer_b.png
rename to mods/furniture/computer/textures/computer_printer_b.png
diff --git a/mods/buildings/computer/textures/computer_printer_bt.png b/mods/furniture/computer/textures/computer_printer_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_printer_bt.png
rename to mods/furniture/computer/textures/computer_printer_bt.png
diff --git a/mods/buildings/computer/textures/computer_printer_f.png b/mods/furniture/computer/textures/computer_printer_f.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_printer_f.png
rename to mods/furniture/computer/textures/computer_printer_f.png
diff --git a/mods/buildings/computer/textures/computer_printer_inv.png b/mods/furniture/computer/textures/computer_printer_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_printer_inv.png
rename to mods/furniture/computer/textures/computer_printer_inv.png
diff --git a/mods/buildings/computer/textures/computer_printer_l.png b/mods/furniture/computer/textures/computer_printer_l.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_printer_l.png
rename to mods/furniture/computer/textures/computer_printer_l.png
diff --git a/mods/buildings/computer/textures/computer_printer_r.png b/mods/furniture/computer/textures/computer_printer_r.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_printer_r.png
rename to mods/furniture/computer/textures/computer_printer_r.png
diff --git a/mods/buildings/computer/textures/computer_printer_t.png b/mods/furniture/computer/textures/computer_printer_t.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_printer_t.png
rename to mods/furniture/computer/textures/computer_printer_t.png
diff --git a/mods/buildings/computer/textures/computer_ps1_inv.png b/mods/furniture/computer/textures/computer_ps1_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_ps1_inv.png
rename to mods/furniture/computer/textures/computer_ps1_inv.png
diff --git a/mods/buildings/computer/textures/computer_ps2_inv.png b/mods/furniture/computer/textures/computer_ps2_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_ps2_inv.png
rename to mods/furniture/computer/textures/computer_ps2_inv.png
diff --git a/mods/buildings/computer/textures/computer_red.png b/mods/furniture/computer/textures/computer_red.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_red.png
rename to mods/furniture/computer/textures/computer_red.png
diff --git a/mods/buildings/computer/textures/computer_router_b.png b/mods/furniture/computer/textures/computer_router_b.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_b.png
rename to mods/furniture/computer/textures/computer_router_b.png
diff --git a/mods/buildings/computer/textures/computer_router_bt.png b/mods/furniture/computer/textures/computer_router_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_bt.png
rename to mods/furniture/computer/textures/computer_router_bt.png
diff --git a/mods/buildings/computer/textures/computer_router_f.png b/mods/furniture/computer/textures/computer_router_f.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_f.png
rename to mods/furniture/computer/textures/computer_router_f.png
diff --git a/mods/buildings/computer/textures/computer_router_f_animated.png b/mods/furniture/computer/textures/computer_router_f_animated.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_f_animated.png
rename to mods/furniture/computer/textures/computer_router_f_animated.png
diff --git a/mods/buildings/computer/textures/computer_router_inv.png b/mods/furniture/computer/textures/computer_router_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_inv.png
rename to mods/furniture/computer/textures/computer_router_inv.png
diff --git a/mods/buildings/computer/textures/computer_router_l.png b/mods/furniture/computer/textures/computer_router_l.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_l.png
rename to mods/furniture/computer/textures/computer_router_l.png
diff --git a/mods/buildings/computer/textures/computer_router_r.png b/mods/furniture/computer/textures/computer_router_r.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_r.png
rename to mods/furniture/computer/textures/computer_router_r.png
diff --git a/mods/buildings/computer/textures/computer_router_t.png b/mods/furniture/computer/textures/computer_router_t.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_router_t.png
rename to mods/furniture/computer/textures/computer_router_t.png
diff --git a/mods/buildings/computer/textures/computer_server_bt.png b/mods/furniture/computer/textures/computer_server_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_server_bt.png
rename to mods/furniture/computer/textures/computer_server_bt.png
diff --git a/mods/buildings/computer/textures/computer_server_f_off.png b/mods/furniture/computer/textures/computer_server_f_off.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_server_f_off.png
rename to mods/furniture/computer/textures/computer_server_f_off.png
diff --git a/mods/buildings/computer/textures/computer_server_f_on.png b/mods/furniture/computer/textures/computer_server_f_on.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_server_f_on.png
rename to mods/furniture/computer/textures/computer_server_f_on.png
diff --git a/mods/buildings/computer/textures/computer_server_inv.png b/mods/furniture/computer/textures/computer_server_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_server_inv.png
rename to mods/furniture/computer/textures/computer_server_inv.png
diff --git a/mods/buildings/computer/textures/computer_server_l.png b/mods/furniture/computer/textures/computer_server_l.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_server_l.png
rename to mods/furniture/computer/textures/computer_server_l.png
diff --git a/mods/buildings/computer/textures/computer_server_r.png b/mods/furniture/computer/textures/computer_server_r.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_server_r.png
rename to mods/furniture/computer/textures/computer_server_r.png
diff --git a/mods/buildings/computer/textures/computer_server_t.png b/mods/furniture/computer/textures/computer_server_t.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_server_t.png
rename to mods/furniture/computer/textures/computer_server_t.png
diff --git a/mods/buildings/computer/textures/computer_shefriendSOO_bk.png b/mods/furniture/computer/textures/computer_shefriendSOO_bk.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_shefriendSOO_bk.png
rename to mods/furniture/computer/textures/computer_shefriendSOO_bk.png
diff --git a/mods/buildings/computer/textures/computer_shefriendSOO_bt.png b/mods/furniture/computer/textures/computer_shefriendSOO_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_shefriendSOO_bt.png
rename to mods/furniture/computer/textures/computer_shefriendSOO_bt.png
diff --git a/mods/buildings/computer/textures/computer_shefriendSOO_ft.png b/mods/furniture/computer/textures/computer_shefriendSOO_ft.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_shefriendSOO_ft.png
rename to mods/furniture/computer/textures/computer_shefriendSOO_ft.png
diff --git a/mods/buildings/computer/textures/computer_shefriendSOO_ft_off.png b/mods/furniture/computer/textures/computer_shefriendSOO_ft_off.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_shefriendSOO_ft_off.png
rename to mods/furniture/computer/textures/computer_shefriendSOO_ft_off.png
diff --git a/mods/buildings/computer/textures/computer_shefriendSOO_lt.png b/mods/furniture/computer/textures/computer_shefriendSOO_lt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_shefriendSOO_lt.png
rename to mods/furniture/computer/textures/computer_shefriendSOO_lt.png
diff --git a/mods/buildings/computer/textures/computer_shefriendSOO_rt.png b/mods/furniture/computer/textures/computer_shefriendSOO_rt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_shefriendSOO_rt.png
rename to mods/furniture/computer/textures/computer_shefriendSOO_rt.png
diff --git a/mods/buildings/computer/textures/computer_shefriendSOO_tp.png b/mods/furniture/computer/textures/computer_shefriendSOO_tp.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_shefriendSOO_tp.png
rename to mods/furniture/computer/textures/computer_shefriendSOO_tp.png
diff --git a/mods/buildings/computer/textures/computer_slaystation2_bk.png b/mods/furniture/computer/textures/computer_slaystation2_bk.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation2_bk.png
rename to mods/furniture/computer/textures/computer_slaystation2_bk.png
diff --git a/mods/buildings/computer/textures/computer_slaystation2_bt.png b/mods/furniture/computer/textures/computer_slaystation2_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation2_bt.png
rename to mods/furniture/computer/textures/computer_slaystation2_bt.png
diff --git a/mods/buildings/computer/textures/computer_slaystation2_ft.png b/mods/furniture/computer/textures/computer_slaystation2_ft.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation2_ft.png
rename to mods/furniture/computer/textures/computer_slaystation2_ft.png
diff --git a/mods/buildings/computer/textures/computer_slaystation2_ft_off.png b/mods/furniture/computer/textures/computer_slaystation2_ft_off.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation2_ft_off.png
rename to mods/furniture/computer/textures/computer_slaystation2_ft_off.png
diff --git a/mods/buildings/computer/textures/computer_slaystation2_lt.png b/mods/furniture/computer/textures/computer_slaystation2_lt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation2_lt.png
rename to mods/furniture/computer/textures/computer_slaystation2_lt.png
diff --git a/mods/buildings/computer/textures/computer_slaystation2_rt.png b/mods/furniture/computer/textures/computer_slaystation2_rt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation2_rt.png
rename to mods/furniture/computer/textures/computer_slaystation2_rt.png
diff --git a/mods/buildings/computer/textures/computer_slaystation2_tp.png b/mods/furniture/computer/textures/computer_slaystation2_tp.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation2_tp.png
rename to mods/furniture/computer/textures/computer_slaystation2_tp.png
diff --git a/mods/buildings/computer/textures/computer_slaystation_bk.png b/mods/furniture/computer/textures/computer_slaystation_bk.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation_bk.png
rename to mods/furniture/computer/textures/computer_slaystation_bk.png
diff --git a/mods/buildings/computer/textures/computer_slaystation_bt.png b/mods/furniture/computer/textures/computer_slaystation_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation_bt.png
rename to mods/furniture/computer/textures/computer_slaystation_bt.png
diff --git a/mods/buildings/computer/textures/computer_slaystation_ft.png b/mods/furniture/computer/textures/computer_slaystation_ft.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation_ft.png
rename to mods/furniture/computer/textures/computer_slaystation_ft.png
diff --git a/mods/buildings/computer/textures/computer_slaystation_lt.png b/mods/furniture/computer/textures/computer_slaystation_lt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation_lt.png
rename to mods/furniture/computer/textures/computer_slaystation_lt.png
diff --git a/mods/buildings/computer/textures/computer_slaystation_rt.png b/mods/furniture/computer/textures/computer_slaystation_rt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation_rt.png
rename to mods/furniture/computer/textures/computer_slaystation_rt.png
diff --git a/mods/buildings/computer/textures/computer_slaystation_tp.png b/mods/furniture/computer/textures/computer_slaystation_tp.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation_tp.png
rename to mods/furniture/computer/textures/computer_slaystation_tp.png
diff --git a/mods/buildings/computer/textures/computer_slaystation_tp_off.png b/mods/furniture/computer/textures/computer_slaystation_tp_off.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_slaystation_tp_off.png
rename to mods/furniture/computer/textures/computer_slaystation_tp_off.png
diff --git a/mods/buildings/computer/textures/computer_specter_bk.png b/mods/furniture/computer/textures/computer_specter_bk.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_specter_bk.png
rename to mods/furniture/computer/textures/computer_specter_bk.png
diff --git a/mods/buildings/computer/textures/computer_specter_bt.png b/mods/furniture/computer/textures/computer_specter_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_specter_bt.png
rename to mods/furniture/computer/textures/computer_specter_bt.png
diff --git a/mods/buildings/computer/textures/computer_specter_ft.png b/mods/furniture/computer/textures/computer_specter_ft.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_specter_ft.png
rename to mods/furniture/computer/textures/computer_specter_ft.png
diff --git a/mods/buildings/computer/textures/computer_specter_inv.png b/mods/furniture/computer/textures/computer_specter_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_specter_inv.png
rename to mods/furniture/computer/textures/computer_specter_inv.png
diff --git a/mods/buildings/computer/textures/computer_specter_lt.png b/mods/furniture/computer/textures/computer_specter_lt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_specter_lt.png
rename to mods/furniture/computer/textures/computer_specter_lt.png
diff --git a/mods/buildings/computer/textures/computer_specter_rt.png b/mods/furniture/computer/textures/computer_specter_rt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_specter_rt.png
rename to mods/furniture/computer/textures/computer_specter_rt.png
diff --git a/mods/buildings/computer/textures/computer_specter_tp.png b/mods/furniture/computer/textures/computer_specter_tp.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_specter_tp.png
rename to mods/furniture/computer/textures/computer_specter_tp.png
diff --git a/mods/buildings/computer/textures/computer_spectre_back.png b/mods/furniture/computer/textures/computer_spectre_back.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_spectre_back.png
rename to mods/furniture/computer/textures/computer_spectre_back.png
diff --git a/mods/buildings/computer/textures/computer_spectre_bottom.png b/mods/furniture/computer/textures/computer_spectre_bottom.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_spectre_bottom.png
rename to mods/furniture/computer/textures/computer_spectre_bottom.png
diff --git a/mods/buildings/computer/textures/computer_spectre_front.png b/mods/furniture/computer/textures/computer_spectre_front.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_spectre_front.png
rename to mods/furniture/computer/textures/computer_spectre_front.png
diff --git a/mods/buildings/computer/textures/computer_spectre_left.png b/mods/furniture/computer/textures/computer_spectre_left.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_spectre_left.png
rename to mods/furniture/computer/textures/computer_spectre_left.png
diff --git a/mods/buildings/computer/textures/computer_spectre_right.png b/mods/furniture/computer/textures/computer_spectre_right.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_spectre_right.png
rename to mods/furniture/computer/textures/computer_spectre_right.png
diff --git a/mods/buildings/computer/textures/computer_spectre_top.png b/mods/furniture/computer/textures/computer_spectre_top.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_spectre_top.png
rename to mods/furniture/computer/textures/computer_spectre_top.png
diff --git a/mods/buildings/computer/textures/computer_tower.png b/mods/furniture/computer/textures/computer_tower.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_tower.png
rename to mods/furniture/computer/textures/computer_tower.png
diff --git a/mods/buildings/computer/textures/computer_tower_inv.png b/mods/furniture/computer/textures/computer_tower_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_tower_inv.png
rename to mods/furniture/computer/textures/computer_tower_inv.png
diff --git a/mods/buildings/computer/textures/computer_wee_bk.png b/mods/furniture/computer/textures/computer_wee_bk.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wee_bk.png
rename to mods/furniture/computer/textures/computer_wee_bk.png
diff --git a/mods/buildings/computer/textures/computer_wee_bt.png b/mods/furniture/computer/textures/computer_wee_bt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wee_bt.png
rename to mods/furniture/computer/textures/computer_wee_bt.png
diff --git a/mods/buildings/computer/textures/computer_wee_ft.png b/mods/furniture/computer/textures/computer_wee_ft.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wee_ft.png
rename to mods/furniture/computer/textures/computer_wee_ft.png
diff --git a/mods/buildings/computer/textures/computer_wee_ft_off.png b/mods/furniture/computer/textures/computer_wee_ft_off.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wee_ft_off.png
rename to mods/furniture/computer/textures/computer_wee_ft_off.png
diff --git a/mods/buildings/computer/textures/computer_wee_lt.png b/mods/furniture/computer/textures/computer_wee_lt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wee_lt.png
rename to mods/furniture/computer/textures/computer_wee_lt.png
diff --git a/mods/buildings/computer/textures/computer_wee_rt.png b/mods/furniture/computer/textures/computer_wee_rt.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wee_rt.png
rename to mods/furniture/computer/textures/computer_wee_rt.png
diff --git a/mods/buildings/computer/textures/computer_wee_tp.png b/mods/furniture/computer/textures/computer_wee_tp.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wee_tp.png
rename to mods/furniture/computer/textures/computer_wee_tp.png
diff --git a/mods/buildings/computer/textures/computer_wii_inv.png b/mods/furniture/computer/textures/computer_wii_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_wii_inv.png
rename to mods/furniture/computer/textures/computer_wii_inv.png
diff --git a/mods/buildings/computer/textures/computer_yellow.png b/mods/furniture/computer/textures/computer_yellow.png
similarity index 100%
rename from mods/buildings/computer/textures/computer_yellow.png
rename to mods/furniture/computer/textures/computer_yellow.png
diff --git a/mods/buildings/computer/textures/homedecor_plastic_base.png b/mods/furniture/computer/textures/homedecor_plastic_base.png
similarity index 100%
rename from mods/buildings/computer/textures/homedecor_plastic_base.png
rename to mods/furniture/computer/textures/homedecor_plastic_base.png
diff --git a/mods/buildings/computer/textures/homedecor_plastic_base_inv.png b/mods/furniture/computer/textures/homedecor_plastic_base_inv.png
similarity index 100%
rename from mods/buildings/computer/textures/homedecor_plastic_base_inv.png
rename to mods/furniture/computer/textures/homedecor_plastic_base_inv.png
diff --git a/mods/buildings/computer/textures/homedecor_plastic_sheeting.png b/mods/furniture/computer/textures/homedecor_plastic_sheeting.png
similarity index 100%
rename from mods/buildings/computer/textures/homedecor_plastic_sheeting.png
rename to mods/furniture/computer/textures/homedecor_plastic_sheeting.png
diff --git a/mods/buildings/computer/textures/monitor_display.png b/mods/furniture/computer/textures/monitor_display.png
similarity index 100%
rename from mods/buildings/computer/textures/monitor_display.png
rename to mods/furniture/computer/textures/monitor_display.png
diff --git a/mods/buildings/computer/textures/monitor_plastic.png b/mods/furniture/computer/textures/monitor_plastic.png
similarity index 100%
rename from mods/buildings/computer/textures/monitor_plastic.png
rename to mods/furniture/computer/textures/monitor_plastic.png
diff --git a/mods/buildings/computer/textures/tetris_arcade.png b/mods/furniture/computer/textures/tetris_arcade.png
similarity index 100%
rename from mods/buildings/computer/textures/tetris_arcade.png
rename to mods/furniture/computer/textures/tetris_arcade.png
diff --git a/mods/buildings/plasmascreen/README.md b/mods/furniture/plasmascreen/README.md
similarity index 100%
rename from mods/buildings/plasmascreen/README.md
rename to mods/furniture/plasmascreen/README.md
diff --git a/mods/buildings/plasmascreen/depends.txt b/mods/furniture/plasmascreen/depends.txt
similarity index 100%
rename from mods/buildings/plasmascreen/depends.txt
rename to mods/furniture/plasmascreen/depends.txt
diff --git a/mods/buildings/plasmascreen/init.lua b/mods/furniture/plasmascreen/init.lua
similarity index 100%
rename from mods/buildings/plasmascreen/init.lua
rename to mods/furniture/plasmascreen/init.lua
diff --git a/mods/buildings/plasmascreen/models/plasmascreen_tv.obj b/mods/furniture/plasmascreen/models/plasmascreen_tv.obj
similarity index 100%
rename from mods/buildings/plasmascreen/models/plasmascreen_tv.obj
rename to mods/furniture/plasmascreen/models/plasmascreen_tv.obj
diff --git a/mods/buildings/plasmascreen/textures/plasmascreen_back.png b/mods/furniture/plasmascreen/textures/plasmascreen_back.png
similarity index 100%
rename from mods/buildings/plasmascreen/textures/plasmascreen_back.png
rename to mods/furniture/plasmascreen/textures/plasmascreen_back.png
diff --git a/mods/buildings/plasmascreen/textures/plasmascreen_case.png b/mods/furniture/plasmascreen/textures/plasmascreen_case.png
similarity index 100%
rename from mods/buildings/plasmascreen/textures/plasmascreen_case.png
rename to mods/furniture/plasmascreen/textures/plasmascreen_case.png
diff --git a/mods/buildings/plasmascreen/textures/plasmascreen_case_off.png b/mods/furniture/plasmascreen/textures/plasmascreen_case_off.png
similarity index 100%
rename from mods/buildings/plasmascreen/textures/plasmascreen_case_off.png
rename to mods/furniture/plasmascreen/textures/plasmascreen_case_off.png
diff --git a/mods/buildings/plasmascreen/textures/plasmascreen_screen_off.png b/mods/furniture/plasmascreen/textures/plasmascreen_screen_off.png
similarity index 100%
rename from mods/buildings/plasmascreen/textures/plasmascreen_screen_off.png
rename to mods/furniture/plasmascreen/textures/plasmascreen_screen_off.png
diff --git a/mods/buildings/plasmascreen/textures/plasmascreen_tv_inv.png b/mods/furniture/plasmascreen/textures/plasmascreen_tv_inv.png
similarity index 100%
rename from mods/buildings/plasmascreen/textures/plasmascreen_tv_inv.png
rename to mods/furniture/plasmascreen/textures/plasmascreen_tv_inv.png
diff --git a/mods/buildings/plasmascreen/textures/plasmascreen_video.png b/mods/furniture/plasmascreen/textures/plasmascreen_video.png
similarity index 100%
rename from mods/buildings/plasmascreen/textures/plasmascreen_video.png
rename to mods/furniture/plasmascreen/textures/plasmascreen_video.png