diff --git a/mesecons_textures/textures/jeija_fiber.png b/mesecons/textures/jeija_fiber.png
similarity index 100%
rename from mesecons_textures/textures/jeija_fiber.png
rename to mesecons/textures/jeija_fiber.png
diff --git a/mesecons_textures/textures/jeija_glue.png b/mesecons/textures/jeija_glue.png
similarity index 100%
rename from mesecons_textures/textures/jeija_glue.png
rename to mesecons/textures/jeija_glue.png
diff --git a/mesecons_textures/textures/jeija_mesecon_crossing_off.png b/mesecons/textures/jeija_mesecon_crossing_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_crossing_off.png
rename to mesecons/textures/jeija_mesecon_crossing_off.png
diff --git a/mesecons_textures/textures/jeija_mesecon_crossing_on.png b/mesecons/textures/jeija_mesecon_crossing_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_crossing_on.png
rename to mesecons/textures/jeija_mesecon_crossing_on.png
diff --git a/mesecons_textures/textures/jeija_mesecon_curved_off.png b/mesecons/textures/jeija_mesecon_curved_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_curved_off.png
rename to mesecons/textures/jeija_mesecon_curved_off.png
diff --git a/mesecons_textures/textures/jeija_mesecon_curved_on.png b/mesecons/textures/jeija_mesecon_curved_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_curved_on.png
rename to mesecons/textures/jeija_mesecon_curved_on.png
diff --git a/mesecons_textures/textures/jeija_mesecon_inverter_off.png b/mesecons/textures/jeija_mesecon_inverter_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_inverter_off.png
rename to mesecons/textures/jeija_mesecon_inverter_off.png
diff --git a/mesecons_textures/textures/jeija_mesecon_inverter_on.png b/mesecons/textures/jeija_mesecon_inverter_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_inverter_on.png
rename to mesecons/textures/jeija_mesecon_inverter_on.png
diff --git a/mesecons_textures/textures/jeija_mesecon_off.png b/mesecons/textures/jeija_mesecon_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_off.png
rename to mesecons/textures/jeija_mesecon_off.png
diff --git a/mesecons_textures/textures/jeija_mesecon_on.png b/mesecons/textures/jeija_mesecon_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_on.png
rename to mesecons/textures/jeija_mesecon_on.png
diff --git a/mesecons_textures/textures/jeija_mesecon_plug.png b/mesecons/textures/jeija_mesecon_plug.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_plug.png
rename to mesecons/textures/jeija_mesecon_plug.png
diff --git a/mesecons_textures/textures/jeija_mesecon_socket_off.png b/mesecons/textures/jeija_mesecon_socket_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_socket_off.png
rename to mesecons/textures/jeija_mesecon_socket_off.png
diff --git a/mesecons_textures/textures/jeija_mesecon_socket_on.png b/mesecons/textures/jeija_mesecon_socket_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_socket_on.png
rename to mesecons/textures/jeija_mesecon_socket_on.png
diff --git a/mesecons_textures/textures/jeija_mesecon_switch_off.png b/mesecons/textures/jeija_mesecon_switch_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_switch_off.png
rename to mesecons/textures/jeija_mesecon_switch_off.png
diff --git a/mesecons_textures/textures/jeija_mesecon_switch_on.png b/mesecons/textures/jeija_mesecon_switch_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_switch_on.png
rename to mesecons/textures/jeija_mesecon_switch_on.png
diff --git a/mesecons_textures/textures/jeija_mesecon_switch_side.png b/mesecons/textures/jeija_mesecon_switch_side.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_switch_side.png
rename to mesecons/textures/jeija_mesecon_switch_side.png
diff --git a/mesecons_textures/textures/jeija_mesecon_t_junction_off.png b/mesecons/textures/jeija_mesecon_t_junction_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_t_junction_off.png
rename to mesecons/textures/jeija_mesecon_t_junction_off.png
diff --git a/mesecons_textures/textures/jeija_mesecon_t_junction_on.png b/mesecons/textures/jeija_mesecon_t_junction_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_mesecon_t_junction_on.png
rename to mesecons/textures/jeija_mesecon_t_junction_on.png
diff --git a/mesecons_textures/textures/jeija_silicon.png b/mesecons/textures/jeija_silicon.png
similarity index 100%
rename from mesecons_textures/textures/jeija_silicon.png
rename to mesecons/textures/jeija_silicon.png
diff --git a/mesecons_textures/textures/wires_bump_off.png b/mesecons/textures/wires_bump_off.png
similarity index 100%
rename from mesecons_textures/textures/wires_bump_off.png
rename to mesecons/textures/wires_bump_off.png
diff --git a/mesecons_textures/textures/wires_bump_on.png b/mesecons/textures/wires_bump_on.png
similarity index 100%
rename from mesecons_textures/textures/wires_bump_on.png
rename to mesecons/textures/wires_bump_on.png
diff --git a/mesecons_textures/textures/wires_full_off.png b/mesecons/textures/wires_full_off.png
similarity index 100%
rename from mesecons_textures/textures/wires_full_off.png
rename to mesecons/textures/wires_full_off.png
diff --git a/mesecons_textures/textures/wires_full_on.png b/mesecons/textures/wires_full_on.png
similarity index 100%
rename from mesecons_textures/textures/wires_full_on.png
rename to mesecons/textures/wires_full_on.png
diff --git a/mesecons_textures/textures/wires_inv.png b/mesecons/textures/wires_inv.png
similarity index 100%
rename from mesecons_textures/textures/wires_inv.png
rename to mesecons/textures/wires_inv.png
diff --git a/mesecons_textures/textures/wires_off.png b/mesecons/textures/wires_off.png
similarity index 100%
rename from mesecons_textures/textures/wires_off.png
rename to mesecons/textures/wires_off.png
diff --git a/mesecons_textures/textures/wires_on.png b/mesecons/textures/wires_on.png
similarity index 100%
rename from mesecons_textures/textures/wires_on.png
rename to mesecons/textures/wires_on.png
diff --git a/mesecons_textures/textures/wires_vertical_off.png b/mesecons/textures/wires_vertical_off.png
similarity index 100%
rename from mesecons_textures/textures/wires_vertical_off.png
rename to mesecons/textures/wires_vertical_off.png
diff --git a/mesecons_textures/textures/wires_vertical_on.png b/mesecons/textures/wires_vertical_on.png
similarity index 100%
rename from mesecons_textures/textures/wires_vertical_on.png
rename to mesecons/textures/wires_vertical_on.png
diff --git a/mesecons_textures/textures/jeija_blinky_plant_off.png b/mesecons_blinkyplant/textures/jeija_blinky_plant_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_blinky_plant_off.png
rename to mesecons_blinkyplant/textures/jeija_blinky_plant_off.png
diff --git a/mesecons_textures/textures/jeija_blinky_plant_on.png b/mesecons_blinkyplant/textures/jeija_blinky_plant_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_blinky_plant_on.png
rename to mesecons_blinkyplant/textures/jeija_blinky_plant_on.png
diff --git a/mesecons_textures/textures/jeija_wall_button_off.png b/mesecons_button/textures/jeija_wall_button_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_button_off.png
rename to mesecons_button/textures/jeija_wall_button_off.png
diff --git a/mesecons_textures/textures/jeija_wall_button_on.png b/mesecons_button/textures/jeija_wall_button_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_button_on.png
rename to mesecons_button/textures/jeija_wall_button_on.png
diff --git a/mesecons_textures/textures/jeija_wall_button_sides.png b/mesecons_button/textures/jeija_wall_button_sides.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_button_sides.png
rename to mesecons_button/textures/jeija_wall_button_sides.png
diff --git a/mesecons_textures/textures/jeija_close_window.png b/mesecons_commandblock/textures/jeija_close_window.png
similarity index 100%
rename from mesecons_textures/textures/jeija_close_window.png
rename to mesecons_commandblock/textures/jeija_close_window.png
diff --git a/mesecons_textures/textures/jeija_commandblock_off.png b/mesecons_commandblock/textures/jeija_commandblock_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_commandblock_off.png
rename to mesecons_commandblock/textures/jeija_commandblock_off.png
diff --git a/mesecons_textures/textures/jeija_commandblock_on.png b/mesecons_commandblock/textures/jeija_commandblock_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_commandblock_on.png
rename to mesecons_commandblock/textures/jeija_commandblock_on.png
diff --git a/mesecons_textures/textures/jeija_object_detector_off.png b/mesecons_detector/textures/jeija_object_detector_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_object_detector_off.png
rename to mesecons_detector/textures/jeija_object_detector_off.png
diff --git a/mesecons_textures/textures/jeija_object_detector_on.png b/mesecons_detector/textures/jeija_object_detector_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_object_detector_on.png
rename to mesecons_detector/textures/jeija_object_detector_on.png
diff --git a/mesecons_textures/textures/jeija_gate_and.png b/mesecons_gates/textures/jeija_gate_and.png
similarity index 100%
rename from mesecons_textures/textures/jeija_gate_and.png
rename to mesecons_gates/textures/jeija_gate_and.png
diff --git a/mesecons_textures/textures/jeija_gate_diode.png b/mesecons_gates/textures/jeija_gate_diode.png
similarity index 100%
rename from mesecons_textures/textures/jeija_gate_diode.png
rename to mesecons_gates/textures/jeija_gate_diode.png
diff --git a/mesecons_textures/textures/jeija_gate_nand.png b/mesecons_gates/textures/jeija_gate_nand.png
similarity index 100%
rename from mesecons_textures/textures/jeija_gate_nand.png
rename to mesecons_gates/textures/jeija_gate_nand.png
diff --git a/mesecons_textures/textures/jeija_gate_not.png b/mesecons_gates/textures/jeija_gate_not.png
similarity index 100%
rename from mesecons_textures/textures/jeija_gate_not.png
rename to mesecons_gates/textures/jeija_gate_not.png
diff --git a/mesecons_textures/textures/jeija_gate_off.png b/mesecons_gates/textures/jeija_gate_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_gate_off.png
rename to mesecons_gates/textures/jeija_gate_off.png
diff --git a/mesecons_textures/textures/jeija_gate_on.png b/mesecons_gates/textures/jeija_gate_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_gate_on.png
rename to mesecons_gates/textures/jeija_gate_on.png
diff --git a/mesecons_textures/textures/jeija_gate_xor.png b/mesecons_gates/textures/jeija_gate_xor.png
similarity index 100%
rename from mesecons_textures/textures/jeija_gate_xor.png
rename to mesecons_gates/textures/jeija_gate_xor.png
diff --git a/mesecons_textures/textures/jeija_hydro_turbine_off.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_hydro_turbine_off.png
rename to mesecons_hydroturbine/textures/jeija_hydro_turbine_off.png
diff --git a/mesecons_textures/textures/jeija_hydro_turbine_on.png b/mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_hydro_turbine_on.png
rename to mesecons_hydroturbine/textures/jeija_hydro_turbine_on.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_crossing_tb_01.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_crossing_tb_01.png
rename to mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_01.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_crossing_tb_10.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_crossing_tb_10.png
rename to mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_10.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_crossing_tb_off.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_crossing_tb_off.png
rename to mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_off.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_crossing_tb_on.png b/mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_crossing_tb_on.png
rename to mesecons_insulated/textures/jeija_insulated_wire_crossing_tb_on.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_curved_tb_off.png b/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_curved_tb_off.png
rename to mesecons_insulated/textures/jeija_insulated_wire_curved_tb_off.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png b/mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png
rename to mesecons_insulated/textures/jeija_insulated_wire_curved_tb_on.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_01x.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_ends_01x.png
rename to mesecons_insulated/textures/jeija_insulated_wire_ends_01x.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_01z.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_ends_01z.png
rename to mesecons_insulated/textures/jeija_insulated_wire_ends_01z.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_10x.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_ends_10x.png
rename to mesecons_insulated/textures/jeija_insulated_wire_ends_10x.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_10z.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_ends_10z.png
rename to mesecons_insulated/textures/jeija_insulated_wire_ends_10z.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_off.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_ends_off.png
rename to mesecons_insulated/textures/jeija_insulated_wire_ends_off.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_on.png b/mesecons_insulated/textures/jeija_insulated_wire_ends_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_ends_on.png
rename to mesecons_insulated/textures/jeija_insulated_wire_ends_on.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_sides_off.png b/mesecons_insulated/textures/jeija_insulated_wire_sides_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_sides_off.png
rename to mesecons_insulated/textures/jeija_insulated_wire_sides_off.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_sides_on.png b/mesecons_insulated/textures/jeija_insulated_wire_sides_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_sides_on.png
rename to mesecons_insulated/textures/jeija_insulated_wire_sides_on.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png b/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png
rename to mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_off.png
diff --git a/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png b/mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png
rename to mesecons_insulated/textures/jeija_insulated_wire_tjunction_tb_on.png
diff --git a/mesecons_textures/textures/jeija_meselamp.png b/mesecons_lamp/textures/jeija_meselamp.png
similarity index 100%
rename from mesecons_textures/textures/jeija_meselamp.png
rename to mesecons_lamp/textures/jeija_meselamp.png
diff --git a/mesecons_textures/textures/jeija_meselamp_off.png b/mesecons_lamp/textures/jeija_meselamp_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_meselamp_off.png
rename to mesecons_lamp/textures/jeija_meselamp_off.png
diff --git a/mesecons_textures/textures/jeija_meselamp_on.png b/mesecons_lamp/textures/jeija_meselamp_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_meselamp_on.png
rename to mesecons_lamp/textures/jeija_meselamp_on.png
diff --git a/mesecons_textures/textures/jeija_lightstone_blue_off.png b/mesecons_lightstone/textures/jeija_lightstone_blue_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_blue_off.png
rename to mesecons_lightstone/textures/jeija_lightstone_blue_off.png
diff --git a/mesecons_textures/textures/jeija_lightstone_blue_on.png b/mesecons_lightstone/textures/jeija_lightstone_blue_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_blue_on.png
rename to mesecons_lightstone/textures/jeija_lightstone_blue_on.png
diff --git a/mesecons_textures/textures/jeija_lightstone_darkgray_off.png b/mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_darkgray_off.png
rename to mesecons_lightstone/textures/jeija_lightstone_darkgray_off.png
diff --git a/mesecons_textures/textures/jeija_lightstone_darkgray_on.png b/mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_darkgray_on.png
rename to mesecons_lightstone/textures/jeija_lightstone_darkgray_on.png
diff --git a/mesecons_textures/textures/jeija_lightstone_gray_off.png b/mesecons_lightstone/textures/jeija_lightstone_gray_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_gray_off.png
rename to mesecons_lightstone/textures/jeija_lightstone_gray_off.png
diff --git a/mesecons_textures/textures/jeija_lightstone_gray_on.png b/mesecons_lightstone/textures/jeija_lightstone_gray_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_gray_on.png
rename to mesecons_lightstone/textures/jeija_lightstone_gray_on.png
diff --git a/mesecons_textures/textures/jeija_lightstone_green_off.png b/mesecons_lightstone/textures/jeija_lightstone_green_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_green_off.png
rename to mesecons_lightstone/textures/jeija_lightstone_green_off.png
diff --git a/mesecons_textures/textures/jeija_lightstone_green_on.png b/mesecons_lightstone/textures/jeija_lightstone_green_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_green_on.png
rename to mesecons_lightstone/textures/jeija_lightstone_green_on.png
diff --git a/mesecons_textures/textures/jeija_lightstone_red_off.png b/mesecons_lightstone/textures/jeija_lightstone_red_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_red_off.png
rename to mesecons_lightstone/textures/jeija_lightstone_red_off.png
diff --git a/mesecons_textures/textures/jeija_lightstone_red_on.png b/mesecons_lightstone/textures/jeija_lightstone_red_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_red_on.png
rename to mesecons_lightstone/textures/jeija_lightstone_red_on.png
diff --git a/mesecons_textures/textures/jeija_lightstone_yellow_off.png b/mesecons_lightstone/textures/jeija_lightstone_yellow_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_yellow_off.png
rename to mesecons_lightstone/textures/jeija_lightstone_yellow_off.png
diff --git a/mesecons_textures/textures/jeija_lightstone_yellow_on.png b/mesecons_lightstone/textures/jeija_lightstone_yellow_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_lightstone_yellow_on.png
rename to mesecons_lightstone/textures/jeija_lightstone_yellow_on.png
diff --git a/mesecons_textures/textures/jeija_luac_background.png b/mesecons_luacontroller/textures/jeija_luac_background.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luac_background.png
rename to mesecons_luacontroller/textures/jeija_luac_background.png
diff --git a/mesecons_textures/textures/jeija_luac_runbutton.png b/mesecons_luacontroller/textures/jeija_luac_runbutton.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luac_runbutton.png
rename to mesecons_luacontroller/textures/jeija_luac_runbutton.png
diff --git a/mesecons_textures/textures/jeija_luacontroller_LED_A.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luacontroller_LED_A.png
rename to mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png
diff --git a/mesecons_textures/textures/jeija_luacontroller_LED_B.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luacontroller_LED_B.png
rename to mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png
diff --git a/mesecons_textures/textures/jeija_luacontroller_LED_C.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luacontroller_LED_C.png
rename to mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png
diff --git a/mesecons_textures/textures/jeija_luacontroller_LED_D.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luacontroller_LED_D.png
rename to mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png
diff --git a/mesecons_textures/textures/jeija_luacontroller_burnt_top.png b/mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luacontroller_burnt_top.png
rename to mesecons_luacontroller/textures/jeija_luacontroller_burnt_top.png
diff --git a/mesecons_textures/textures/jeija_luacontroller_top.png b/mesecons_luacontroller/textures/jeija_luacontroller_top.png
similarity index 100%
rename from mesecons_textures/textures/jeija_luacontroller_top.png
rename to mesecons_luacontroller/textures/jeija_luacontroller_top.png
diff --git a/mesecons_textures/textures/jeija_microcontroller_LED_A.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png
similarity index 100%
rename from mesecons_textures/textures/jeija_microcontroller_LED_A.png
rename to mesecons_microcontroller/textures/jeija_microcontroller_LED_A.png
diff --git a/mesecons_textures/textures/jeija_microcontroller_LED_B.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png
similarity index 100%
rename from mesecons_textures/textures/jeija_microcontroller_LED_B.png
rename to mesecons_microcontroller/textures/jeija_microcontroller_LED_B.png
diff --git a/mesecons_textures/textures/jeija_microcontroller_LED_C.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png
similarity index 100%
rename from mesecons_textures/textures/jeija_microcontroller_LED_C.png
rename to mesecons_microcontroller/textures/jeija_microcontroller_LED_C.png
diff --git a/mesecons_textures/textures/jeija_microcontroller_LED_D.png b/mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png
similarity index 100%
rename from mesecons_textures/textures/jeija_microcontroller_LED_D.png
rename to mesecons_microcontroller/textures/jeija_microcontroller_LED_D.png
diff --git a/mesecons_textures/textures/jeija_microcontroller_bottom.png b/mesecons_microcontroller/textures/jeija_microcontroller_bottom.png
similarity index 100%
rename from mesecons_textures/textures/jeija_microcontroller_bottom.png
rename to mesecons_microcontroller/textures/jeija_microcontroller_bottom.png
diff --git a/mesecons_textures/textures/jeija_microcontroller_sides.png b/mesecons_microcontroller/textures/jeija_microcontroller_sides.png
similarity index 100%
rename from mesecons_textures/textures/jeija_microcontroller_sides.png
rename to mesecons_microcontroller/textures/jeija_microcontroller_sides.png
diff --git a/mesecons_textures/textures/jeija_microcontroller_top.png b/mesecons_microcontroller/textures/jeija_microcontroller_top.png
similarity index 100%
rename from mesecons_textures/textures/jeija_microcontroller_top.png
rename to mesecons_microcontroller/textures/jeija_microcontroller_top.png
diff --git a/mesecons_textures/textures/jeija_movestone_arrows.png b/mesecons_movestones/textures/jeija_movestone_arrows.png
similarity index 100%
rename from mesecons_textures/textures/jeija_movestone_arrows.png
rename to mesecons_movestones/textures/jeija_movestone_arrows.png
diff --git a/mesecons_textures/textures/jeija_movestone_side.png b/mesecons_movestones/textures/jeija_movestone_side.png
similarity index 100%
rename from mesecons_textures/textures/jeija_movestone_side.png
rename to mesecons_movestones/textures/jeija_movestone_side.png
diff --git a/mesecons_textures/textures/jeija_sticky_movestone.png b/mesecons_movestones/textures/jeija_sticky_movestone.png
similarity index 100%
rename from mesecons_textures/textures/jeija_sticky_movestone.png
rename to mesecons_movestones/textures/jeija_sticky_movestone.png
diff --git a/mesecons_textures/textures/mesecons_piston_back.png b/mesecons_pistons/textures/mesecons_piston_back.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_back.png
rename to mesecons_pistons/textures/mesecons_piston_back.png
diff --git a/mesecons_textures/textures/mesecons_piston_bottom.png b/mesecons_pistons/textures/mesecons_piston_bottom.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_bottom.png
rename to mesecons_pistons/textures/mesecons_piston_bottom.png
diff --git a/mesecons_textures/textures/mesecons_piston_left.png b/mesecons_pistons/textures/mesecons_piston_left.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_left.png
rename to mesecons_pistons/textures/mesecons_piston_left.png
diff --git a/mesecons_textures/textures/mesecons_piston_on_front.png b/mesecons_pistons/textures/mesecons_piston_on_front.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_on_front.png
rename to mesecons_pistons/textures/mesecons_piston_on_front.png
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_back.png b/mesecons_pistons/textures/mesecons_piston_pusher_back.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_pusher_back.png
rename to mesecons_pistons/textures/mesecons_piston_pusher_back.png
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_bottom.png b/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_pusher_bottom.png
rename to mesecons_pistons/textures/mesecons_piston_pusher_bottom.png
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_front.png b/mesecons_pistons/textures/mesecons_piston_pusher_front.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_pusher_front.png
rename to mesecons_pistons/textures/mesecons_piston_pusher_front.png
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png b/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png
rename to mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_left.png b/mesecons_pistons/textures/mesecons_piston_pusher_left.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_pusher_left.png
rename to mesecons_pistons/textures/mesecons_piston_pusher_left.png
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_right.png b/mesecons_pistons/textures/mesecons_piston_pusher_right.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_pusher_right.png
rename to mesecons_pistons/textures/mesecons_piston_pusher_right.png
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_top.png b/mesecons_pistons/textures/mesecons_piston_pusher_top.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_pusher_top.png
rename to mesecons_pistons/textures/mesecons_piston_pusher_top.png
diff --git a/mesecons_textures/textures/mesecons_piston_right.png b/mesecons_pistons/textures/mesecons_piston_right.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_right.png
rename to mesecons_pistons/textures/mesecons_piston_right.png
diff --git a/mesecons_textures/textures/mesecons_piston_top.png b/mesecons_pistons/textures/mesecons_piston_top.png
similarity index 100%
rename from mesecons_textures/textures/mesecons_piston_top.png
rename to mesecons_pistons/textures/mesecons_piston_top.png
diff --git a/mesecons_textures/textures/jeija_power_plant.png b/mesecons_powerplant/textures/jeija_power_plant.png
similarity index 100%
rename from mesecons_textures/textures/jeija_power_plant.png
rename to mesecons_powerplant/textures/jeija_power_plant.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_stone_inv.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_stone_inv.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_stone_inv.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_stone_off.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_stone_off.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_stone_off.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_stone_off_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_stone_off_edges.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_stone_off_edges.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_stone_on.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_stone_on.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_stone_on.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_stone_on_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_stone_on_edges.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_stone_on_edges.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_stone_wield.png b/mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_stone_wield.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_stone_wield.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_wood_inv.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_wood_inv.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_wood_inv.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_wood_off.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_wood_off.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_wood_off.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_wood_off_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_wood_off_edges.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_wood_off_edges.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_wood_on.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_wood_on.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_wood_on.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_wood_on_edges.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_wood_on_edges.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_wood_on_edges.png
diff --git a/mesecons_textures/textures/jeija_pressure_plate_wood_wield.png b/mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png
similarity index 100%
rename from mesecons_textures/textures/jeija_pressure_plate_wood_wield.png
rename to mesecons_pressureplates/textures/jeija_pressure_plate_wood_wield.png
diff --git a/mesecons_textures/textures/jeija_ghoststone.png b/mesecons_random/textures/jeija_ghoststone.png
similarity index 100%
rename from mesecons_textures/textures/jeija_ghoststone.png
rename to mesecons_random/textures/jeija_ghoststone.png
diff --git a/mesecons_textures/textures/jeija_ghoststone_inv.png b/mesecons_random/textures/jeija_ghoststone_inv.png
similarity index 100%
rename from mesecons_textures/textures/jeija_ghoststone_inv.png
rename to mesecons_random/textures/jeija_ghoststone_inv.png
diff --git a/mesecons_textures/textures/jeija_removestone.png b/mesecons_random/textures/jeija_removestone.png
similarity index 100%
rename from mesecons_textures/textures/jeija_removestone.png
rename to mesecons_random/textures/jeija_removestone.png
diff --git a/mesecons_textures/textures/jeija_removestone_inv.png b/mesecons_random/textures/jeija_removestone_inv.png
similarity index 100%
rename from mesecons_textures/textures/jeija_removestone_inv.png
rename to mesecons_random/textures/jeija_removestone_inv.png
diff --git a/mesecons_textures/textures/receiver_bottom_off.png b/mesecons_receiver/textures/receiver_bottom_off.png
similarity index 100%
rename from mesecons_textures/textures/receiver_bottom_off.png
rename to mesecons_receiver/textures/receiver_bottom_off.png
diff --git a/mesecons_textures/textures/receiver_bottom_on.png b/mesecons_receiver/textures/receiver_bottom_on.png
similarity index 100%
rename from mesecons_textures/textures/receiver_bottom_on.png
rename to mesecons_receiver/textures/receiver_bottom_on.png
diff --git a/mesecons_textures/textures/receiver_fb_off.png b/mesecons_receiver/textures/receiver_fb_off.png
similarity index 100%
rename from mesecons_textures/textures/receiver_fb_off.png
rename to mesecons_receiver/textures/receiver_fb_off.png
diff --git a/mesecons_textures/textures/receiver_fb_on.png b/mesecons_receiver/textures/receiver_fb_on.png
similarity index 100%
rename from mesecons_textures/textures/receiver_fb_on.png
rename to mesecons_receiver/textures/receiver_fb_on.png
diff --git a/mesecons_textures/textures/receiver_lr_off.png b/mesecons_receiver/textures/receiver_lr_off.png
similarity index 100%
rename from mesecons_textures/textures/receiver_lr_off.png
rename to mesecons_receiver/textures/receiver_lr_off.png
diff --git a/mesecons_textures/textures/receiver_lr_on.png b/mesecons_receiver/textures/receiver_lr_on.png
similarity index 100%
rename from mesecons_textures/textures/receiver_lr_on.png
rename to mesecons_receiver/textures/receiver_lr_on.png
diff --git a/mesecons_textures/textures/receiver_top_off.png b/mesecons_receiver/textures/receiver_top_off.png
similarity index 100%
rename from mesecons_textures/textures/receiver_top_off.png
rename to mesecons_receiver/textures/receiver_top_off.png
diff --git a/mesecons_textures/textures/receiver_top_on.png b/mesecons_receiver/textures/receiver_top_on.png
similarity index 100%
rename from mesecons_textures/textures/receiver_top_on.png
rename to mesecons_receiver/textures/receiver_top_on.png
diff --git a/mesecons_textures/textures/jeija_solar_panel.png b/mesecons_solarpanel/textures/jeija_solar_panel.png
similarity index 100%
rename from mesecons_textures/textures/jeija_solar_panel.png
rename to mesecons_solarpanel/textures/jeija_solar_panel.png
diff --git a/mesecons_textures/init.lua b/mesecons_textures/init.lua
deleted file mode 100644
index 704eb9c..0000000
--- a/mesecons_textures/init.lua
+++ /dev/null
@@ -1 +0,0 @@
--- place texture packs for mesecons into the textures folder here
diff --git a/mesecons_textures/textures/jeija_battery_charging.png b/mesecons_textures/textures/jeija_battery_charging.png
deleted file mode 100644
index e91c4d5..0000000
Binary files a/mesecons_textures/textures/jeija_battery_charging.png and /dev/null differ
diff --git a/mesecons_textures/textures/jeija_battery_discharging.png b/mesecons_textures/textures/jeija_battery_discharging.png
deleted file mode 100644
index 724a36d..0000000
Binary files a/mesecons_textures/textures/jeija_battery_discharging.png and /dev/null differ
diff --git a/mesecons_textures/textures/jeija_torches_off.png b/mesecons_torch/textures/jeija_torches_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_torches_off.png
rename to mesecons_torch/textures/jeija_torches_off.png
diff --git a/mesecons_textures/textures/jeija_torches_off_ceiling.png b/mesecons_torch/textures/jeija_torches_off_ceiling.png
similarity index 100%
rename from mesecons_textures/textures/jeija_torches_off_ceiling.png
rename to mesecons_torch/textures/jeija_torches_off_ceiling.png
diff --git a/mesecons_textures/textures/jeija_torches_off_side.png b/mesecons_torch/textures/jeija_torches_off_side.png
similarity index 100%
rename from mesecons_textures/textures/jeija_torches_off_side.png
rename to mesecons_torch/textures/jeija_torches_off_side.png
diff --git a/mesecons_textures/textures/jeija_torches_on.png b/mesecons_torch/textures/jeija_torches_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_torches_on.png
rename to mesecons_torch/textures/jeija_torches_on.png
diff --git a/mesecons_textures/textures/jeija_torches_on_ceiling.png b/mesecons_torch/textures/jeija_torches_on_ceiling.png
similarity index 100%
rename from mesecons_textures/textures/jeija_torches_on_ceiling.png
rename to mesecons_torch/textures/jeija_torches_on_ceiling.png
diff --git a/mesecons_textures/textures/jeija_torches_on_side.png b/mesecons_torch/textures/jeija_torches_on_side.png
similarity index 100%
rename from mesecons_textures/textures/jeija_torches_on_side.png
rename to mesecons_torch/textures/jeija_torches_on_side.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_back.png b/mesecons_walllever/textures/jeija_wall_lever_back.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_lever_back.png
rename to mesecons_walllever/textures/jeija_wall_lever_back.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_bottom.png b/mesecons_walllever/textures/jeija_wall_lever_bottom.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_lever_bottom.png
rename to mesecons_walllever/textures/jeija_wall_lever_bottom.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_off.png b/mesecons_walllever/textures/jeija_wall_lever_off.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_lever_off.png
rename to mesecons_walllever/textures/jeija_wall_lever_off.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_on.png b/mesecons_walllever/textures/jeija_wall_lever_on.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_lever_on.png
rename to mesecons_walllever/textures/jeija_wall_lever_on.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_sides.png b/mesecons_walllever/textures/jeija_wall_lever_sides.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_lever_sides.png
rename to mesecons_walllever/textures/jeija_wall_lever_sides.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_tb.png b/mesecons_walllever/textures/jeija_wall_lever_tb.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_lever_tb.png
rename to mesecons_walllever/textures/jeija_wall_lever_tb.png
diff --git a/mesecons_textures/textures/jeija_wall_lever_top.png b/mesecons_walllever/textures/jeija_wall_lever_top.png
similarity index 100%
rename from mesecons_textures/textures/jeija_wall_lever_top.png
rename to mesecons_walllever/textures/jeija_wall_lever_top.png