From 888b0ebfec8c2eff9015163549a7e47443cb8665 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Fri, 1 Apr 2016 21:00:20 -0400
Subject: "explode" all modpacks into their individual components (you can't
 have a modpack buried inside a modpack)

---
 streets/asphalt/depends.txt                        |    3 -
 streets/asphalt/init.lua                           |   27 -
 streets/asphaltstairs/depends.txt                  |    3 -
 streets/asphaltstairs/init.lua                     |  244 ----
 streets/concretestairs/depends.txt                 |    4 -
 streets/concretestairs/init.lua                    |   12 -
 streets/constructionarea/depends.txt               |    3 -
 streets/constructionarea/init.lua                  |   70 -
 streets/delineator/depends.txt                     |    2 -
 streets/delineator/init.lua                        |   27 -
 streets/description.txt                            |    1 -
 streets/emergencyphone/depends.txt                 |    3 -
 streets/emergencyphone/init.lua                    |   25 -
 streets/infrastructure/README                      |   14 -
 .../advanced_aircraft_warning_light.lua            |   55 -
 .../advanced_automatic_warning_device.lua          |  464 ------
 streets/infrastructure/advanced_boom_barrier.lua   |  508 -------
 .../infrastructure/advanced_crosswalk_lighting.lua |   85 --
 .../advanced_crosswalk_safety_sign.lua             |   85 --
 .../advanced_crosswalk_warning_light.lua           |  124 --
 streets/infrastructure/advanced_curve_chevron.lua  |   85 --
 .../infrastructure/advanced_emergency_phone.lua    |  107 --
 .../advanced_lane_control_lights.lua               |   91 --
 streets/infrastructure/advanced_road_signs.lua     |  237 ----
 .../advanced_traffic_lights_pedestrians.lua        |  252 ----
 streets/infrastructure/advanced_warning_light.lua  |   47 -
 streets/infrastructure/crafts.lua                  |  443 ------
 streets/infrastructure/depends.txt                 |    8 -
 streets/infrastructure/init.lua                    |   26 -
 streets/infrastructure/nodes.lua                   | 1473 --------------------
 streets/infrastructure/nodes_extension.lua         |  162 ---
 streets/infrastructure/settings.lua                |   49 -
 .../infrastructure_automatic_warning_device.ogg    |  Bin 90708 -> 0 bytes
 .../sounds/infrastructure_boom_barrier.ogg         |  Bin 35717 -> 0 bytes
 .../infrastructure/sounds/infrastructure_ebell.ogg |  Bin 26398 -> 0 bytes
 .../sounds/infrastructure_emergency_phone.ogg      |  Bin 18073 -> 0 bytes
 .../sounds/infrastructure_traffic_lights_1.ogg     |  Bin 13500 -> 0 bytes
 .../sounds/infrastructure_traffic_lights_2.ogg     |  Bin 15454 -> 0 bytes
 ...astructure_aircraft_warning_light_side_anim.png |  Bin 550 -> 0 bytes
 ...rastructure_aircraft_warning_light_top_anim.png |  Bin 701 -> 0 bytes
 .../infrastructure_anti_dazzling_panel_side.png    |  Bin 960 -> 0 bytes
 ...frastructure_anti_dazzling_panel_top_bottom.png |  Bin 652 -> 0 bytes
 .../textures/infrastructure_asphalt.png            |  Bin 731 -> 0 bytes
 .../infrastructure_automatic_warning_device.png    |  Bin 8347 -> 0 bytes
 ...rastructure_automatic_warning_device_bottom.png |  Bin 450 -> 0 bytes
 ...rastructure_automatic_warning_device_middle.png |  Bin 1268 -> 0 bytes
 ...automatic_warning_device_middle_center_anim.png |  Bin 3429 -> 0 bytes
 ..._automatic_warning_device_middle_center_off.png |  Bin 2259 -> 0 bytes
 ...automatic_warning_device_middle_center_side.png |  Bin 1048 -> 0 bytes
 ...e_automatic_warning_device_middle_left_anim.png |  Bin 795 -> 0 bytes
 ...re_automatic_warning_device_middle_left_off.png |  Bin 373 -> 0 bytes
 ...e_automatic_warning_device_middle_left_side.png |  Bin 389 -> 0 bytes
 ..._automatic_warning_device_middle_right_anim.png |  Bin 822 -> 0 bytes
 ...e_automatic_warning_device_middle_right_off.png |  Bin 413 -> 0 bytes
 ..._automatic_warning_device_middle_right_side.png |  Bin 362 -> 0 bytes
 ...ucture_automatic_warning_device_middle_side.png |  Bin 603 -> 0 bytes
 ...infrastructure_automatic_warning_device_top.png |  Bin 2818 -> 0 bytes
 ...structure_automatic_warning_device_top_side.png |  Bin 878 -> 0 bytes
 ...structure_boom_barrier_arm_h_anim_darkfirst.png |  Bin 762 -> 0 bytes
 ...tructure_boom_barrier_arm_h_anim_lightfirst.png |  Bin 811 -> 0 bytes
 ...ucture_boom_barrier_arm_h_bottom_front_back.png |  Bin 315 -> 0 bytes
 ...ucture_boom_barrier_arm_h_left_right_bright.png |  Bin 600 -> 0 bytes
 .../infrastructure_boom_barrier_arm_h_top.png      |  Bin 359 -> 0 bytes
 .../infrastructure_boom_barrier_arm_v_left.png     |  Bin 550 -> 0 bytes
 .../infrastructure_boom_barrier_arm_v_right.png    |  Bin 527 -> 0 bytes
 .../infrastructure_boom_barrier_h_bottom.png       |  Bin 558 -> 0 bytes
 .../infrastructure_boom_barrier_h_front_back.png   |  Bin 504 -> 0 bytes
 .../infrastructure_boom_barrier_h_left.png         |  Bin 566 -> 0 bytes
 .../infrastructure_boom_barrier_h_right.png        |  Bin 562 -> 0 bytes
 .../textures/infrastructure_boom_barrier_h_top.png |  Bin 549 -> 0 bytes
 .../infrastructure_boom_barrier_v_bottom.png       |  Bin 509 -> 0 bytes
 .../infrastructure_boom_barrier_v_front_back.png   |  Bin 573 -> 0 bytes
 .../infrastructure_boom_barrier_v_left.png         |  Bin 532 -> 0 bytes
 .../infrastructure_boom_barrier_v_right.png        |  Bin 540 -> 0 bytes
 .../infrastructure_cable_barrier_terminal_back.png |  Bin 1217 -> 0 bytes
 ...infrastructure_cable_barrier_terminal_front.png |  Bin 1224 -> 0 bytes
 .../textures/infrastructure_concrete.png           |  Bin 732 -> 0 bytes
 .../infrastructure_corrugated_guide_rail_back.png  |  Bin 1142 -> 0 bytes
 .../infrastructure_corrugated_guide_rail_front.png |  Bin 1135 -> 0 bytes
 .../infrastructure_corrugated_guide_rail_side.png  |  Bin 1108 -> 0 bytes
 .../textures/infrastructure_corrugated_sheet.png   |  Bin 1166 -> 0 bytes
 .../infrastructure_crosswalk_lighting_back.png     |  Bin 1019 -> 0 bytes
 .../infrastructure_crosswalk_lighting_bottom.png   |  Bin 749 -> 0 bytes
 .../infrastructure_crosswalk_lighting_front.png    |  Bin 1025 -> 0 bytes
 .../infrastructure_crosswalk_safety_sign.png       |  Bin 703 -> 0 bytes
 ...ure_crosswalk_safety_sign_bottom_front_back.png |  Bin 498 -> 0 bytes
 ...structure_crosswalk_safety_sign_bottom_side.png |  Bin 348 -> 0 bytes
 .../infrastructure_crosswalk_safety_sign_top.png   |  Bin 479 -> 0 bytes
 ...ucture_crosswalk_safety_sign_top_front_back.png |  Bin 343 -> 0 bytes
 ...frastructure_crosswalk_safety_sign_top_side.png |  Bin 199 -> 0 bytes
 ...infrastructure_crosswalk_warning_light_back.png |  Bin 460 -> 0 bytes
 ...tructure_crosswalk_warning_light_front_anim.png |  Bin 1343 -> 0 bytes
 ...ucture_crosswalk_warning_light_front_bright.png |  Bin 1021 -> 0 bytes
 ...tructure_crosswalk_warning_light_front_dark.png |  Bin 606 -> 0 bytes
 ...infrastructure_crowd_control_barricade_back.png |  Bin 1050 -> 0 bytes
 ...nfrastructure_crowd_control_barricade_front.png |  Bin 1078 -> 0 bytes
 .../infrastructure_curve_chevron_left_bright.png   |  Bin 960 -> 0 bytes
 .../infrastructure_curve_chevron_left_dark.png     |  Bin 382 -> 0 bytes
 .../infrastructure_curve_chevron_right_bright.png  |  Bin 988 -> 0 bytes
 .../infrastructure_curve_chevron_right_dark.png    |  Bin 387 -> 0 bytes
 ...nfrastructure_delineator_retroreflector_red.png |  Bin 736 -> 0 bytes
 ...astructure_delineator_retroreflector_yellow.png |  Bin 792 -> 0 bytes
 .../infrastructure_delineator_wrapper_left.png     |  Bin 707 -> 0 bytes
 .../infrastructure_delineator_wrapper_right.png    |  Bin 713 -> 0 bytes
 .../infrastructure_drainage_channel_grating.png    |  Bin 1628 -> 0 bytes
 .../infrastructure_emergency_phone_bottom.png      |  Bin 544 -> 0 bytes
 .../infrastructure_emergency_phone_front.png       |  Bin 802 -> 0 bytes
 .../infrastructure_emergency_phone_side.png        |  Bin 768 -> 0 bytes
 .../infrastructure_emergency_phone_top.png         |  Bin 689 -> 0 bytes
 ...frastructure_energy_absorbing_terminal_back.png |  Bin 1160 -> 0 bytes
 ...rastructure_energy_absorbing_terminal_front.png |  Bin 865 -> 0 bytes
 .../infrastructure_fitch_barrel_bottom.png         |  Bin 713 -> 0 bytes
 .../textures/infrastructure_fitch_barrel_side.png  |  Bin 979 -> 0 bytes
 .../textures/infrastructure_fitch_barrel_top.png   |  Bin 625 -> 0 bytes
 .../textures/infrastructure_galvanized_steel.png   |  Bin 1067 -> 0 bytes
 .../textures/infrastructure_grid_paver_bottom.png  |  Bin 1093 -> 0 bytes
 .../textures/infrastructure_grid_paver_grass.png   |  Bin 443 -> 0 bytes
 .../textures/infrastructure_grid_paver_top.png     |  Bin 1597 -> 0 bytes
 .../infrastructure_lane_control_lights_1.png       |  Bin 1905 -> 0 bytes
 .../infrastructure_lane_control_lights_2.png       |  Bin 4010 -> 0 bytes
 .../infrastructure_lane_control_lights_3.png       |  Bin 4148 -> 0 bytes
 .../infrastructure_lane_control_lights_4.png       |  Bin 4159 -> 0 bytes
 .../infrastructure_lane_control_lights_5.png       |  Bin 4119 -> 0 bytes
 .../infrastructure_lane_control_lights_6.png       |  Bin 4160 -> 0 bytes
 .../textures/infrastructure_manhole_cover_side.png |  Bin 700 -> 0 bytes
 .../infrastructure_manhole_cover_top_bottom.png    |  Bin 670 -> 0 bytes
 .../textures/infrastructure_marker_bottom_side.png |  Bin 153 -> 0 bytes
 .../textures/infrastructure_marker_side_red.png    |  Bin 180 -> 0 bytes
 .../textures/infrastructure_marker_side_yellow.png |  Bin 183 -> 0 bytes
 .../infrastructure_marker_top_red_yellow.png       |  Bin 198 -> 0 bytes
 .../infrastructure_marker_top_yellow_yellow.png    |  Bin 182 -> 0 bytes
 .../textures/infrastructure_noise_barrier.png      |  Bin 1524 -> 0 bytes
 .../textures/infrastructure_razor_wire.png         |  Bin 926 -> 0 bytes
 .../textures/infrastructure_riffled_sheet.png      |  Bin 2145 -> 0 bytes
 .../infrastructure_road_sign_crosswalk_back.png    |  Bin 604 -> 0 bytes
 .../infrastructure_road_sign_crosswalk_front.png   |  Bin 1158 -> 0 bytes
 ...structure_road_sign_retroreflective_surface.png |  Bin 175 -> 0 bytes
 .../infrastructure_road_sign_right_of_way_back.png |  Bin 664 -> 0 bytes
 ...infrastructure_road_sign_right_of_way_front.png |  Bin 820 -> 0 bytes
 .../infrastructure_road_sign_stop_back.png         |  Bin 693 -> 0 bytes
 .../infrastructure_road_sign_stop_front.png        |  Bin 1208 -> 0 bytes
 .../infrastructure_road_sign_yield_back.png        |  Bin 575 -> 0 bytes
 .../infrastructure_road_sign_yield_front.png       |  Bin 742 -> 0 bytes
 .../infrastructure_traffic_cone_bottom.png         |  Bin 752 -> 0 bytes
 .../textures/infrastructure_traffic_cone_side.png  |  Bin 371 -> 0 bytes
 .../textures/infrastructure_traffic_cone_top.png   |  Bin 609 -> 0 bytes
 .../infrastructure_traffic_lights_pedestrians.png  |  Bin 1899 -> 0 bytes
 ...ture_traffic_lights_pedestrians_bottom_back.png |  Bin 495 -> 0 bytes
 ...e_traffic_lights_pedestrians_bottom_front_1.png |  Bin 798 -> 0 bytes
 ...e_traffic_lights_pedestrians_bottom_front_2.png |  Bin 798 -> 0 bytes
 ...e_traffic_lights_pedestrians_bottom_front_3.png |  Bin 999 -> 0 bytes
 ...e_traffic_lights_pedestrians_bottom_front_4.png |  Bin 999 -> 0 bytes
 ...ructure_traffic_lights_pedestrians_top_back.png |  Bin 459 -> 0 bytes
 ...ture_traffic_lights_pedestrians_top_front_1.png |  Bin 938 -> 0 bytes
 ...ture_traffic_lights_pedestrians_top_front_2.png |  Bin 938 -> 0 bytes
 ...ture_traffic_lights_pedestrians_top_front_3.png |  Bin 693 -> 0 bytes
 ...ture_traffic_lights_pedestrians_top_front_4.png |  Bin 693 -> 0 bytes
 .../infrastructure_traffic_lights_side.png         |  Bin 568 -> 0 bytes
 .../infrastructure_traffic_lights_vehicles.png     |  Bin 3062 -> 0 bytes
 ...astructure_traffic_lights_vehicles_bottom_1.png |  Bin 851 -> 0 bytes
 ...astructure_traffic_lights_vehicles_bottom_2.png |  Bin 1264 -> 0 bytes
 ...astructure_traffic_lights_vehicles_bottom_3.png |  Bin 1518 -> 0 bytes
 ...astructure_traffic_lights_vehicles_bottom_4.png |  Bin 1264 -> 0 bytes
 ...nfrastructure_traffic_lights_vehicles_top_1.png |  Bin 1382 -> 0 bytes
 ...nfrastructure_traffic_lights_vehicles_top_2.png |  Bin 1612 -> 0 bytes
 ...nfrastructure_traffic_lights_vehicles_top_3.png |  Bin 817 -> 0 bytes
 ...nfrastructure_traffic_lights_vehicles_top_4.png |  Bin 1159 -> 0 bytes
 .../textures/infrastructure_truss.png              |  Bin 1328 -> 0 bytes
 .../textures/infrastructure_warning_light_back.png |  Bin 481 -> 0 bytes
 .../infrastructure_warning_light_bottom.png        |  Bin 269 -> 0 bytes
 .../infrastructure_warning_light_front_anim.png    |  Bin 1219 -> 0 bytes
 .../textures/infrastructure_warning_light_left.png |  Bin 247 -> 0 bytes
 .../infrastructure_warning_light_right.png         |  Bin 236 -> 0 bytes
 .../textures/infrastructure_warning_light_top.png  |  Bin 250 -> 0 bytes
 .../textures/infrastructure_wire_netting.png       |  Bin 1030 -> 0 bytes
 ...nfrastructure_wire_rope_safety_barrier_back.png |  Bin 1134 -> 0 bytes
 ...frastructure_wire_rope_safety_barrier_front.png |  Bin 1146 -> 0 bytes
 streets/labels/depends.txt                         |    4 -
 streets/labels/init.lua                            |  355 -----
 .../textures/infrastructure_double_yellow_line.png |  Bin 270 -> 0 bytes
 .../textures/infrastructure_single_yellow_line.png |  Bin 231 -> 0 bytes
 .../infrastructure_single_yellow_line_corner.png   |  Bin 250 -> 0 bytes
 ...rastructure_solid_double_yellow_line_corner.png |  Bin 239 -> 0 bytes
 .../infrastructure_solid_yellow_line_one_side.png  |  Bin 272 -> 0 bytes
 streets/labels/textures/streets_arrow_alldirs.png  |  Bin 7932 -> 0 bytes
 streets/labels/textures/streets_arrow_left.png     |  Bin 7662 -> 0 bytes
 streets/labels/textures/streets_arrow_right.png    |  Bin 7605 -> 0 bytes
 streets/labels/textures/streets_arrow_straight.png |  Bin 7564 -> 0 bytes
 .../textures/streets_arrow_straight_left.png       |  Bin 7770 -> 0 bytes
 .../textures/streets_arrow_straight_right.png      |  Bin 7719 -> 0 bytes
 .../textures/streets_asphalt_dashed_line.png       |  Bin 7946 -> 0 bytes
 .../labels/textures/streets_asphalt_outer_edge.png |  Bin 4526 -> 0 bytes
 streets/labels/textures/streets_asphalt_side.png   |  Bin 3821 -> 0 bytes
 streets/labels/textures/streets_asphalt_side_r.png |  Bin 3812 -> 0 bytes
 .../labels/textures/streets_asphalt_solid_line.png |  Bin 8003 -> 0 bytes
 streets/labels/textures/streets_parking.png        |  Bin 6911 -> 0 bytes
 streets/labels/textures/streets_rw_arrow_left.png  |  Bin 8954 -> 0 bytes
 streets/labels/textures/streets_rw_arrow_right.png |  Bin 8951 -> 0 bytes
 .../labels/textures/streets_rw_arrow_straight.png  |  Bin 8796 -> 0 bytes
 .../textures/streets_rw_arrow_straight_left.png    |  Bin 9403 -> 0 bytes
 .../textures/streets_rw_arrow_straight_right.png   |  Bin 9306 -> 0 bytes
 .../labels/textures/streets_rw_asphalt_side.png    |  Bin 4190 -> 0 bytes
 streets/labels/textures/streets_rw_cross.png       |  Bin 2586 -> 0 bytes
 streets/labels/textures/streets_rw_dashed_line.png |  Bin 7944 -> 0 bytes
 .../textures/streets_rw_dashed_line_crossing.png   |  Bin 3841 -> 0 bytes
 .../textures/streets_rw_dashed_line_curve.png      |  Bin 3333 -> 0 bytes
 .../textures/streets_rw_dashed_line_tjunction.png  |  Bin 4099 -> 0 bytes
 streets/labels/textures/streets_rw_outer_edge.png  |  Bin 5169 -> 0 bytes
 streets/labels/textures/streets_rw_parking.png     |  Bin 8571 -> 0 bytes
 streets/labels/textures/streets_rw_solid_line.png  |  Bin 8058 -> 0 bytes
 .../textures/streets_rw_solid_line_crossing.png    |  Bin 4005 -> 0 bytes
 .../textures/streets_rw_solid_line_curve.png       |  Bin 3657 -> 0 bytes
 .../textures/streets_rw_solid_line_tjunction.png   |  Bin 3702 -> 0 bytes
 streets/labels/textures/streets_rw_transparent.png |  Bin 3836 -> 0 bytes
 streets/license.txt                                |   60 -
 streets/manholes/depends.txt                       |    2 -
 streets/manholes/init.lua                          |   88 --
 streets/modpack.txt                                |    1 -
 streets/readme.txt                                 |  Bin 1720 -> 0 bytes
 streets/roadsigns/depends.txt                      |    2 -
 streets/roadsigns/init.lua                         |   42 -
 streets/roadsigns/signs.lua                        |   17 -
 streets/roadsigns/workshop.lua                     |  158 ---
 streets/screenshot.png                             |  Bin 818904 -> 0 bytes
 streets/steelsupport/depends.txt                   |    2 -
 streets/steelsupport/init.lua                      |   20 -
 streets/streetlamps/depends.txt                    |    3 -
 streets/streetlamps/init.lua                       |  128 --
 streets/streetsawards/depends.txt                  |    2 -
 streets/streetsawards/init.lua                     |   22 -
 streets/streetsconcrete/depends.txt                |    2 -
 streets/streetsconcrete/init.lua                   |  156 ---
 streets/streetshotfix/depends.txt                  |    1 -
 streets/streetshotfix/init.lua                     |    9 -
 streets/streetsmod/depends.txt                     |    3 -
 streets/streetsmod/forms.lua                       |    4 -
 streets/streetsmod/forms/cmd_streets.smartfs       |    1 -
 streets/streetsmod/init.lua                        |   89 --
 streets/streetsmod/libs/smartfs/README.md          |   88 --
 streets/streetsmod/libs/smartfs/api.md             |  107 --
 streets/streetsmod/libs/smartfs/depends.txt        |    2 -
 streets/streetsmod/libs/smartfs/example.lua        |   66 -
 streets/streetsmod/libs/smartfs/example.smartfs    |    1 -
 streets/streetsmod/libs/smartfs/init.lua           |    2 -
 streets/streetsmod/libs/smartfs/smartfs.lua        |  760 ----------
 streets/streetsmod/locale/de.txt                   |   59 -
 streets/streetsmod/locale/template.txt.txt         |   59 -
 streets/streetsmod/nodeboxes/trafficlight.nbe      |   19 -
 streets/streetsmod/readme.txt                      |    1 -
 streets/streetsmod/textures/streets_asphalt.png    |  Bin 5993 -> 0 bytes
 streets/streetsmod/textures/streets_concrete.png   |  Bin 7482 -> 0 bytes
 streets/streetsmod/textures/streets_delineator.png |  Bin 5674 -> 0 bytes
 .../streetsmod/textures/streets_delineator_top.png |  Bin 184 -> 0 bytes
 .../streetsmod/textures/streets_fence_bottom.png   |  Bin 644 -> 0 bytes
 .../streetsmod/textures/streets_fence_fromtop.png  |  Bin 215 -> 0 bytes
 streets/streetsmod/textures/streets_fence_inv.png  |  Bin 845 -> 0 bytes
 streets/streetsmod/textures/streets_fence_top.png  |  Bin 441 -> 0 bytes
 .../textures/streets_lampcontroller_bottom.png     |  Bin 532 -> 0 bytes
 .../textures/streets_lampcontroller_sides.png      |  Bin 651 -> 0 bytes
 .../textures/streets_lampcontroller_top.png        |  Bin 688 -> 0 bytes
 .../streetsmod/textures/streets_lamps_basi_inv.png |  Bin 4210 -> 0 bytes
 .../textures/streets_lamps_basic_bottom.png        |  Bin 3121 -> 0 bytes
 .../textures/streets_lamps_basic_middle.png        |  Bin 6634 -> 0 bytes
 .../textures/streets_lamps_basic_top.png           |  Bin 5112 -> 0 bytes
 .../textures/streets_lamps_basic_top_top.png       |  Bin 6359 -> 0 bytes
 streets/streetsmod/textures/streets_manhole.png    |  Bin 10833 -> 0 bytes
 .../textures/streets_manhole_advanced.png          |  Bin 9205 -> 0 bytes
 streets/streetsmod/textures/streets_pole.png       |  Bin 496 -> 0 bytes
 streets/streetsmod/textures/streets_pole_inv.png   |  Bin 767 -> 0 bytes
 .../textures/streets_rw_arrow_alldirs.png          |  Bin 9866 -> 0 bytes
 streets/streetsmod/textures/streets_sign_back.png  |  Bin 1808 -> 0 bytes
 .../textures/streets_sign_construction.png         |  Bin 4007 -> 0 bytes
 .../streetsmod/textures/streets_sign_grasswalk.png |  Bin 21692 -> 0 bytes
 streets/streetsmod/textures/streets_sign_lava.png  |  Bin 4453 -> 0 bytes
 streets/streetsmod/textures/streets_sign_mine.png  |  Bin 2412 -> 0 bytes
 streets/streetsmod/textures/streets_sign_shop.png  |  Bin 2664 -> 0 bytes
 streets/streetsmod/textures/streets_sign_water.png |  Bin 3730 -> 0 bytes
 .../streetsmod/textures/streets_sign_workshop.png  |  Bin 2320 -> 0 bytes
 .../textures/streets_signworkshop_bottom.png       |  Bin 1942 -> 0 bytes
 .../textures/streets_signworkshop_front.png        |  Bin 2138 -> 0 bytes
 .../textures/streets_signworkshop_side.png         |  Bin 1888 -> 0 bytes
 .../textures/streets_signworkshop_top.png          |  Bin 2026 -> 0 bytes
 streets/streetsmod/textures/streets_sos_bottom.png |  Bin 1961 -> 0 bytes
 streets/streetsmod/textures/streets_sos_front.png  |  Bin 6989 -> 0 bytes
 streets/streetsmod/textures/streets_sos_side.png   |  Bin 2529 -> 0 bytes
 streets/streetsmod/textures/streets_sos_top.png    |  Bin 6980 -> 0 bytes
 streets/streetsmod/textures/streets_support.png    |  Bin 6380 -> 0 bytes
 streets/streetspoles/depends.txt                   |    1 -
 streets/streetspoles/init.lua                      |  191 ---
 streets/trafficlight/depends.txt                   |    4 -
 streets/trafficlight/init.lua                      |  367 -----
 streets/trafficlight/old2new.lua                   |   58 -
 streets/trafficlight/textures/streets_tl_bg.png    |  Bin 750 -> 0 bytes
 .../trafficlight/textures/streets_tl_flashred.png  |  Bin 1170 -> 0 bytes
 streets/trafficlight/textures/streets_tl_green.png |  Bin 954 -> 0 bytes
 .../textures/streets_tl_left_flashred.png          |  Bin 1234 -> 0 bytes
 .../textures/streets_tl_left_green.png             |  Bin 976 -> 0 bytes
 .../trafficlight/textures/streets_tl_left_off.png  |  Bin 913 -> 0 bytes
 .../trafficlight/textures/streets_tl_left_red.png  |  Bin 941 -> 0 bytes
 .../trafficlight/textures/streets_tl_left_warn.png |  Bin 1263 -> 0 bytes
 .../textures/streets_tl_left_yellow.png            |  Bin 988 -> 0 bytes
 streets/trafficlight/textures/streets_tl_off.png   |  Bin 843 -> 0 bytes
 streets/trafficlight/textures/streets_tl_red.png   |  Bin 942 -> 0 bytes
 .../textures/streets_tl_right_flashred.png         |  Bin 1243 -> 0 bytes
 .../textures/streets_tl_right_green.png            |  Bin 950 -> 0 bytes
 .../trafficlight/textures/streets_tl_right_off.png |  Bin 892 -> 0 bytes
 .../trafficlight/textures/streets_tl_right_red.png |  Bin 941 -> 0 bytes
 .../textures/streets_tl_right_warn.png             |  Bin 1240 -> 0 bytes
 .../textures/streets_tl_right_yellow.png           |  Bin 976 -> 0 bytes
 streets/trafficlight/textures/streets_tl_warn.png  |  Bin 3683 -> 0 bytes
 .../trafficlight/textures/streets_tl_yellow.png    |  Bin 1003 -> 0 bytes
 .../textures/streets_trafficlight_inv.png          |  Bin 2772 -> 0 bytes
 .../textures/streets_trafficlight_template.png     |  Bin 320 -> 0 bytes
 313 files changed, 7695 deletions(-)
 delete mode 100644 streets/asphalt/depends.txt
 delete mode 100644 streets/asphalt/init.lua
 delete mode 100644 streets/asphaltstairs/depends.txt
 delete mode 100644 streets/asphaltstairs/init.lua
 delete mode 100644 streets/concretestairs/depends.txt
 delete mode 100644 streets/concretestairs/init.lua
 delete mode 100644 streets/constructionarea/depends.txt
 delete mode 100644 streets/constructionarea/init.lua
 delete mode 100644 streets/delineator/depends.txt
 delete mode 100644 streets/delineator/init.lua
 delete mode 100644 streets/description.txt
 delete mode 100644 streets/emergencyphone/depends.txt
 delete mode 100644 streets/emergencyphone/init.lua
 delete mode 100644 streets/infrastructure/README
 delete mode 100644 streets/infrastructure/advanced_aircraft_warning_light.lua
 delete mode 100644 streets/infrastructure/advanced_automatic_warning_device.lua
 delete mode 100644 streets/infrastructure/advanced_boom_barrier.lua
 delete mode 100644 streets/infrastructure/advanced_crosswalk_lighting.lua
 delete mode 100644 streets/infrastructure/advanced_crosswalk_safety_sign.lua
 delete mode 100644 streets/infrastructure/advanced_crosswalk_warning_light.lua
 delete mode 100644 streets/infrastructure/advanced_curve_chevron.lua
 delete mode 100644 streets/infrastructure/advanced_emergency_phone.lua
 delete mode 100644 streets/infrastructure/advanced_lane_control_lights.lua
 delete mode 100644 streets/infrastructure/advanced_road_signs.lua
 delete mode 100644 streets/infrastructure/advanced_traffic_lights_pedestrians.lua
 delete mode 100644 streets/infrastructure/advanced_warning_light.lua
 delete mode 100644 streets/infrastructure/crafts.lua
 delete mode 100644 streets/infrastructure/depends.txt
 delete mode 100644 streets/infrastructure/init.lua
 delete mode 100644 streets/infrastructure/nodes.lua
 delete mode 100644 streets/infrastructure/nodes_extension.lua
 delete mode 100644 streets/infrastructure/settings.lua
 delete mode 100644 streets/infrastructure/sounds/infrastructure_automatic_warning_device.ogg
 delete mode 100644 streets/infrastructure/sounds/infrastructure_boom_barrier.ogg
 delete mode 100644 streets/infrastructure/sounds/infrastructure_ebell.ogg
 delete mode 100644 streets/infrastructure/sounds/infrastructure_emergency_phone.ogg
 delete mode 100644 streets/infrastructure/sounds/infrastructure_traffic_lights_1.ogg
 delete mode 100644 streets/infrastructure/sounds/infrastructure_traffic_lights_2.ogg
 delete mode 100644 streets/infrastructure/textures/infrastructure_aircraft_warning_light_side_anim.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_aircraft_warning_light_top_anim.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_anti_dazzling_panel_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_anti_dazzling_panel_top_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_asphalt.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_anim.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_off.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_anim.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_off.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_anim.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_off.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_automatic_warning_device_top_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_bottom_front_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_bright.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_left.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_right.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_h_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_h_front_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_h_left.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_h_right.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_h_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_v_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_v_front_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_v_left.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_boom_barrier_v_right.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_cable_barrier_terminal_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_cable_barrier_terminal_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_concrete.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_corrugated_guide_rail_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_corrugated_guide_rail_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_corrugated_guide_rail_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_corrugated_sheet.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_lighting_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_lighting_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_lighting_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_safety_sign.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_front_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_front_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_warning_light_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_anim.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_bright.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_dark.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crowd_control_barricade_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_crowd_control_barricade_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_curve_chevron_left_bright.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_curve_chevron_left_dark.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_curve_chevron_right_bright.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_curve_chevron_right_dark.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_delineator_retroreflector_red.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_delineator_retroreflector_yellow.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_delineator_wrapper_left.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_delineator_wrapper_right.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_drainage_channel_grating.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_emergency_phone_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_emergency_phone_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_emergency_phone_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_emergency_phone_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_fitch_barrel_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_fitch_barrel_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_fitch_barrel_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_galvanized_steel.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_grid_paver_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_grid_paver_grass.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_grid_paver_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_lane_control_lights_1.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_lane_control_lights_2.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_lane_control_lights_3.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_lane_control_lights_4.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_lane_control_lights_5.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_lane_control_lights_6.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_manhole_cover_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_manhole_cover_top_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_marker_bottom_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_marker_side_red.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_marker_side_yellow.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_marker_top_red_yellow.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_marker_top_yellow_yellow.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_noise_barrier.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_razor_wire.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_riffled_sheet.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_crosswalk_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_crosswalk_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_retroreflective_surface.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_right_of_way_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_right_of_way_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_stop_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_stop_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_yield_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_road_sign_yield_front.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_cone_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_cone_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_cone_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_1.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_2.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_3.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_4.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_1.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_2.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_3.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_4.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_side.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_1.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_2.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_3.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_4.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_1.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_2.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_3.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_4.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_truss.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_warning_light_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_warning_light_bottom.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_warning_light_front_anim.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_warning_light_left.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_warning_light_right.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_warning_light_top.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_wire_netting.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_back.png
 delete mode 100644 streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_front.png
 delete mode 100644 streets/labels/depends.txt
 delete mode 100644 streets/labels/init.lua
 delete mode 100644 streets/labels/textures/infrastructure_double_yellow_line.png
 delete mode 100644 streets/labels/textures/infrastructure_single_yellow_line.png
 delete mode 100644 streets/labels/textures/infrastructure_single_yellow_line_corner.png
 delete mode 100644 streets/labels/textures/infrastructure_solid_double_yellow_line_corner.png
 delete mode 100644 streets/labels/textures/infrastructure_solid_yellow_line_one_side.png
 delete mode 100644 streets/labels/textures/streets_arrow_alldirs.png
 delete mode 100644 streets/labels/textures/streets_arrow_left.png
 delete mode 100644 streets/labels/textures/streets_arrow_right.png
 delete mode 100644 streets/labels/textures/streets_arrow_straight.png
 delete mode 100644 streets/labels/textures/streets_arrow_straight_left.png
 delete mode 100644 streets/labels/textures/streets_arrow_straight_right.png
 delete mode 100644 streets/labels/textures/streets_asphalt_dashed_line.png
 delete mode 100644 streets/labels/textures/streets_asphalt_outer_edge.png
 delete mode 100644 streets/labels/textures/streets_asphalt_side.png
 delete mode 100644 streets/labels/textures/streets_asphalt_side_r.png
 delete mode 100644 streets/labels/textures/streets_asphalt_solid_line.png
 delete mode 100644 streets/labels/textures/streets_parking.png
 delete mode 100644 streets/labels/textures/streets_rw_arrow_left.png
 delete mode 100644 streets/labels/textures/streets_rw_arrow_right.png
 delete mode 100644 streets/labels/textures/streets_rw_arrow_straight.png
 delete mode 100644 streets/labels/textures/streets_rw_arrow_straight_left.png
 delete mode 100644 streets/labels/textures/streets_rw_arrow_straight_right.png
 delete mode 100644 streets/labels/textures/streets_rw_asphalt_side.png
 delete mode 100644 streets/labels/textures/streets_rw_cross.png
 delete mode 100644 streets/labels/textures/streets_rw_dashed_line.png
 delete mode 100644 streets/labels/textures/streets_rw_dashed_line_crossing.png
 delete mode 100644 streets/labels/textures/streets_rw_dashed_line_curve.png
 delete mode 100644 streets/labels/textures/streets_rw_dashed_line_tjunction.png
 delete mode 100644 streets/labels/textures/streets_rw_outer_edge.png
 delete mode 100644 streets/labels/textures/streets_rw_parking.png
 delete mode 100644 streets/labels/textures/streets_rw_solid_line.png
 delete mode 100644 streets/labels/textures/streets_rw_solid_line_crossing.png
 delete mode 100644 streets/labels/textures/streets_rw_solid_line_curve.png
 delete mode 100644 streets/labels/textures/streets_rw_solid_line_tjunction.png
 delete mode 100644 streets/labels/textures/streets_rw_transparent.png
 delete mode 100644 streets/license.txt
 delete mode 100644 streets/manholes/depends.txt
 delete mode 100644 streets/manholes/init.lua
 delete mode 100644 streets/modpack.txt
 delete mode 100644 streets/readme.txt
 delete mode 100644 streets/roadsigns/depends.txt
 delete mode 100644 streets/roadsigns/init.lua
 delete mode 100644 streets/roadsigns/signs.lua
 delete mode 100644 streets/roadsigns/workshop.lua
 delete mode 100644 streets/screenshot.png
 delete mode 100644 streets/steelsupport/depends.txt
 delete mode 100644 streets/steelsupport/init.lua
 delete mode 100644 streets/streetlamps/depends.txt
 delete mode 100644 streets/streetlamps/init.lua
 delete mode 100644 streets/streetsawards/depends.txt
 delete mode 100644 streets/streetsawards/init.lua
 delete mode 100644 streets/streetsconcrete/depends.txt
 delete mode 100644 streets/streetsconcrete/init.lua
 delete mode 100644 streets/streetshotfix/depends.txt
 delete mode 100644 streets/streetshotfix/init.lua
 delete mode 100644 streets/streetsmod/depends.txt
 delete mode 100644 streets/streetsmod/forms.lua
 delete mode 100644 streets/streetsmod/forms/cmd_streets.smartfs
 delete mode 100644 streets/streetsmod/init.lua
 delete mode 100644 streets/streetsmod/libs/smartfs/README.md
 delete mode 100644 streets/streetsmod/libs/smartfs/api.md
 delete mode 100644 streets/streetsmod/libs/smartfs/depends.txt
 delete mode 100644 streets/streetsmod/libs/smartfs/example.lua
 delete mode 100644 streets/streetsmod/libs/smartfs/example.smartfs
 delete mode 100644 streets/streetsmod/libs/smartfs/init.lua
 delete mode 100644 streets/streetsmod/libs/smartfs/smartfs.lua
 delete mode 100644 streets/streetsmod/locale/de.txt
 delete mode 100644 streets/streetsmod/locale/template.txt.txt
 delete mode 100644 streets/streetsmod/nodeboxes/trafficlight.nbe
 delete mode 100644 streets/streetsmod/readme.txt
 delete mode 100644 streets/streetsmod/textures/streets_asphalt.png
 delete mode 100644 streets/streetsmod/textures/streets_concrete.png
 delete mode 100644 streets/streetsmod/textures/streets_delineator.png
 delete mode 100644 streets/streetsmod/textures/streets_delineator_top.png
 delete mode 100644 streets/streetsmod/textures/streets_fence_bottom.png
 delete mode 100644 streets/streetsmod/textures/streets_fence_fromtop.png
 delete mode 100644 streets/streetsmod/textures/streets_fence_inv.png
 delete mode 100644 streets/streetsmod/textures/streets_fence_top.png
 delete mode 100644 streets/streetsmod/textures/streets_lampcontroller_bottom.png
 delete mode 100644 streets/streetsmod/textures/streets_lampcontroller_sides.png
 delete mode 100644 streets/streetsmod/textures/streets_lampcontroller_top.png
 delete mode 100644 streets/streetsmod/textures/streets_lamps_basi_inv.png
 delete mode 100644 streets/streetsmod/textures/streets_lamps_basic_bottom.png
 delete mode 100644 streets/streetsmod/textures/streets_lamps_basic_middle.png
 delete mode 100644 streets/streetsmod/textures/streets_lamps_basic_top.png
 delete mode 100644 streets/streetsmod/textures/streets_lamps_basic_top_top.png
 delete mode 100644 streets/streetsmod/textures/streets_manhole.png
 delete mode 100644 streets/streetsmod/textures/streets_manhole_advanced.png
 delete mode 100644 streets/streetsmod/textures/streets_pole.png
 delete mode 100644 streets/streetsmod/textures/streets_pole_inv.png
 delete mode 100644 streets/streetsmod/textures/streets_rw_arrow_alldirs.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_back.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_construction.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_grasswalk.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_lava.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_mine.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_shop.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_water.png
 delete mode 100644 streets/streetsmod/textures/streets_sign_workshop.png
 delete mode 100644 streets/streetsmod/textures/streets_signworkshop_bottom.png
 delete mode 100644 streets/streetsmod/textures/streets_signworkshop_front.png
 delete mode 100644 streets/streetsmod/textures/streets_signworkshop_side.png
 delete mode 100644 streets/streetsmod/textures/streets_signworkshop_top.png
 delete mode 100644 streets/streetsmod/textures/streets_sos_bottom.png
 delete mode 100644 streets/streetsmod/textures/streets_sos_front.png
 delete mode 100644 streets/streetsmod/textures/streets_sos_side.png
 delete mode 100644 streets/streetsmod/textures/streets_sos_top.png
 delete mode 100644 streets/streetsmod/textures/streets_support.png
 delete mode 100644 streets/streetspoles/depends.txt
 delete mode 100644 streets/streetspoles/init.lua
 delete mode 100644 streets/trafficlight/depends.txt
 delete mode 100644 streets/trafficlight/init.lua
 delete mode 100644 streets/trafficlight/old2new.lua
 delete mode 100644 streets/trafficlight/textures/streets_tl_bg.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_flashred.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_green.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_left_flashred.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_left_green.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_left_off.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_left_red.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_left_warn.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_left_yellow.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_off.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_red.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_right_flashred.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_right_green.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_right_off.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_right_red.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_right_warn.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_right_yellow.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_warn.png
 delete mode 100644 streets/trafficlight/textures/streets_tl_yellow.png
 delete mode 100644 streets/trafficlight/textures/streets_trafficlight_inv.png
 delete mode 100644 streets/trafficlight/textures/streets_trafficlight_template.png

(limited to 'streets')

diff --git a/streets/asphalt/depends.txt b/streets/asphalt/depends.txt
deleted file mode 100644
index fef815d..0000000
--- a/streets/asphalt/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-default
-streetsmod
-building_blocks?
\ No newline at end of file
diff --git a/streets/asphalt/init.lua b/streets/asphalt/init.lua
deleted file mode 100644
index 958cfd5..0000000
--- a/streets/asphalt/init.lua
+++ /dev/null
@@ -1,27 +0,0 @@
---[[
-	Streets Mod: All kinds of asphalt
-]]
-minetest.register_node(":streets:asphalt",{
-	description = streets.S("Asphalt"),
-	tiles	= {"streets_asphalt.png"},
-	groups	= {cracky=3}
-})
-
-if minetest.get_modpath("building_blocks") then
-	minetest.register_craft({
-		type = "shapeless",
-	    output = "streets:asphalt 3",
-	    recipe = {
-			"default:sand",
-			"default:gravel",
-			"building_blocks:Tar"
-	    },
-	})
-else
-	minetest.register_craft({
-		type = "cooking",
-		output	= "streets:asphalt",
-		recipe 	= "default:gravel",
-		cooktime = 2
-	})
-end
diff --git a/streets/asphaltstairs/depends.txt b/streets/asphaltstairs/depends.txt
deleted file mode 100644
index f0c25dc..0000000
--- a/streets/asphaltstairs/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-default
-streetsmod
-moreblocks?
\ No newline at end of file
diff --git a/streets/asphaltstairs/init.lua b/streets/asphaltstairs/init.lua
deleted file mode 100644
index 5ef4759..0000000
--- a/streets/asphaltstairs/init.lua
+++ /dev/null
@@ -1,244 +0,0 @@
---[[
-	StreetsMod: Asphalt stairs
-]]
-if not rawget(_G, "register_stair_slab_panel_micro")
-or type(register_stair_slab_panel_micro) ~= "function" then return end
-
-	-- Asphalt solid line
-		-- Stair
-		minetest.register_node(":streets:asphalt_solid_line_stair",{
-			description = streets.S("Asphalt stair"),
-			tiles = {"streets_asphalt.png^streets_asphalt_solid_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_solid_line.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5},
-					{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5}
-				}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_solid_line_stair 6",
-			recipe = {
-				{"","","streets:asphalt_solid_line"},
-				{"","streets:asphalt_solid_line","streets:asphalt_solid_line"},
-				{"streets:asphalt_solid_line","streets:asphalt_solid_line","streets:asphalt_solid_line"}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_solid_line_stair 6",
-			recipe = {
-				{"streets:asphalt_solid_line","",""},
-				{"streets:asphalt_solid_line","streets:asphalt_solid_line",""},
-				{"streets:asphalt_solid_line","streets:asphalt_solid_line","streets:asphalt_solid_line"}
-			}
-		})
-		-- Slab
-		minetest.register_node(":streets:asphalt_solid_line_slab",{
-			description = streets.S("Asphalt slab"),
-			tiles = {"streets_asphalt.png^streets_asphalt_solid_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_solid_line.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5}
-				}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_solid_line_slab 3",
-			recipe = {
-				{"","",""},
-				{"","",""},
-				{"streets:asphalt_solid_line","streets:asphalt_solid_line","streets:asphalt_solid_line"}
-			}
-		})
-		------------------------------------------------------------
-	-- Asphalt dashed line
-		-- Stair
-		minetest.register_node(":streets:asphalt_dashed_line_stair",{
-			description = streets.S("Asphalt stair"),
-			tiles = {"streets_asphalt.png^streets_asphalt_dashed_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_dashed_line.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5},
-					{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5}
-				}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_dashed_line_stair 6",
-			recipe = {
-				{"","","streets:asphalt_dashed_line"},
-				{"","streets:asphalt_dashed_line","streets:asphalt_dashed_line"},
-				{"streets:asphalt_dashed_line","streets:asphalt_dashed_line","streets:asphalt_dashed_line"}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_dashed_line_stair 6",
-			recipe = {
-				{"streets:asphalt_dashed_line","",""},
-				{"streets:asphalt_dashed_line","streets:asphalt_dashed_line",""},
-				{"streets:asphalt_dashed_line","streets:asphalt_dashed_line","streets:asphalt_dashed_line"}
-			}
-		})
-		-- Slab
-		minetest.register_node(":streets:asphalt_dashed_line_slab",{
-			description = streets.S("Asphalt slab"),
-			tiles = {"streets_asphalt.png^streets_asphalt_dashed_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_dashed_line.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5}
-				}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_dashed_line_slab 3",
-			recipe = {
-				{"","",""},
-				{"","",""},
-				{"streets:asphalt_dashed_line","streets:asphalt_dashed_line","streets:asphalt_dashed_line"}
-			}
-		})
-	-- Asphalt outer line
-		minetest.register_node(":streets:asphalt_side_stair_l",{
-			description = streets.S("Asphalt stair"),
-			tiles = {"streets_asphalt.png^streets_asphalt_side.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5},
-					{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5}
-				}
-			}
-		})
-		minetest.register_node(":streets:asphalt_side_stair_r",{
-			description = streets.S(streets.S("Asphalt stair")),
-			tiles = {"streets_asphalt.png^streets_asphalt_side_r.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side_r.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			drop = "streets:asphalt_side_stair_l",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5},
-					{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5}
-				}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_side_stair_l 6",
-			recipe = {
-				{"","","streets:asphalt_side"},
-				{"","streets:asphalt_side","streets:asphalt_side"},
-				{"streets:asphalt_side","streets:asphalt_side","streets:asphalt_side"}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_side_stair_l 6",
-			recipe = {
-				{"streets:asphalt_side","",""},
-				{"streets:asphalt_side","streets:asphalt_side",""},
-				{"streets:asphalt_side","streets:asphalt_side","streets:asphalt_side"}
-			}
-		})
-		minetest.register_craft({
-			type = "shapeless",
-			output = "streets:asphalt_side_stair_r",
-			recipe = {"streets:asphalt_side_stair_l"}
-		})
-		minetest.register_craft({
-			type = "shapeless",
-			output = "streets:asphalt_side_stair_l",
-			recipe = {"streets:asphalt_side_stair_r"}
-		})
-		---------------------------------------------------------------------
-		minetest.register_node(":streets:asphalt_side_slab_l",{
-			description = streets.S(streets.S("Asphalt slab")),
-			tiles = {"streets_asphalt.png^streets_asphalt_side.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5}
-				}
-			}
-		})
-		minetest.register_node(":streets:asphalt_side_slab_r",{
-			description = streets.S(streets.S("Asphalt slab")),
-			tiles = {"streets_asphalt.png^streets_asphalt_side_r.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side_r.png"},
-			groups = {cracky = 3,not_in_creative_inventory=1},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5,-0.5,-0.5,0.5,0.0,0.5}
-				}
-			}
-		})
-		minetest.register_craft({
-			output = "streets:asphalt_side_slab_l 3",
-			recipe = {
-				{"","",""},
-				{"","",""},
-				{"streets:asphalt_side","streets:asphalt_side","streets:asphalt_side"}
-			}
-		})
-		minetest.register_craft({
-			type = "shapeless",
-			output = "streets:asphalt_side_r",
-			recipe = {"streets:asphalt_side_l"}
-		})
-		minetest.register_craft({
-			type = "shapeless",
-			output = "streets:asphalt_side_l",
-			recipe = {"streets:asphalt_side_r"}
-		})
-
-	-- Asphalt
-	minetest.register_alias("streets:asphalt_stair","stairs:stair_asphalt")
-	minetest.register_alias("streets:asphalt_slab","stairs:slab_asphalt")
-
-	register_stair_slab_panel_micro("streets", "asphalt",              "streets:asphalt",              {cracky=3}, {"streets_asphalt.png"}, "Asphalt", "asphalt", nil)
-	register_stair_slab_panel_micro("streets", "asphalt_solid_line",   "streets:asphalt_solid_line",   {cracky=3}, {"streets_asphalt.png^streets_asphalt_solid_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_solid_line.png"},   "Asphalt with solid centerline",                        "asphalt", nil)
-	register_stair_slab_panel_micro("streets", "asphalt_dashed_line",  "streets:asphalt_dashed_line",  {cracky=3}, {"streets_asphalt.png^streets_asphalt_dashed_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_dashed_line.png"}, "Asphalt with dashed centerline",                       "asphalt", nil)
-	register_stair_slab_panel_micro("streets", "asphalt_side",         "streets:asphalt_sideline",     {cracky=3}, {"streets_asphalt.png^streets_asphalt_side.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side.png"},               "Asphalt with solid outer line (left)",                 "asphalt", nil)
-	register_stair_slab_panel_micro("streets", "asphalt_side_r",       "streets:asphalt_side_r",       {cracky=3}, {"streets_asphalt.png^streets_asphalt_side_r.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side_r.png"},           "Asphalt with solid outer line (right)",                "asphalt", nil)
-	register_stair_slab_panel_micro("streets", "asphalt_outer_edge",   "streets:asphalt_outer_edge",   {cracky=3}, {"streets_asphalt.png^streets_asphalt_outer_edge.png","streets_asphalt.png"},                                                                                                                          "Asphalt with solid outer line (corner/edge)",          "asphalt", nil)
-	register_stair_slab_panel_micro("streets", "asphalt_outer_edge_r", "streets:asphalt_outer_edge_r", {cracky=3}, {"streets_asphalt.png^(streets_asphalt_outer_edge.png^[transformR270)","streets_asphalt.png"},                                                                                                         "Asphalt with solid outer line (corner/edge, rotated)", "asphalt", nil)
-
-	table.insert(circular_saw.known_stairs,"streets:asphalt")
-	table.insert(circular_saw.known_stairs,"streets:asphalt_solid_line")
-	table.insert(circular_saw.known_stairs,"streets:asphalt_dashed_line")
-	table.insert(circular_saw.known_stairs,"streets:asphalt_side")
-	table.insert(circular_saw.known_stairs,"streets:asphalt_side_r")
-	table.insert(circular_saw.known_stairs,"streets:asphalt_outer_edge")
-	table.insert(circular_saw.known_stairs,"streets:asphalt_outer_edge_r")
diff --git a/streets/concretestairs/depends.txt b/streets/concretestairs/depends.txt
deleted file mode 100644
index ad569e2..0000000
--- a/streets/concretestairs/depends.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-default
-streetsmod
-stairs?
-moreblocks?
\ No newline at end of file
diff --git a/streets/concretestairs/init.lua b/streets/concretestairs/init.lua
deleted file mode 100644
index f6400c5..0000000
--- a/streets/concretestairs/init.lua
+++ /dev/null
@@ -1,12 +0,0 @@
---[[
-	StreetsMod: Concrete stairs (compatible to circular saw)
-]]
-if rawget(_G, "register_stair_slab_panel_micro")
-and type(register_stair_slab_panel_micro) == "function" and streets.extendedBy.prefab == false then
-	register_stair_slab_panel_micro("streets", "concrete", "streets:concrete", {cracky=2}, {"streets_concrete.png"}, "Concrete", "concrete", nil)
-	table.insert(circular_saw.known_stairs,"streets:concrete")
-	minetest.register_alias("stairs:stair_concrete","streets:stair_concrete")
-else
-	minetest.register_alias("stairs:stair_concrete","prefab:concrete_stair")
-	minetest.register_alias("stairs:slab_concrete","prefab:concrete_slab")
-end
diff --git a/streets/constructionarea/depends.txt b/streets/constructionarea/depends.txt
deleted file mode 100644
index f17a377..0000000
--- a/streets/constructionarea/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-default
-streetsmod
-wool?
\ No newline at end of file
diff --git a/streets/constructionarea/init.lua b/streets/constructionarea/init.lua
deleted file mode 100644
index 9b1aefe..0000000
--- a/streets/constructionarea/init.lua
+++ /dev/null
@@ -1,70 +0,0 @@
-minetest.register_node(":streets:constructionfence_bottom",{
-	description = streets.S("Construction fence"),
-	tiles = {"streets_fence_fromtop.png","streets_fence_fromtop.png","streets_fence_fromtop.png","streets_fence_fromtop.png","streets_fence_bottom.png","streets_fence_bottom.png"},
-	groups = {cracky = 2, disable_jump = 1},
-	paramtype = "light",
-	inventory_image = "streets_fence_inv.png",
-	wield_image = "streets_fence_inv.png",
-	paramtype2 = "facedir",
-	drawtype = "nodebox",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,-0.5,-0.1,0.5,0.0,0.1},	-- lower part
-			{-0.2,-0.0,-0.1,0.2,0.5,0.1}	-- thing in the middle
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,-0.5,-0.1,0.5,1.0,0.1}
-		}
-	},
-	after_dig_node = function(pos,node,digger)
-		pos.y = pos.y + 1
-		minetest.remove_node(pos)
-	end,
-	after_place_node = function(pos,placer,itemstack)
-		pos.y = pos.y + 1
-		if minetest.get_node(pos).name == "air" then
-			minetest.add_node(pos,{name = "streets:constructionfence_top", param2 = minetest.dir_to_facedir(placer:get_look_dir())})
-		else
-			minetest.chat_send_player(placer:get_player_name(),"Not enough free space! A construction fence has a height of 2 blocks!")
-		end
-	end
-})
-
-minetest.register_node(":streets:constructionfence_top",{
-	description = streets.S("Construction fence"),
-	tiles = {"streets_fence_fromtop.png","streets_fence_fromtop.png","streets_fence_fromtop.png","streets_fence_fromtop.png","streets_fence_top.png","streets_fence_top.png"},
-	groups = {cracky = 2, not_in_creative_inventory = 1, disable_jump = 1},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	drawtype = "nodebox",
-	drop = "streets:constructionfence_bottom",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,-0.5,-0.1,0.5,0.0,0.1}		-- upper part
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,-1.5,-0.1,0.5,0.0,0.1}
-		}
-	},
-	after_dig_node = function(pos,node,digger)
-		pos.y = pos.y - 1
-		minetest.remove_node(pos)
-	end
-})
-
-minetest.register_craft({
-	output = "streets:constructionfence_bottom 8",
-	recipe = {
-		{"","",""},
-		{"","streets:sign_construction",""},
-		{"wool:red","wool:white","wool:red"}
-	}
-})
\ No newline at end of file
diff --git a/streets/delineator/depends.txt b/streets/delineator/depends.txt
deleted file mode 100644
index 48ef5e1..0000000
--- a/streets/delineator/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-streetsmod
\ No newline at end of file
diff --git a/streets/delineator/init.lua b/streets/delineator/init.lua
deleted file mode 100644
index cf78142..0000000
--- a/streets/delineator/init.lua
+++ /dev/null
@@ -1,27 +0,0 @@
---[[
-	StreetsMod: Delineator
-]]
-minetest.register_node(":streets:delineator", {
-	description = streets.S("Delineator"),
-	tiles = {"streets_delineator_top.png","streets_delineator.png"},
-	drawtype = "nodebox",
-	paramtype = "light",
-	groups = {cracky=3, oddly_breakable_by_hand=2},
-	light_source = 8,
-	sunlight_propagates = true,
-	node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.1, -0.5, -0.1, 0.1, 0.5, 0.1},
-			},
-	}
-})
-
-minetest.register_craft({
-	output = "streets:delineator 4",
-	recipe = {
-		{"","",""},
-		{"","default:torch",""},
-		{"","default:fence_wood",""}
-	}
-})
\ No newline at end of file
diff --git a/streets/description.txt b/streets/description.txt
deleted file mode 100644
index 57612b0..0000000
--- a/streets/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-With the StreetsMod, you can build your own realistic streets with arrows, lines, manholes and many more cool stuff. You don't need any additional mod, but it's recommended to have stairs (default), wool (default) and bucket (default) installed. It's easy for you to enable/disable certain parts of this mod because it's organised as a modpack, which you can configure in Minetest's Main Menu -> Configure.
\ No newline at end of file
diff --git a/streets/emergencyphone/depends.txt b/streets/emergencyphone/depends.txt
deleted file mode 100644
index f17a377..0000000
--- a/streets/emergencyphone/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-default
-streetsmod
-wool?
\ No newline at end of file
diff --git a/streets/emergencyphone/init.lua b/streets/emergencyphone/init.lua
deleted file mode 100644
index 8c25c65..0000000
--- a/streets/emergencyphone/init.lua
+++ /dev/null
@@ -1,25 +0,0 @@
---[[
-	StreetsMod: Emergency Phone
-]]
-minetest.register_node(":streets:emergencyphone",{
-	description = streets.S("Emergency Phone"),
-	tiles = {"streets_sos_top.png","streets_sos_bottom.png","streets_sos_side.png","streets_sos_side.png","streets_sos_side.png","streets_sos_front.png"},
-	groups = {cracky = 3},
-	paramtype2 = "facedir",
-	light_source = 5,
-	on_rightclick = function(pos,node,clicker)
-		if clicker:is_player() and clicker:get_hp() < 6 then
-			clicker:set_hp(6)
-			minetest.log("action",clicker:get_player_name() .. " healed by emergency phone at pos " .. minetest.pos_to_string(pos) .. "")
-		end
-	end
- })
- minetest.register_alias("streets:emergency_phone","streets:emergencyphone") 
-minetest.register_craft({
-	output = "streets:emergencyphone",
-	recipe = {
-		{"wool:orange","default:torch","wool:orange"},
-		{"wool:orange","default:apple","wool:orange"},
-		{"default:steel_ingot","default:diamondblock","default:steel_ingot"}
-	}
-})
\ No newline at end of file
diff --git a/streets/infrastructure/README b/streets/infrastructure/README
deleted file mode 100644
index feb88a1..0000000
--- a/streets/infrastructure/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This is my fork of the infrastructure mod. It's essentially aimed at servers running webdesigner97's streetsmod that want stuff from infrastructure too (dreambuilder_game in particular), and is intended to add on to streetsmod instead of replacing it.
-
-Originally based on Streets by webdesigner97
-Modified by Ragnarok/Vibender
-Modified again by cheapie
-
-Depends: default, moreblocks, mesecons, technic, streetsmod
-
-Licenses:
-	Code: WTFPL
-	Line textures: WTFPL
-	Other Textures: CC BY-SA 3.0 Unported, http://creativecommons.org/licenses/by-sa/3.0/
-	Sounds: CC BY-SA 3.0 Unported, http://creativecommons.org/licenses/by-sa/3.0/
-
diff --git a/streets/infrastructure/advanced_aircraft_warning_light.lua b/streets/infrastructure/advanced_aircraft_warning_light.lua
deleted file mode 100644
index 1361f7b..0000000
--- a/streets/infrastructure/advanced_aircraft_warning_light.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- Aircraft warning light
-minetest.register_node("infrastructure:aircraft_warning_light", {
-	description = "Aircraft warning light",
-	tiles = {
-		{name="infrastructure_aircraft_warning_light_top_anim.png",animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=4}},
-		"infrastructure_traffic_lights_side.png",
-		{name="infrastructure_aircraft_warning_light_side_anim.png",animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=4}},
-		{name="infrastructure_aircraft_warning_light_side_anim.png",animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=4}},
-		{name="infrastructure_aircraft_warning_light_side_anim.png",animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=4}},
-		{name="infrastructure_aircraft_warning_light_side_anim.png",animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=4}}
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	groups = {cracky = 1},
-	light_source = AIRCRAFT_WARNING_LIGHT_LIGHT_RANGE,
-	node_box = {
-		type = "fixed",
-			fixed = {
-				{-1/128, 1/4, -1/128, 1/128, 3/8, 1/128},
-
-				{-1/4, -1/8, 0, 1/4, 1/4, 0},
-				{0, -1/8, -1/4, 0, 1/4, 1/4},
-
-				{-1/16, -1/8, -1/16, 1/16, 1/16, 1/16},
-
-				{-1/4, -1/4, -1/8, 1/4, -1/8, 1/8},
-				{-1/8, -1/4, -1/4, 1/8, -1/8, 1/4},
-
-				{-1/8, -3/8, -1/8, 1/8, -1/4, 1/8},
-
-				{-3/16, -1/2, -3/16, 3/16, -3/8, 3/16}
-			}
-	},
-	selection_box = {
-		type = "fixed",
-			fixed = {
-				{-1/128, 1/4, -1/128, 1/128, 3/8, 1/128},
-
-				{-1/4, -1/8, 0, 1/4, 1/4, 0},
-				{0, -1/8, -1/4, 0, 1/4, 1/4},
-
-				{-1/16, -1/8, -1/16, 1/16, 1/16, 1/16},
-
-				{-1/4, -1/4, -1/8, 1/4, -1/8, 1/8},
-				{-1/8, -1/4, -1/4, 1/8, -1/8, 1/4},
-
-				{-1/8, -3/8, -1/8, 1/8, -1/4, 1/8},
-
-				{-3/16, -1/2, -3/16, 3/16, -3/8, 3/16}
-			}
-	}
-})
-
-minetest.register_alias("infrastructure:aircraft_warning_light_bright", "infrastructure:aircraft_warning_light")
-minetest.register_alias("infrastructure:aircraft_warning_light_dark", "infrastructure:aircraft_warning_light")
diff --git a/streets/infrastructure/advanced_automatic_warning_device.lua b/streets/infrastructure/advanced_automatic_warning_device.lua
deleted file mode 100644
index b938c07..0000000
--- a/streets/infrastructure/advanced_automatic_warning_device.lua
+++ /dev/null
@@ -1,464 +0,0 @@
--- Automatic warning device
-
-infrastructure.sound_handles = {}
-
-function infrastructure.play_bell(pos)
-	local pos_hash = minetest.hash_node_position(pos)
-	if not infrastructure.sound_handles[pos_hash] then
-		infrastructure.sound_handles[pos_hash] = minetest.sound_play("infrastructure_ebell",
-				{pos = pos, gain = AUTOMATIC_WARNING_DEVICE_VOLUME, loop = true, max_hear_distance = 30,})
-	end
-end
-
-function infrastructure.stop_bell(pos)
-	local pos_hash = minetest.hash_node_position(pos)
-	local sound_handle = infrastructure.sound_handles[pos_hash]
-	if sound_handle then
-		minetest.sound_stop(sound_handle)
-		infrastructure.sound_handles[pos_hash] = nil
-	end
-end
-function infrastructure.left_light_direction(pos, param2)
-	if param2 == 0 then
-		pos.x = pos.x - 1
-	elseif param2 == 1 then
-		pos.z = pos.z + 1
-	elseif param2 == 2 then
-		pos.x = pos.x + 1
-	elseif param2 == 3 then
-		pos.z = pos.z - 1
-	end
-end
-
-function infrastructure.right_light_direction(pos, param2)
-	if param2 == 0 then
-		pos.x = pos.x + 2
-	elseif param2 == 1 then
-		pos.z = pos.z - 2
-	elseif param2 == 2 then
-		pos.x = pos.x - 2
-	elseif param2 == 3 then
-		pos.z = pos.z + 2
-	end
-end
-
-function infrastructure.lights_enabled(pos)
-	local node = minetest.get_node(pos)
-	local param2 = node.param2
-	minetest.swap_node(pos, {name = "infrastructure:automatic_warning_device_middle_center_on", param2 = node.param2})
-	infrastructure.left_light_direction(pos, param2)
-	minetest.swap_node(pos, {name = "infrastructure:automatic_warning_device_middle_left_on", param2 = node.param2})
-	infrastructure.right_light_direction(pos, param2)
-	minetest.swap_node(pos, {name = "infrastructure:automatic_warning_device_middle_right_on", param2 = node.param2})
-end
-
-function infrastructure.lights_disabled(pos)
-	local node = minetest.get_node(pos)
-	local param2 = node.param2
-	minetest.swap_node(pos, {name = "infrastructure:automatic_warning_device_middle_center_off", param2 = node.param2})
-	infrastructure.left_light_direction(pos, param2)
-	minetest.swap_node(pos, {name = "infrastructure:automatic_warning_device_middle_left_off", param2 = node.param2})
-	infrastructure.right_light_direction(pos, param2)
-	minetest.swap_node(pos, {name = "infrastructure:automatic_warning_device_middle_right_off", param2 = node.param2})
-end
-
-function infrastructure.activate_lights(pos)
-	pos.y = pos.y + 2
-	local node = minetest.get_node(pos)
-	if node.name == "infrastructure:automatic_warning_device_middle_center_off" then
-		infrastructure.play_bell(pos)
-		infrastructure.lights_enabled(pos)
-	elseif (node.name == "infrastructure:automatic_warning_device_middle_center_on") then
-		infrastructure.stop_bell(pos,node)
-		infrastructure.lights_disabled(pos, node)
-	end
-end
-
-minetest.register_node("infrastructure:automatic_warning_device_top", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_top_side.png",
-		"infrastructure_automatic_warning_device_top_side.png",
-		"infrastructure_automatic_warning_device_top_side.png",
-		"infrastructure_automatic_warning_device_top.png"
-	},
-	on_destruct = stop_bell,
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 3, not_in_creative_inventory = 1},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/16, -1/2, -1/16, 1/16, 0, 1/16},
-			{-1/8, 0, -1/8, 1/8, 3/8, 1/8},
-			{-1/4, 1/8, -1/4, 1/4, 1/4, 1/4},
-			{-1/2, -1/2, -1/16, 1/2, 0, -1/16},
-			{-1/8, -1/2, -1/16, 1/8, -1/4, 1/8}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-minetest.register_node("infrastructure:automatic_warning_device_middle_right_on", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_middle_right_side.png",
-		{name="infrastructure_automatic_warning_device_middle_right_anim.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}}
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	light_source = AUTOMATIC_WARNING_DEVICE_LIGHT_RANGE,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/2, -1/2, -1/16, -1/4, 1/2, -1/16},
-			{-1/2, -5/16, -1/16, -7/16, 1/16, 3/16},
-			{-1/2, 1/32, -5/16, -15/32, 3/32, -1/16},
-			{-15/32, -1/8, -3/16, -13/32, 1/32, -1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-minetest.register_node("infrastructure:automatic_warning_device_middle_right_off", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_middle_right_side.png",
-		"infrastructure_automatic_warning_device_middle_right_off.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/2, -1/2, -1/16, -1/4, 1/2, -1/16},
-			{-1/2, -5/16, -1/16, -7/16, 1/16, 3/16},
-			{-1/2, 1/32, -5/16, -15/32, 3/32, -1/16},
-			{-15/32, -1/8, -3/16, -13/32, 1/32, -1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-minetest.register_node("infrastructure:automatic_warning_device_middle_left_on", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_middle_left_side.png",
-		{name="infrastructure_automatic_warning_device_middle_left_anim.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}}
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	light_source = AUTOMATIC_WARNING_DEVICE_LIGHT_RANGE,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{1/4, -1/2, -1/16, 1/2, 1/2, -1/16},
-			{7/16, -5/16, -1/16, 1/2, 1/16, 3/16},
-			{15/32, 1/32, -5/16, 1/2, 3/32, -1/16},
-			{13/32, -1/8, -3/16, 15/32, 1/32, -1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-minetest.register_node("infrastructure:automatic_warning_device_middle_left_off", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_middle_left_side.png",
-		"infrastructure_automatic_warning_device_middle_left_off.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{1/4, -1/2, -1/16, 1/2, 1/2, -1/16},
-			{7/16, -5/16, -1/16, 1/2, 1/16, 3/16},
-			{15/32, 1/32, -5/16, 1/2, 3/32, -1/16},
-			{13/32, -1/8, -3/16, 15/32, 1/32, -1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-minetest.register_node("infrastructure:automatic_warning_device_middle_center_on", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_middle_center_side.png",
-		"infrastructure_automatic_warning_device_middle_center_side.png",
-		"infrastructure_automatic_warning_device_middle_center_side.png",
-		{name="infrastructure_automatic_warning_device_middle_center_anim.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}}
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	light_source = LIGHT_SOURCE,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-			{-1/2, -1/2, -1/16, 1/2, 1/2, -1/16},
-			{-1/2, -5/16, -1/16, -3/16, 1/16, 3/16},
-			{3/16, -5/16, -1/16, 1/2, 1/16, 3/16},
-			{-3/16, -3/16, -1/16, 3/16, -1/16, 1/8},
-			{-1/2, 1/32, -5/16, -7/32, 3/32, -1/16},
-			{-7/32, -1/8, -3/16, -5/32, 1/32, -1/16},
-			{7/32, 1/32, -5/16, 1/2, 3/32, -1/16},
-			{5/32, -1/8, -3/16, 7/32, 1/32, -1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-
-minetest.register_node("infrastructure:automatic_warning_device_middle_center_off", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_middle_center_side.png",
-		"infrastructure_automatic_warning_device_middle_center_side.png",
-		"infrastructure_automatic_warning_device_middle_center_side.png",
-		"infrastructure_automatic_warning_device_middle_center_off.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	light_source = LIGHT_SOURCE,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-			{-1/2, -1/2, -1/16, 1/2, 1/2, -1/16},
-			{-1/2, -5/16, -1/16, -3/16, 1/16, 3/16},
-			{3/16, -5/16, -1/16, 1/2, 1/16, 3/16},
-			{-3/16, -3/16, -1/16, 3/16, -1/16, 1/8},
-			{-1/2, 1/32, -5/16, -7/32, 3/32, -1/16},
-			{-7/32, -1/8, -3/16, -5/32, 1/32, -1/16},
-			{7/32, 1/32, -5/16, 1/2, 3/32, -1/16},
-			{5/32, -1/8, -3/16, 7/32, 1/32, -1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-
-minetest.register_node("infrastructure:automatic_warning_device_middle", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_middle_side.png",
-		"infrastructure_automatic_warning_device_middle_side.png",
-		"infrastructure_automatic_warning_device_middle_side.png",
-		"infrastructure_automatic_warning_device_middle.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 3, not_in_creative_inventory = 1},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-			{-3/8, -3/8, -1/8, 3/8, 3/8, -1/16},
-			{-1/8, -1/8, -1/16, 1/8, 1/8, 1/8}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	}
-})
-
-minetest.register_node("infrastructure:automatic_warning_device_bottom", {
-	description = "Automatic warning device",
-	inventory_image = "infrastructure_automatic_warning_device.png",
-	wield_image = "infrastructure_automatic_warning_device.png",
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_bottom.png",
-		"infrastructure_automatic_warning_device_bottom.png",
-		"infrastructure_automatic_warning_device_bottom.png",
-		"infrastructure_automatic_warning_device_bottom.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 3},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/16, 0, -1/16, 1/16, 1/2, 1/16},
-			{-1/2, -1/2, -1/4, 1/2, -3/8, 1/4},
-			{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2},
-			{-1/8, -3/8, -1/8, 1/8, 0, 1/8}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-		-- top
-			{-1/8, 0 + 3, -1/8, 1/8, 3/8 + 3, 1/8},
-			{-1/4, 1/8 + 3, -1/4, 1/4, 1/4 + 3, 1/4},
-			{-1/8, -1/2 + 3, -1/16 + 0.01, 1/8, -1/4 + 3, 1/8},
-		-- middle center, left and right
-			{-9/16, -5/16 + 2, -1/16, -3/16, 1/16 + 2, 3/16},
-			{3/16, -5/16 + 2, -1/16, 9/16, 1/16 + 2, 3/16},
-
-			{-3/16, -3/16 + 2, -1/16 + 0.01, 3/16, -1/16 + 2, 1/8},
-
-			{-1/2, 1/32 + 2, -5/16, -7/32, 3/32 + 2, -1/16 - 0.01},
-			{-7/32, -1/8 + 2, -3/16, -5/32, 1/32 + 2, -1/16 - 0.01},
-			{13/32 - 1, -1/8 + 2, -3/16, 15/32 - 1, 1/32 + 2, -1/16 - 0.01},
-
-			{7/32, 1/32 + 2, -5/16, 1/2, 3/32 + 2, -1/16 - 0.01},
-			{5/32, -1/8 + 2, -3/16, 7/32, 1/32 + 2, -1/16 - 0.01},
-			{-15/32 + 1, -1/8 + 2, -3/16, -13/32 + 1, 1/32 + 2, -1/16 - 0.01},
-		-- middle
-			{-3/8, -3/8 + 1, -1/8, 3/8, 3/8 + 1, -1/16},
-			{-1/8, -1/8 + 1, -1/16, 1/8, 1/8 + 1, 1/8},
-		-- bottom
-			{-1/2, -1/2, -1/4, 1/2, -3/8, 1/4},
-			{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2},
-			{-1/8, -3/8, -1/8, 1/8, 0, 1/8},
-		-- post
-			{-1/16, 0, -1/16, 1/16, 3, 1/16}
-		}
-	},
-
-	on_construct = function(pos)
-		local node = minetest.get_node(pos)
-		local param2 = node.param2
-
-		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", "field[channel;Channel;${channel}]")
-
-		pos.y = pos.y + 1
-		node.name = "infrastructure:automatic_warning_device_middle"
-		minetest.set_node(pos, node)
-
-		pos.y = pos.y + 2
-		node.name = "infrastructure:automatic_warning_device_top"
-		minetest.set_node(pos, node)
-
-		pos.y = pos.y - 1
-		node.name = "infrastructure:automatic_warning_device_middle_center_1"
-		minetest.set_node(pos, node)
-
-		infrastructure.left_light_direction(pos, param2)
-		node.name = "infrastructure:automatic_warning_device_middle_left_1"
-		minetest.set_node(pos, node)
-
-		infrastructure.right_light_direction(pos, param2)
-		node.name = "infrastructure:automatic_warning_device_middle_right_1"
-		minetest.set_node(pos, node)
-	end,
-
-	on_destruct = function(pos)
-		local node = minetest.get_node(pos)
-		local param2 = node.param2
-		pos.y=pos.y+2
-		infrastructure.stop_bell(pos, node)
-		pos.y=pos.y-2
-
-		for i = 1, 3 do
-			pos.y = pos.y + 1
-			minetest.remove_node(pos)
-		end
-
-		pos.y = pos.y - 1
-
-		infrastructure.left_light_direction(pos, param2)
-		minetest.remove_node(pos)
-
-		infrastructure.right_light_direction(pos, param2)
-		minetest.remove_node(pos)
-	end,
-
-	on_punch = function(pos, node)
-		infrastructure.activate_lights(pos, node)
-	end,
-
-	on_receive_fields = function(pos, formname, fields, sender)
-		if (fields.channel) then
-			minetest.get_meta(pos):set_string("channel", fields.channel)
-			minetest.get_meta(pos):set_string("state", "Off")
-		end
-	end,
-
-	digiline = {
-		receptor = {},
-		effector = {
-			action = function(pos, node, channel, msg)
-				local setchan = minetest.get_meta(pos):get_string("channel")
-				if setchan ~= channel then
-					return
-				end
-				if (msg=="bell_on") then
-					infrastructure.play_bell(pos)
-				elseif (msg=="bell_off") then
-					infrastructure.stop_bell(pos)
-				elseif (msg=="lights_on") then
-					pos.y = pos.y+2
-					infrastructure.lights_enabled(pos)
-				elseif (msg=="lights_off") then
-					pos.y = pos.y+2	
-					infrastructure.lights_disabled(pos)
-				end
-			end
-		}
-	}
-})
-
-
-
-
-minetest.register_alias("infrastructure:automatic_warning_device", "infrastructure:automatic_warning_device_bottom")
-minetest.register_alias("awd", "infrastructure:automatic_warning_device_bottom")
-minetest.register_alias("infrastructure:automatic_warning_device_middle_left_1","infrastructure:automatic_warning_device_middle_left_off")
-minetest.register_alias("infrastructure:automatic_warning_device_middle_left_2","infrastructure:automatic_warning_device_middle_left_off")
-minetest.register_alias("infrastructure:automatic_warning_device_middle_right_1","infrastructure:automatic_warning_device_middle_right_off")
-minetest.register_alias("infrastructure:automatic_warning_device_middle_right_2","infrastructure:automatic_warning_device_middle_right_off")
-minetest.register_alias("infrastructure:automatic_warning_device_middle_center_1","infrastructure:automatic_warning_device_middle_center_off")
-minetest.register_alias("infrastructure:automatic_warning_device_middle_center_2","infrastructure:automatic_warning_device_middle_center_off")
-minetest.register_alias("infrastructure:automatic_warning_device_middle_center_3","infrastructure:automatic_warning_device_middle_center_off")
diff --git a/streets/infrastructure/advanced_boom_barrier.lua b/streets/infrastructure/advanced_boom_barrier.lua
deleted file mode 100644
index 67a9b8b..0000000
--- a/streets/infrastructure/advanced_boom_barrier.lua
+++ /dev/null
@@ -1,508 +0,0 @@
--- Boom barrier
-function move_arm(pos, node)
-	local node = minetest.env:get_node(pos)
-	local param2 = node.param2
-
-	if param2 == 0 then
-		dir = "z-"
-	elseif param2 == 1 then
-		dir = "x-"
-	elseif param2 == 2 then
-		dir = "z+"
-	elseif param2 == 3 then
-		dir = "x+"
-	end
-
-	minetest.sound_play("infrastructure_boom_barrier", {
-		pos = pos,
-		gain = BOOM_BARRIER_VOLUME,
-		max_hear_distance = 50
-	})
-
-	if node.name == "infrastructure:boom_barrier_top_h" then
-		minetest.swap_node(pos, {name = "infrastructure:boom_barrier_top_v", param2 = node.param2})
-
-		if dir == "x+" then
-			for i = 1, 10 do
-				pos.x = pos.x + 1
-				if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then
-					pos.x = pos.x - 1
-					break
-				end
-				minetest.env:remove_node(pos)
-				node.name = "infrastructure:boom_barrier_arm_v"
-				minetest.env:add_node({x=pos.x-i, y=pos.y+i, z=pos.z}, node)
-			end
-		elseif dir == "x-" then
-			for i = 1, 10 do
-				pos.x = pos.x - 1
-				if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then
-					break
-				end
-				minetest.env:remove_node(pos)
-				node.name = "infrastructure:boom_barrier_arm_v"
-				minetest.env:add_node({x=pos.x+i, y=pos.y+i, z=pos.z}, node)
-			end
-		elseif dir == "z+" then
-			for i = 1, 10 do
-				pos.z = pos.z + 1
-				if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then
-					break
-				end
-				minetest.env:remove_node(pos)
-				node.name = "infrastructure:boom_barrier_arm_v"
-				minetest.env:add_node({x=pos.x, y=pos.y+i, z=pos.z-i}, node)
-			end
-		elseif dir == "z-" then
-			for i = 1, 10 do
-				pos.z = pos.z - 1
-				if (string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_lightfirst")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_end")
-				or string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_h_darkfirst")) == nil then
-					break
-				end
-				minetest.env:remove_node(pos)
-				node.name = "infrastructure:boom_barrier_arm_v"
-				minetest.env:add_node({x=pos.x, y=pos.y+i, z=pos.z+i}, node)
-			end
-		end
-
-	elseif node.name == "infrastructure:boom_barrier_top_v" then
-		minetest.swap_node(pos, {name = "infrastructure:boom_barrier_top_h", param2 = node.param2})
-			if dir == "x+" then
-			for i = 1, 10 do
-				pos.y = pos.y + 1
-				if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then
-					break
-				end
-				minetest.env:remove_node(pos)
-				if i % 2 == 1 then
-					node.name = "infrastructure:boom_barrier_arm_h_lightfirst"
-				else
-					node.name = "infrastructure:boom_barrier_arm_h_darkfirst"
-				end
-				if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then
-					node.name = "infrastructure:boom_barrier_arm_h_end"
-				end
-				minetest.env:add_node({x=pos.x+i, y=pos.y-i, z=pos.z}, node)
-			end
-		elseif dir == "x-" then
-			for i = 1, 10 do
-				pos.y = pos.y + 1
-				if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then
-					break
-				end
-				minetest.env:remove_node(pos)
-				if i % 2 == 1 then
-					node.name = "infrastructure:boom_barrier_arm_h_lightfirst"
-				else
-					node.name = "infrastructure:boom_barrier_arm_h_darkfirst"
-				end
-				if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then
-					node.name = "infrastructure:boom_barrier_arm_h_end"
-				end
-				minetest.env:add_node({x=pos.x-i, y=pos.y-i, z=pos.z}, node)
-			end
-		elseif dir == "z+" then
-			for i = 1, 10 do
-				pos.y = pos.y + 1
-				if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then
-					break
-				end
-				minetest.env:remove_node(pos)
-				if i % 2 == 1 then
-					node.name = "infrastructure:boom_barrier_arm_h_lightfirst"
-				else
-					node.name = "infrastructure:boom_barrier_arm_h_darkfirst"
-				end
-				if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then
-					node.name = "infrastructure:boom_barrier_arm_h_end"
-				end
-				minetest.env:add_node({x=pos.x, y=pos.y-i, z=pos.z+i}, node)
-			end
-		elseif dir == "z-" then
-			for i = 1, 10 do
-				pos.y = pos.y + 1
-				if string.match(minetest.env:get_node(pos).name, "infrastructure:boom_barrier_arm_v") == nil then
-					break
-				end
-				minetest.env:remove_node(pos)
-				if i % 2 == 1 then
-					node.name = "infrastructure:boom_barrier_arm_h_lightfirst"
-				else
-					node.name = "infrastructure:boom_barrier_arm_h_darkfirst"
-				end
-				if minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}).name ~= "infrastructure:boom_barrier_arm_v" then
-					node.name = "infrastructure:boom_barrier_arm_h_end"
-				end
-				minetest.env:add_node({x=pos.x, y=pos.y-i, z=pos.z-i}, node)
-			end
-		end
-	end
-end
-
-minetest.register_node("infrastructure:boom_barrier_top_h", {
-	description = "Boom barrier mechanism",
-	tiles = {
-		"infrastructure_boom_barrier_h_top.png",
-		"infrastructure_boom_barrier_h_bottom.png",
-		"infrastructure_boom_barrier_h_right.png",
-		"infrastructure_boom_barrier_h_left.png",
-		"infrastructure_boom_barrier_h_front_back.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/4, -1/4, -1/4, 1/4, 1/4, 1/4},
-			{-1/8, -1/2, -1/8, 1/8, -1/4, 1/8},
-
-			{-3/8, -1/2, -1/2, -1/4, -1/4, 1/8},
-			{-3/8, -1/2, -1/8, -1/4, 1/8, 1/8},
-			{-3/8, -1/8, -1/8, -1/4, 1/8, 1/2},
-			{-1/2, -3/16, 1/4, -3/8, 3/16, 1/2},
-			{-1/2, -1/8, 3/16, -3/8, 1/8, 1/2},
-			{-1/2, -1/16, 1/8, -3/8, 1/16, 1/2},	
-
-			{1/4, -1/2, -1/2, 3/8, -1/4, 1/8},
-			{1/4, -1/2, -1/8, 3/8, 1/8, 1/8},
-			{1/4, -1/8, -1/8, 3/8, 1/8, 1/2},
-			{3/8, -3/16, 1/4, 1/2, 3/16, 1/2},
-			{3/8, -1/8, 3/16, 1/2, 1/8, 1/2},
-			{3/8, -1/16, 1/8, 1/2, 1/16, 1/2},
-
-			{-3/8, -1/2, -1/2, 3/8, -1/4, -3/8},
-
-			{-7/16, -1/16, -1/16, 7/16, 1/16, 1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-1/4, -1/4, -1/4, 1/4, 1/4, 1/4},
-			{-1/8, -1/2, -1/8, 1/8, -1/4, 1/8},
-
-			{-3/8, -1/2, -1/2, -1/4, -1/4, 1/8},
-			{-3/8, -1/2, -1/8, -1/4, 1/8, 1/8},
-			{-3/8, -1/8, -1/8, -1/4, 1/8, 1/2},
-			{-1/2, -3/16, 1/4, -3/8, 3/16, 1/2},
-			{-1/2, -1/8, 3/16, -3/8, 1/8, 1/2},
-			{-1/2, -1/16, 1/8, -3/8, 1/16, 1/2},	
-
-			{1/4, -1/2, -1/2, 3/8, -1/4, 1/8},
-			{1/4, -1/2, -1/8, 3/8, 1/8, 1/8},
-			{1/4, -1/8, -1/8, 3/8, 1/8, 1/2},
-			{3/8, -3/16, 1/4, 1/2, 3/16, 1/2},
-			{3/8, -1/8, 3/16, 1/2, 1/8, 1/2},
-			{3/8, -1/16, 1/8, 1/2, 1/16, 1/2},
-
-			{-3/8, -1/2, -1/2, 3/8, -1/4, -3/8},
-
-			{-7/16, -1/16, -1/16, 7/16, 1/16, 1/16}
-		}
-	},
-
-	after_place_node = function(pos)
-		local node = minetest.env:get_node(pos)
-		node.name = "infrastructure:boom_barrier_bottom"
-		minetest.env:add_node(pos, node)
-		pos.y = pos.y + 1
-		node.name = "infrastructure:boom_barrier_top_h"
-		minetest.env:add_node(pos, node)
-	end,
-
-	after_dig_node = function(pos)
-		pos.y = pos.y - 1
-		minetest.env:remove_node(pos)
-	end,
-
-	on_punch = function(pos, node)
-		move_arm(pos, node)
-	end
-})
-
-minetest.register_node("infrastructure:boom_barrier_top_v", {
-	tiles = {
-		"infrastructure_boom_barrier_h_front_back.png",
-		"infrastructure_boom_barrier_v_bottom.png",
-		"infrastructure_boom_barrier_v_right.png",
-		"infrastructure_boom_barrier_v_left.png",
-		"infrastructure_boom_barrier_v_front_back.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	drop = "infrastructure:boom_barrier_top_h",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/4, -1/4, -1/4, 1/4, 1/4, 1/4},
-			{-1/8, -1/2, -1/8, 1/8, -1/4, 1/8},
-
-			{-3/8, -1/8, -1/2, -1/4, 1/2, -1/4},
-			{-3/8, -1/8, -1/2, -1/4, 1/8, 1/8},
-			{-3/8, -1/2, -1/8, -1/4, 1/8, 1/8},
-			{-1/2, -1/2, -3/16, -3/8, -1/4, 3/16},
-			{-1/2, -1/2, -1/8, -3/8, -3/16, 1/8},
-			{-1/2, -1/2, -1/16, -3/8, -1/8, 1/16},	
-
-			{1/4, -1/8, -1/2, 3/8, 1/2, -1/4},
-			{1/4, -1/8, -1/2, 3/8, 1/8, 1/8},
-			{1/4, -1/2, -1/8, 3/8, 1/8, 1/8},
-			{3/8, -1/2, -3/16, 1/2, -1/4, 3/16},
-			{3/8, -1/2, -1/8, 1/2, -3/16, 1/8},
-			{3/8, -1/2, -1/16, 1/2, -1/8, 1/16},
-
-			{-3/8, 3/8, -1/2, 3/8, 1/2, -1/4},
-
-			{-7/16, -1/16, -1/16, 7/16, 1/16, 1/16}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-1/4, -1/4, -1/4, 1/4, 1/4, 1/4},
-			{-1/8, -1/2, -1/8, 1/8, -1/4, 1/8},
-
-			{-3/8, -1/8, -1/2, -1/4, 1/2, -1/4},
-			{-3/8, -1/8, -1/2, -1/4, 1/8, 1/8},
-			{-3/8, -1/2, -1/8, -1/4, 1/8, 1/8},
-			{-1/2, -1/2, -3/16, -3/8, -1/4, 3/16},
-			{-1/2, -1/2, -1/8, -3/8, -3/16, 1/8},
-			{-1/2, -1/2, -1/16, -3/8, -1/8, 1/16},	
-
-			{1/4, -1/8, -1/2, 3/8, 1/2, -1/4},
-			{1/4, -1/8, -1/2, 3/8, 1/8, 1/8},
-			{1/4, -1/2, -1/8, 3/8, 1/8, 1/8},
-			{3/8, -1/2, -3/16, 1/2, -1/4, 3/16},
-			{3/8, -1/2, -1/8, 1/2, -3/16, 1/8},
-			{3/8, -1/2, -1/16, 1/2, -1/8, 1/16},
-
-			{-3/8, 3/8, -1/2, 3/8, 1/2, -1/4},
-
-			{-7/16, -1/16, -1/16, 7/16, 1/16, 1/16}
-		}
-	},
-
-	after_dig_node = function(pos)
-		pos.y = pos.y - 1
-		minetest.env:remove_node(pos)
-	end,
-
-	on_punch = function(pos, node)
-		move_arm(pos, node)
-	end
-})
-
-minetest.register_node("infrastructure:boom_barrier_bottom", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_automatic_warning_device_bottom.png",
-		"infrastructure_automatic_warning_device_bottom.png",
-		"infrastructure_automatic_warning_device_bottom.png",
-		"infrastructure_automatic_warning_device_bottom.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	drop = "infrastructure:boom_barrier_top_h",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-			{-1/2, -1/2, -1/4, 1/2, -3/8, 1/4},
-			{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2},
-			{-1/8, -1/2, -1/8, 1/8, 0, 1/8}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-			{-1/2, -1/2, -1/4, 1/2, -3/8, 1/4},
-			{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2},
-			{-1/8, -1/2, -1/8, 1/8, 0, 1/8}
-		}
-	},
-
-	after_dig_node = function(pos)
-		pos.y = pos.y + 1
-		minetest.env:remove_node(pos)
-	end,
-
-	on_construct = function(pos)
-		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", "field[channel;Channel;${channel}]")
-	end,
-
-	on_receive_fields = function(pos, formname, fields, sender)
-		if (fields.channel) then
-			minetest.get_meta(pos):set_string("channel", fields.channel)
-			minetest.get_meta(pos):set_string("state", "Off")
-		end
-	end,
-
-	digiline = {
-		receptor = {},
-		effector = {
-			action = function(pos, node, channel, msg)
-				local setchan = minetest.get_meta(pos):get_string("channel")
-				if setchan ~= channel then
-					return
-				end
-				pos.y = pos.y + 1
-				local mechnode = minetest.env:get_node(pos)
-				if ((msg == "up" and mechnode.name=="infrastructure:boom_barrier_top_h") or (msg == "down" and mechnode.name=="infrastructure:boom_barrier_top_v")) then
-					move_arm(pos, mechnode)
-				end
-			end
-		}
-	},
-})
-
-minetest.register_node("infrastructure:boom_barrier_arm_h_lightfirst", {
-	description = "Boom barrier arm",
-	tiles = {
-		"infrastructure_boom_barrier_arm_h_top.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		{name="infrastructure_boom_barrier_arm_h_anim_lightfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}},
-		{name="infrastructure_boom_barrier_arm_h_anim_lightfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}},
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	light_source = BOOM_BARRIER_LIGHT_RANGE,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, -7/16, 1/2},
-			{-1/8, -5/16, -1/2, 1/8, -1/4, 1/2},
-			{-1/8, -1/2, -1/2, -1/16, -1/4, 1/2},
-			{1/16, -1/2, -1/2, 1/8, -1/4, 1/2},
-			{0, -1/4, -1/8, 0, 0, 1/8}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, -1/4, 1/2}
-		}
-	}
-})
-
-minetest.register_node("infrastructure:boom_barrier_arm_h_darkfirst", {
-	tiles = {
-		"infrastructure_boom_barrier_arm_h_top.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		{name="infrastructure_boom_barrier_arm_h_anim_darkfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}},
-		{name="infrastructure_boom_barrier_arm_h_anim_darkfirst.png",animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5}},
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	drop = "infrastructure:boom_barrier_arm_h_lightfirst",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, -7/16, 1/2},
-			{-1/8, -5/16, -1/2, 1/8, -1/4, 1/2},
-			{-1/8, -1/2, -1/2, -1/16, -1/4, 1/2},
-			{1/16, -1/2, -1/2, 1/8, -1/4, 1/2},
-			{0, -1/4, -1/8, 0, 0, 1/8}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, -1/4, 1/2}
-		}
-	}
-})
-
-minetest.register_node("infrastructure:boom_barrier_arm_h_end", {
-	tiles = {
-		"infrastructure_boom_barrier_arm_h_top.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		"infrastructure_boom_barrier_arm_h_left_right_bright.png",
-		"infrastructure_boom_barrier_arm_h_left_right_bright.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	drop = "infrastructure:boom_barrier_arm_h_lightfirst",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, -7/16, 1/2},
-			{-1/8, -5/16, -1/2, 1/8, -1/4, 1/2},
-			{-1/8, -1/2, -1/2, -1/16, -1/4, 1/2},
-			{1/16, -1/2, -1/2, 1/8, -1/4, 1/2},
-			{0, -1/4, -1/8, 0, 0, 1/8}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, -1/4, 1/2}
-		}
-	}
-})
-
-minetest.register_alias("infrastructure:boom_barrier_arm_h_dark","infrastructure:boom_barrier_arm_h_darkfirst")
-minetest.register_alias("infrastructure:boom_barrier_arm_h_bright","infrastructure:boom_barrier_arm_h_lightfirst")
-
-minetest.register_node("infrastructure:boom_barrier_arm_v", {
-	tiles = {
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png",
-		"infrastructure_boom_barrier_arm_v_left.png",
-		"infrastructure_boom_barrier_arm_v_right.png",
-		"infrastructure_boom_barrier_arm_h_top.png",
-		"infrastructure_boom_barrier_arm_h_bottom_front_back.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	drop = "infrastructure:boom_barrier_arm_h_lightfirst",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, 1/2, -7/16},
-			{-1/8, -1/2, -5/16, 1/8, 1/2, -1/4},
-			{-1/8, -1/2, -1/2, -1/16, 1/2, -1/4},
-			{1/16, -1/2, -1/2, 1/8, 1/2, -1/4},
-			{0, -1/8, -1/4, 0, 1/8, 0}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-1/8, -1/2, -1/2, 1/8, 1/2, -1/4}
-		}
-	}
-})
-
-minetest.register_alias("infrastructure:boom_barrier_mechanism", "infrastructure:boom_barrier_top_h")
-minetest.register_alias("infrastructure:boom_barrier_arm", "infrastructure:boom_barrier_arm_h_lightfirst")
diff --git a/streets/infrastructure/advanced_crosswalk_lighting.lua b/streets/infrastructure/advanced_crosswalk_lighting.lua
deleted file mode 100644
index 4e669c1..0000000
--- a/streets/infrastructure/advanced_crosswalk_lighting.lua
+++ /dev/null
@@ -1,85 +0,0 @@
--- Crosswalk lighting
-	minetest.register_node("infrastructure:crosswalk_lighting_dark", {
-		description = "Crosswalk lighting",
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_crosswalk_lighting_bottom.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_crosswalk_lighting_back.png",
-			"infrastructure_crosswalk_lighting_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3},
-		node_box = {
-			type = "fixed",
-				fixed = {
-					{-3/8, -1/2, -1/4, 3/8, 1/2, -3/16},
-					{-3/8, -1/2, 3/16, 3/8, 1/2, 1/4},
-					{-1/4, 1/4, -3/16, -1/8, 3/8, 3/16},
-					{1/8, 1/4, -3/16, 1/4, 3/8, 3/16},
-					{-1/8, -1/2, -3/16, 1/8, -1/4, 3/16},
-					{-1/2, -1/2, -1/8, 1/2, -3/8, 1/8},
-				}
-		},
-		selection_box = {
-			type = "fixed",
-				fixed = {-3/8, -1/2, -1/4, 3/8, 1/2, 1/4}
-		},
-
-		on_punch = function(pos, node)
-			minetest.swap_node(pos, {name = "infrastructure:crosswalk_lighting_bright", param2 = node.param2})
-		end,
-
-		mesecons = {effector = {
-			action_on = function (pos, node)
-				minetest.swap_node(pos, {name = "infrastructure:crosswalk_lighting_bright", param2 = node.param2})
-			end,
-		}}
-	})
-
-	minetest.register_node("infrastructure:crosswalk_lighting_bright", {
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_crosswalk_lighting_bottom.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_crosswalk_lighting_back.png",
-			"infrastructure_crosswalk_lighting_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3, not_in_creative_inventory = 1},
-		light_source = CROSSWALK_LIGHTING_LIGHT_RANGE,
-		drop = "infrastructure:crosswalk_lighting_dark",
-		node_box = {
-			type = "fixed",
-				fixed = {
-					{-3/8, -1/2, -1/4, 3/8, 1/2, -3/16},
-					{-3/8, -1/2, 3/16, 3/8, 1/2, 1/4},
-					{-1/4, 1/4, -3/16, -1/8, 3/8, 3/16},
-					{1/8, 1/4, -3/16, 1/4, 3/8, 3/16},
-					{-1/8, -1/2, -3/16, 1/8, -1/4, 3/16},
-					{-1/2, -1/2, -1/8, 1/2, -3/8, 1/8},
-				}
-		},
-		selection_box = {
-			type = "fixed",
-				fixed = {-3/8, -1/2, -1/4, 3/8, 1/2, 1/4}
-		},
-
-		on_punch = function(pos, node)
-			minetest.swap_node(pos, {name = "infrastructure:crosswalk_lighting_dark", param2 = node.param2})
-		end,
-
-		mesecons = {effector = {
-			action_off = function (pos, node)
-				minetest.swap_node(pos, {name = "infrastructure:crosswalk_lighting_dark", param2 = node.param2})
-			end,
-		}}
-	})
-
-	minetest.register_alias("infrastructure:crosswalk_lighting", "infrastructure:crosswalk_lighting_dark")
diff --git a/streets/infrastructure/advanced_crosswalk_safety_sign.lua b/streets/infrastructure/advanced_crosswalk_safety_sign.lua
deleted file mode 100644
index 6183322..0000000
--- a/streets/infrastructure/advanced_crosswalk_safety_sign.lua
+++ /dev/null
@@ -1,85 +0,0 @@
--- Crosswalk safety sign
-	minetest.register_node("infrastructure:crosswalk_safety_sign_top", {
-		tiles = {
-			"infrastructure_crosswalk_safety_sign_top.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_crosswalk_safety_sign_top_side.png",
-			"infrastructure_crosswalk_safety_sign_top_side.png",
-			"infrastructure_crosswalk_safety_sign_top_front_back.png",
-			"infrastructure_crosswalk_safety_sign_top_front_back.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 1, not_in_creative_inventory = 1},
-		light_source = CROSSWALK_SAFETY_SIGN_LIGHT_RANGE,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -1/2, -1/16, 1/4, 0, -1/16},
-				{-1/4, -1/2, 1/16, 1/4, 0, 1/16},
-				{-1/16, -1/2, -1/16, 1/16, -1/4, 1/16}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {0, 0, 0, 0, 0, 0}
-		}
-	})
-
-	minetest.register_node("infrastructure:crosswalk_safety_sign_bottom", {
-		description = "Crosswalk safety sign",
-		inventory_image = "infrastructure_crosswalk_safety_sign.png",
-		wield_image = "infrastructure_crosswalk_safety_sign.png",
-		tiles = {
-			"infrastructure_crosswalk_safety_sign_top.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_crosswalk_safety_sign_bottom_side.png",
-			"infrastructure_crosswalk_safety_sign_bottom_side.png",
-			"infrastructure_crosswalk_safety_sign_bottom_front_back.png",
-			"infrastructure_crosswalk_safety_sign_bottom_front_back.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 1},
-		light_source = CROSSWALK_SAFETY_SIGN_LIGHT_RANGE,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -7/32, -1/16, 1/4, 1/2, -1/16},
-				{-1/4, -7/32, 1/16, 1/4, 1/2, 1/16},
-				{-1/16, -5/16, -1/16, 1/16, 1/2, 1/16},
-				{-1/8, -3/8, -1/8, 1/8, -5/16, 1/8},
-				{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -7/32, -1/16, 1/4, 1, -1/16},
-				{-1/4, -7/32, 1/16, 1/4, 1, 1/16},
-
-				{-1/16, -5/16, -1/16 + 0.01, 1/16, 3/4, 1/16 - 0.01},
-
-				{-1/8, -3/8, -1/8, 1/8, -5/16, 1/8},
-				{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2}
-			}
-		},
-
-		after_place_node = function(pos)
-			local node = minetest.env:get_node(pos)
-			node.name = "infrastructure:crosswalk_safety_sign_bottom"
-			minetest.env:add_node(pos, node)
-			pos.y = pos.y + 1
-			node.name = "infrastructure:crosswalk_safety_sign_top"
-			minetest.env:add_node(pos, node)
-		end,
-
-		after_dig_node = function(pos)
-			pos.y = pos.y + 1
-			minetest.env:remove_node(pos)
-		end,
-	})
-
-	minetest.register_alias("infrastructure:crosswalk_safety_sign", "infrastructure:crosswalk_safety_sign_bottom")
diff --git a/streets/infrastructure/advanced_crosswalk_warning_light.lua b/streets/infrastructure/advanced_crosswalk_warning_light.lua
deleted file mode 100644
index 213223a..0000000
--- a/streets/infrastructure/advanced_crosswalk_warning_light.lua
+++ /dev/null
@@ -1,124 +0,0 @@
--- Crosswalk warning light
-function on_off_light(pos, node)
-	if node.name == "infrastructure:crosswalk_warning_light_off" then
-		minetest.swap_node(pos, {name = "infrastructure:crosswalk_warning_light_on", param2 = node.param2})
-	elseif (node.name == "infrastructure:crosswalk_warning_light_on") then
-		minetest.swap_node(pos, {name = "infrastructure:crosswalk_warning_light_off", param2 = node.param2})
-	end
-end
-
-minetest.register_node("infrastructure:crosswalk_warning_light_off", {
-	description = "Crosswalk warning light",
-	inventory_image = "infrastructure_crosswalk_warning_light_front_bright.png",
-	wield_image = "infrastructure_crosswalk_warning_light_front_bright.png",
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_crosswalk_warning_light_back.png",
-		"infrastructure_crosswalk_warning_light_front_dark.png"
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 3, not_in_creative_inventory = 0},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-5/16, -5/16, -1/8, 5/16, 3/8, 1/8},
-			{-1/2, -1/2, -1/8, 1/2, 1/2, -1/8},
-
-			{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-			{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-			{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-			{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-			{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-			{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.001}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-5/16, -5/16, -1/8, 5/16, 3/8, 1/8},
-
-			{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-			{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-			{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-			{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-			{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-			{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.01}
-		}
-	},
-
-	on_punch = function(pos, node)
-		on_off_light(pos, node)
-	end,
-
-	mesecons = {effector = {
-		action_on = function(pos, node)
-			on_off_light(pos, node)
-		end,
-	}}
-})
-
-minetest.register_node("infrastructure:crosswalk_warning_light_on", {
-	tiles = {
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_traffic_lights_side.png",
-		"infrastructure_crosswalk_warning_light_back.png",
-		{name="infrastructure_crosswalk_warning_light_front_anim.png",animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.5}}
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 3, not_in_creative_inventory = 1},
-	drop = "infrastructure:crosswalk_warning_light_off",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-5/16, -5/16, -1/8, 5/16, 3/8, 1/8},
-			{-1/2, -1/2, -1/8, 1/2, 1/2, -1/8},
-
-			{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-			{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-			{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-			{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-			{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-			{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.001}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-5/16, -5/16, -1/8, 5/16, 3/8, 1/8},
-
-			{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-			{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-			{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-			{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-			{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-			{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.01}
-		}
-	},
-
-	on_punch = function(pos, node)
-		on_off_light(pos, node)
-	end,
-
-	mesecons = {effector = {
-		action_on = function(pos, node)
-			on_off_light(pos, node)
-		end,
-	}}
-})
-
-minetest.register_alias("infrastructure:crosswalk_warning_light", "infrastructure:crosswalk_warning_light_off")
-minetest.register_alias("infrastructure:crosswalk_warning_bright", "infrastructure:crosswalk_warning_light_on")
-minetest.register_alias("infrastructure:crosswalk_warning_dark", "infrastructure:crosswalk_warning_light_on")
diff --git a/streets/infrastructure/advanced_curve_chevron.lua b/streets/infrastructure/advanced_curve_chevron.lua
deleted file mode 100644
index 7d3b65d..0000000
--- a/streets/infrastructure/advanced_curve_chevron.lua
+++ /dev/null
@@ -1,85 +0,0 @@
--- Curve chevron
-	minetest.register_node("infrastructure:curve_chevron_dark", {
-		description = "Flashing curve chevron",
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_curve_chevron_left_dark.png",
-			"infrastructure_curve_chevron_right_dark.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3},
-		node_box = {
-			type = "fixed",
-				fixed = {
-					{-1/2, -1/2, -1/8, 1/2, 1/2, -1/16},
-					{-1/2, -1/2, 1/16, 1/2, 1/2, 1/8},
-					{-3/8, 1/4, -1/16, -1/4, 3/8, 1/16},
-					{1/4, 1/4, -1/16, 3/8, 3/8, 1/16},
-					{-3/8, -3/8, -1/16, -1/4, -1/4, 1/16},
-					{1/4, -3/8, -1/16, 3/8, -1/4, 1/16}
-				}
-		},
-		selection_box = {
-			type = "fixed",
-				fixed = {-1/2, -1/2, -1/8, 1/2, 1/2, 1/8}
-		},
-
-		on_punch = function(pos, node)
-			minetest.swap_node(pos, {name = "infrastructure:curve_chevron_bright", param2 = node.param2})
-		end,
-
-		mesecons = {effector = {
-			action_on = function (pos, node)
-				minetest.swap_node(pos, {name = "infrastructure:curve_chevron_bright", param2 = node.param2})
-			end,
-		}}
-	})
-
-	minetest.register_node("infrastructure:curve_chevron_bright", {
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_curve_chevron_left_bright.png",
-			"infrastructure_curve_chevron_right_bright.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3, not_in_creative_inventory = 1},
-		light_source = CURVE_CHEVRON_LIGHT_RANGE,
-		drop = "infrastructure:curve_chevron_dark",
-		node_box = {
-			type = "fixed",
-				fixed = {
-					{-1/2, -1/2, -1/8, 1/2, 1/2, -1/16},
-					{-1/2, -1/2, 1/16, 1/2, 1/2, 1/8},
-					{-3/8, 1/4, -1/16, -1/4, 3/8, 1/16},
-					{1/4, 1/4, -1/16, 3/8, 3/8, 1/16},
-					{-3/8, -3/8, -1/16, -1/4, -1/4, 1/16},
-					{1/4, -3/8, -1/16, 3/8, -1/4, 1/16}
-				}
-		},
-		selection_box = {
-			type = "fixed",
-				fixed = {-1/2, -1/2, -1/8, 1/2, 1/2, 1/8}
-		},
-
-		on_punch = function(pos, node)
-			minetest.swap_node(pos, {name = "infrastructure:curve_chevron_dark", param2 = node.param2})
-		end,
-
-		mesecons = {effector = {
-			action_off = function (pos, node)
-				minetest.swap_node(pos, {name = "infrastructure:curve_chevron_dark", param2 = node.param2})
-			end
-		}}
-	})
-
-	minetest.register_alias("infrastructure:curve_chevron", "infrastructure:curve_chevron_dark")
diff --git a/streets/infrastructure/advanced_emergency_phone.lua b/streets/infrastructure/advanced_emergency_phone.lua
deleted file mode 100644
index c511db1..0000000
--- a/streets/infrastructure/advanced_emergency_phone.lua
+++ /dev/null
@@ -1,107 +0,0 @@
--- Emergency phone (only if enabled)
-	if ENABLE_EMERGENCY_PHONE then
-		minetest.register_node("infrastructure:emergency_phone_top", {
-			description = "Emergency phone",
-			tiles = {
-				"infrastructure_emergency_phone_top.png",
-				"infrastructure_emergency_phone_bottom.png",
-				"infrastructure_emergency_phone_side.png",
-				"infrastructure_emergency_phone_side.png",
-				"infrastructure_emergency_phone_side.png",
-				"infrastructure_emergency_phone_front.png"
-			},
-			drawtype = "nodebox",
-			drop = "streets:emergencyphone",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky=1,not_in_creative_inventory=1},
-			light_source = EMERGENCY_PHONE_LIGHT_RANGE,
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.25, -0.5, -0.25, 0.25, 0.5, 0.25},
-					{-0.25, -0.5, -0.3125, -0.1875, 0.5, -0.25},
-					{0.1875, -0.5, -0.3125, 0.25, 0.5, -0.25},
-					{-0.1875, 0.4375, -0.3125, 0.1875, 0.5, -0.25}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-0.25, -0.5, -0.25, 0.25, 0.5, 0.25},
-					{-0.25, -0.5, -0.3125, -0.1875, 0.5, -0.25},
-					{0.1875, -0.5, -0.3125, 0.25, 0.5, -0.25},
-					{-0.1875, 0.4375, -0.3125, 0.1875, 0.5, -0.25},
-				}
-			},
-
-			after_dig_node = function(pos)
-				pos.y = pos.y - 1
-				if minetest.get_node(pos).name == "infrastructure:emergency_phone_bottom" then
-					minetest.remove_node(pos)
-				end
-			end,
-
-			on_punch = function(pos, node, puncher)
-				if dial_handler ~= nil then
-					minetest.sound_stop(dial_handler)
-					dial_handler = nil
-				end
-				dial_handler = minetest.sound_play("infrastructure_emergency_phone", {
-					pos = pos,
-					gain = EMERGENCY_PHONE_VOLUME,
-					max_hear_distance = 50
-				})
-				if (puncher:is_player() and puncher:get_hp() < HEALTH_TO_RESTORING and puncher:get_hp() <= HEALTH_TO_TRIGGER) then
-					puncher:set_hp(HEALTH_TO_RESTORING)
-					minetest.chat_send_player(puncher:get_player_name(), "You got healed!")
-					minetest.chat_send_all("Server: -!- "..puncher:get_player_name().." used an emergency phone at "..pos.x..","..pos.y..","..pos.z);
-				end
-			end
-		})
-
-		minetest.register_node("infrastructure:emergency_phone_bottom", {
-			tiles = {"infrastructure_emergency_phone_bottom.png"},
-			drawtype = "nodebox",
-			drop = "streets:emergencyphone",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky=1,not_in_creative_inventory=1},
-			node_box = {
-				type = "fixed",
-				fixed = {-0.25, -0.5, -0.25, 0.25, 0.5, 0.25}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {-0.25, -0.5, -0.25, 0.25, 0.5, 0.25}
-			},
-
-			after_dig_node = function(pos)
-				pos.y = pos.y+1
-				if minetest.get_node(pos).name == "infrastructure:emergency_phone_top" then
-					minetest.remove_node(pos)
-				end
-			end,
-		})
-
-		minetest.register_alias("infrastructure:emergency_phone", "infrastructure:emergency_phone_top")
-
-		minetest.register_abm({
-			nodenames = {"streets:emergencyphone"},
-			interval = 1,
-			chance = 1,
-			action = function(pos, node)
-				local node = minetest.get_node(pos)
-				local node_above = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-				if node_above.name == "air" then
-					node.name = "infrastructure:emergency_phone_bottom"
-					minetest.set_node(pos, node)
-					pos.y = pos.y+1
-				end
-				node.name = "infrastructure:emergency_phone_top"
-				minetest.set_node(pos, node)
-			end,
-		})
-	else
-		print("Infrastructure mod: -!- Emergency-Phone is disabled!")
-	end
diff --git a/streets/infrastructure/advanced_lane_control_lights.lua b/streets/infrastructure/advanced_lane_control_lights.lua
deleted file mode 100644
index 195f809..0000000
--- a/streets/infrastructure/advanced_lane_control_lights.lua
+++ /dev/null
@@ -1,91 +0,0 @@
--- Lane control lights
-
-for i = 1, 6 do
-	local groups = {}
-	if i == 1 then 
-		groups = {cracky = 3}
-	else
-		groups = {cracky = 3, not_in_creative_inventory = 1}
-	end
-
-	minetest.register_node("infrastructure:lane_control_lights_"..tostring(i), {
-		description = "Lane control lights",
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_lane_control_lights_"..tostring(i)..".png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		on_construct = function(pos)
-			local meta = minetest.get_meta(pos)
-			meta:set_string("formspec", "field[channel;Channel;${channel}]")
-		end,
-		groups = {cracky = 3, not_in_creative_inventory = (i == 1 and 0 or 1)},
-		light_source = TRAFFIC_LIGHTS_LIGHT_RANGE,
-		drop = "infrastructure:lane_control_lights_1",
-		node_box = {
-			type = "fixed",
-				fixed = {
-					{-7/16, -7/16, -1/8, 7/16, 7/16, 1/8},
-					{-7/16, 0, -1/4, -3/8, 7/16, -1/8},
-					{3/8, 0, -1/4, 7/16, 7/16, -1/8},
-					{-7/16, 3/8, -5/16, 7/16, 7/16, -1/8},
-					{-1/16, -1/4, 0, 1/16, 1/4, 1/2 - 0.001},
-					{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.001},
-					{-1/4, -1/16, 0, 1/4, 1/16, 1/2 - 0.001}
-				}
-		},
-		selection_box = {
-			type = "fixed",
-				fixed = {
-					{-7/16, -7/16, -1/8, 7/16, 7/16, 1/8},
-					{-7/16, 0, -1/4, -3/8, 7/16, -1/8},
-					{3/8, 0, -1/4, 7/16, 7/16, -1/8},
-					{-7/16, 3/8, -5/16, 7/16, 7/16, -1/8},
-					{-1/16, -1/4, 0, 1/16, 1/4, 1/2 - 0.001},
-					{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.001},
-					{-1/4, -1/16, 0, 1/4, 1/16, 1/2 - 0.001}
-				}
-
-		},
-		on_receive_fields = function(pos, formname, fields)
-			if (fields.channel) then
-				minetest.get_meta(pos):set_string("channel", fields.channel)
-			end
-		end,
-		digiline = {
-			receptor = {},
-			effector = {
-				action = function(pos, node, channel, msg)
-					local setchan = minetest.get_meta(pos):get_string("channel")
-					if setchan ~= channel then
-						return
-					end
-					msg = msg:lower()
-					if (msg=="off") then
-						node.name = "infrastructure:lane_control_lights_1"
-					elseif (msg=="green") then
-						node.name = "infrastructure:lane_control_lights_3"
-					elseif (msg=="red") then
-						node.name = "infrastructure:lane_control_lights_2"
-					elseif (msg=="yellowleft") then
-						node.name = "infrastructure:lane_control_lights_5"
-					elseif (msg=="yellowright") then
-						node.name = "infrastructure:lane_control_lights_4"
-					elseif (msg=="yellow") then
-						node.name = "infrastructure:lane_control_lights_6"
-					end
-					minetest.set_node(pos,node)
-					minetest.get_meta(pos):set_string("channel",setchan)
-				end
-			}
-		}
-	})
-end
-
-minetest.register_alias("infrastructure:lane_control_lights", "infrastructure:lane_control_lights_1")
diff --git a/streets/infrastructure/advanced_road_signs.lua b/streets/infrastructure/advanced_road_signs.lua
deleted file mode 100644
index b732bfd..0000000
--- a/streets/infrastructure/advanced_road_signs.lua
+++ /dev/null
@@ -1,237 +0,0 @@
--- Road signs
-	local signs = {"stop", "yield", "right_of_way"}
-
-	for i, sign_name in ipairs(signs) do
-		minetest.register_node("infrastructure:road_sign_"..sign_name, {
-			description = "Road sign "..sign_name,
-			tiles = {
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_road_sign_"..sign_name.."_back.png",
-				"infrastructure_road_sign_"..sign_name.."_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2},
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/2, 7/16, 1/2, 1/2, 7/16},
-					{-3/16, -1/8, 7/16, 3/16, 1/8, 1/2 - 0.001}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/2, 7/16, 1/2, 1/2, 7/16},
-					{-3/16, -1/8, 7/16 + 0.01, 3/16, 1/8, 1/2 - 0.01}
-				}
-			},
-
-			after_place_node = function(pos, node)
-				local node = minetest.env:get_node(pos)
-				local param2 = node.param2
-				local sign_pos = {x=pos.x, y=pos.y, z=pos.z}
-
-				if param2 == 0 then
-					pos.z = pos.z + 1
-				elseif param2 == 1 then
-					pos.x = pos.x + 1
-				elseif param2 == 2 then
-					pos.z = pos.z - 1
-				elseif param2 == 3 then
-					pos.x = pos.x - 1
-				end
-
-				local node = minetest.env:get_node(pos)
-
-				if minetest.registered_nodes[node.name].drawtype == "fencelike" then
-					minetest.set_node(sign_pos, {name="infrastructure:road_sign_"..sign_name.."_on_post", param2=param2})
-				end
-			end
-		})
-
-		minetest.register_node("infrastructure:road_sign_"..sign_name.."_on_post", {
-			tiles = {
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_road_sign_"..sign_name.."_back.png",
-				"infrastructure_road_sign_"..sign_name.."_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			drop = "infrastructure:road_sign_"..sign_name,
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/2, 7/16 + 3/8, 1/2, 1/2, 7/16 + 3/8},
-					{-3/16, 1/16, 7/16 + 3/8, 3/16, 1/8, 13/16 + 3/8 - 0.001},
-					{-3/16, -1/8, 7/16 + 3/8, 3/16, -1/16, 13/16 + 3/8 - 0.001}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/2, 7/16 + 3/8, 1/2, 1/2, 7/16 + 3/8},
-					{-3/16, 1/16, 7/16 + 3/8 + 0.01, 3/16, 1/8, 13/16 + 3/8 - 0.01},
-					{-3/16, -1/8, 7/16 + 3/8 + 0.01, 3/16, -1/16, 13/16 + 3/8 - 0.01}
-				}
-			}
-		})
-	end
-
--- Road sign crosswalk
-	minetest.register_node("infrastructure:road_sign_crosswalk", {
-		description = "Road sign crosswalk",
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_road_sign_crosswalk_back.png",
-			"infrastructure_road_sign_crosswalk_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, 7/16, 1/2, 1/2, 7/16},
-				{-3/16, -1/8, 7/16, 3/16, 1/8, 1/2 - 0.001}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, 7/16, 1/2, 1/2, 7/16},
-				{-3/16, -1/8, 7/16, 3/16, 1/8, 1/2 - 0.001}
-			}
-		},
-
-		after_place_node = function(pos, node)
-			local node = minetest.env:get_node(pos)
-			local param2 = node.param2
-			local sign_pos = {x=pos.x, y=pos.y, z=pos.z}
-
-			if param2 == 0 then
-				pos.z = pos.z + 1
-			elseif param2 == 1 then
-				pos.x = pos.x + 1
-			elseif param2 == 2 then
-				pos.z = pos.z - 1
-			elseif param2 == 3 then
-				pos.x = pos.x - 1
-			end
-
-			local node = minetest.env:get_node(pos)
-
-			if param2 == 0 then
-				pos.z = pos.z - 2
-			elseif param2 == 1 then
-				pos.x = pos.x - 2
-			elseif param2 == 2 then
-				pos.z = pos.z + 2
-			elseif param2 == 3 then
-				pos.x = pos.x + 2
-			end
-
-			if minetest.registered_nodes[node.name].drawtype == "fencelike" then
-				minetest.set_node(sign_pos, {name="infrastructure:road_sign_crosswalk_on_post", param2=param2})
-				minetest.env:add_node(pos, {name="infrastructure:road_sign_retroreflective_surface_on_post", param2=param2})
-			else
-				minetest.env:add_node(pos, {name="infrastructure:road_sign_retroreflective_surface", param2=param2})
-			end
-		end
-	})
-
-	minetest.register_node("infrastructure:road_sign_crosswalk_on_post", {
-		description = "Road sign crosswalk",
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_road_sign_crosswalk_back.png",
-			"infrastructure_road_sign_crosswalk_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2, not_in_creative_inventory = 1},
-		drop = "infrastructure:road_sign_crosswalk",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, 7/16 + 3/8, 1/2, 1/2, 7/16 + 3/8},
-				{-3/16, 1/16, 7/16 + 3/8, 3/16, 1/8, 13/16 + 3/8 - 0.001},
-				{-3/16, -1/8, 7/16 + 3/8, 3/16, -1/16, 13/16 + 3/8 - 0.001}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, 7/16 + 3/8, 1/2, 1/2, 7/16 + 3/8},
-				{-3/16, 1/16, 7/16 + 3/8 + 0.01, 3/16, 1/8, 13/16 + 3/8 - 0.01},
-				{-3/16, -1/8, 7/16 + 3/8 + 0.01, 3/16, -1/16, 13/16 + 3/8 - 0.01}
-			}
-		}
-	})
-
-	minetest.register_node("infrastructure:road_sign_retroreflective_surface", {
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_road_sign_retroreflective_surface.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2, not_in_creative_inventory = 1},
-		light_source = RETROREFLECTIVE_SURFACE_LIGHT_RANGE,
-		drop = "",
-		node_box = {
-			type = "fixed",
-			fixed = {-3/4, -3/4, 7/16 + 1 + 0.01, 3/4, 3/4, 7/16 + 1 + 0.01}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-3/4, -3/4, 7/16 + 1 + 0.01, 3/4, 3/4, 7/16 + 1 + 0.01}
-		}
-	})
-
-	minetest.register_node("infrastructure:road_sign_retroreflective_surface_on_post", {
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_road_sign_retroreflective_surface.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2, not_in_creative_inventory = 1},
-		light_source = RETROREFLECTIVE_SURFACE_LIGHT_RANGE,
-		drop = "",
-		node_box = {
-			type = "fixed",
-			fixed = {-3/4, -3/4, 7/16 + 3/8 + 1 + 0.01, 3/4, 3/4, 7/16 + 3/8 + 1 + 0.01}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-3/4, -3/4, 7/16 + 3/8 + 1 + 0.01, 3/4, 3/4, 7/16 + 3/8 + 1 + 0.01}
-		}
-	})
diff --git a/streets/infrastructure/advanced_traffic_lights_pedestrians.lua b/streets/infrastructure/advanced_traffic_lights_pedestrians.lua
deleted file mode 100644
index 02da804..0000000
--- a/streets/infrastructure/advanced_traffic_lights_pedestrians.lua
+++ /dev/null
@@ -1,252 +0,0 @@
--- Traffic lights for pedestrians
-	beep_handler = {}
-
-	function semaphores_pedestrians(pos, node)
-		local p = minetest.hash_node_position(pos)
-		if node.name == "infrastructure:traffic_lights_pedestrians_bottom_1" then
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_bottom_2", param2 = node.param2})
-			pos.y = pos.y + 1
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_top_2", param2 = node.param2})
-		elseif node.name == "infrastructure:traffic_lights_pedestrians_bottom_2" then
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_bottom_3", param2 = node.param2})
-			pos.y = pos.y + 1
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_top_3", param2 = node.param2})
-			beep_handler[p] = minetest.sound_play("infrastructure_traffic_lights_1", {
-				loop = true,
-				pos = pos,
-				gain = TRAFFIC_LIGHTS_VOLUME,
-				max_hear_distance = 50
-			})
-		elseif node.name == "infrastructure:traffic_lights_pedestrians_bottom_3" then
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_bottom_4", param2 = node.param2})
-			if beep_handler[p] ~= nil then
-				minetest.sound_stop(beep_handler[p])
-				beep_handler[p] = nil
-			end
-			pos.y = pos.y + 1
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_top_4", param2 = node.param2})
-			beep_handler[p] = minetest.sound_play("infrastructure_traffic_lights_2", {
-				loop = true,
-				pos = pos,
-				gain = TRAFFIC_LIGHTS_VOLUME,
-				max_hear_distance = 50
-			})
-		elseif node.name == "infrastructure:traffic_lights_pedestrians_bottom_4" then
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_bottom_1", param2 = node.param2})
-			pos.y = pos.y + 1
-			minetest.swap_node(pos, {name = "infrastructure:traffic_lights_pedestrians_top_1", param2 = node.param2})
-			if beep_handler[p] ~= nil then
-				minetest.sound_stop(beep_handler[p])
-				beep_handler[p] = nil
-			end
-		end
-	end
-
-	function quiet(pos)
-		local p = minetest.hash_node_position(pos)
-		if beep_handler[p] ~= nil then
-			minetest.sound_stop(beep_handler[p])
-			beep_handler[p] = nil
-		end
-	end
-
-	for i = 1, 4 do
-		minetest.register_node("infrastructure:traffic_lights_pedestrians_top_"..tostring(i), {
-			tiles = {
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_pedestrians_top_back.png",
-				"infrastructure_traffic_lights_pedestrians_top_front_"..tostring(i)..".png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky=3, not_in_creative_inventory = 1},
-			light_source = TRAFFIC_LIGHTS_LIGHT_RANGE,
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-5/16, -1/2, -1/8, 5/16, 0, 1/8},
-					{-1/2, -1/2, -1/8, 1/2, 1/2, -1/8},
-
-					{-5/16, -1/8, -5/16, 5/16, -1/16, -1/8},
-					{-5/16, -3/8, -1/4, -1/4, -1/8, -1/8},
-					{1/4, -3/8, -1/4, 5/16, -1/8, -1/8},
-
-					{-1/8, 1/16, -1/8, 1/8, 5/16, 0},
-					{-1/16, 1/8, 0, 1/16, 1/4, 1/8},
-					{-1/16, 0, -1/16, 1/16, 1/8, 1/16}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {0, 0, 0, 0, 0, 0}
-			}
-		})
-
-		minetest.register_node("infrastructure:traffic_lights_pedestrians_bottom_"..tostring(i), {
-			tiles = {
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_side.png",
-				"infrastructure_traffic_lights_pedestrians_bottom_back.png",
-				"infrastructure_traffic_lights_pedestrians_bottom_front_"..tostring(i)..".png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 3, not_in_creative_inventory = 1},
-			light_source = TRAFFIC_LIGHTS_LIGHT_RANGE,
-			drop = "infrastructure:traffic_lights_pedestrians_bottom_1",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-5/16, -5/16, -1/8, 5/16, 1/2, 1/8},
-					{-1/2, -1/2, -1/8, 1/2, 1/2, -1/8},
-
-					{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-					{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-					{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-					{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-					{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-					{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.001}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-				-- box
-					{-5/16, -5/16, -1/8, 5/16, 1, 1/8},
-				-- top
-					{-5/16, -1/8 + 1, -5/16, 5/16, -1/16 + 1, -1/8},
-					{-5/16, -3/8 + 1, -1/4, -1/4, -1/8 + 1, -1/8},
-					{1/4, -3/8 + 1, -1/4, 5/16, -1/8 + 1, -1/8},
-
-					{-1/8, 1/16 + 1, -1/8, 1/8, 5/16 + 1, 0},
-					{-1/16, 1/8 + 1, 0, 1/16, 1/4 + 1, 1/8},
-					{-1/16, 0 + 1, -1/16, 1/16, 1/4 + 1, 1/16},
-				-- bottom
-					{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-					{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-					{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-					{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-					{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-					{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.01}
-				}
-			},
-
-			after_place_node = function(pos)
-				local node = minetest.env:get_node(pos)
-				pos.y = pos.y + 1
-				node.name = "infrastructure:traffic_lights_pedestrians_top_"..tostring(i)
-				minetest.env:add_node(pos, node)
-			end,
-
-			after_dig_node = function(pos)
-				local node = minetest.env:get_node(pos)
-				quiet(pos)
-				pos.y = pos.y + 1
-				node.name = "infrastructure:traffic_lights_pedestrians_top_"..tostring(i)
-				minetest.env:remove_node(pos)
-			end,
-
-			on_punch = function(pos, node)
-				semaphores_pedestrians(pos, node)
-			end,
-
-			mesecons = {effector = {
-				action_on = function(pos, node)
-					semaphores_pedestrians(pos, node)
-				end
-			}}
-		})
-	end
-
-	minetest.register_node("infrastructure:traffic_lights_pedestrians_bottom_1", {
-		description = "Traffic lights for pedestrians",
-		inventory_image = "infrastructure_traffic_lights_pedestrians.png",
-		wield_image = "infrastructure_traffic_lights_pedestrians.png",
-		tiles = {
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_side.png",
-			"infrastructure_traffic_lights_pedestrians_bottom_back.png",
-			"infrastructure_traffic_lights_pedestrians_bottom_front_1.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3, not_in_creative_inventory = 0},
-		light_source = TRAFFIC_LIGHTS_LIGHT_RANGE,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-5/16, -5/16, -1/8, 5/16, 1/2, 1/8},
-				{-1/2, -1/2, -1/8, 1/2, 1/2, -1/8},
-
-				{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-				{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-				{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-				{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-				{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-				{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.001}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-			-- box
-				{-5/16, -5/16, -1/8, 5/16, 1, 1/8},
-			-- top
-				{-5/16, -1/8 + 1, -5/16, 5/16, -1/16 + 1, -1/8},
-				{-5/16, -3/8 + 1, -1/4, -1/4, -1/8 + 1, -1/8},
-				{1/4, -3/8 + 1, -1/4, 5/16, -1/8 + 1, -1/8},
-
-				{-1/8, 1/16 + 1, -1/8, 1/8, 5/16 + 1, 0},
-				{-1/16, 1/8 + 1, 0, 1/16, 1/4 + 1, 1/8},
-				{-1/16, 0 + 1, -1/16, 1/16, 1/8 + 1, 1/16},
-			-- bottom
-				{-5/16, 1/4, -5/16, 5/16, 5/16, -1/8},
-				{-5/16, 0, -1/4, -1/4, 1/4, -1/8},
-				{1/4, 0, -1/4, 5/16, 1/4, -1/8},
-
-				{-1/16, -1/4, 1/8, 1/16, 1/4, 3/8},
-				{-1/4, -1/16, 1/8, 1/4, 1/16, 3/8},
-				{-1/4, -1/4, 3/8, 1/4, 1/4, 1/2 - 0.01}
-			}
-		},
-
-		after_place_node = function(pos)
-			local node = minetest.env:get_node(pos)
-			pos.y = pos.y + 1
-			node.name = "infrastructure:traffic_lights_pedestrians_top_1"
-			minetest.env:add_node(pos, node)
-		end,
-
-		after_dig_node = function(pos)
-			local node = minetest.env:get_node(pos)
-			quiet(pos)
-			pos.y = pos.y + 1
-			node.name = "infrastructure:traffic_lights_pedestrians_top_1"
-			minetest.env:remove_node(pos)
-		end,
-
-		on_punch = function(pos, node)
-			semaphores_pedestrians(pos, node)
-		end,
-
-		mesecons = {effector = {
-			action_on = function(pos, node)
-				semaphores_pedestrians(pos, node)
-			end
-		}}
-	})
-
-	minetest.register_alias("infrastructure:traffic_lights_pedestrians", "infrastructure:traffic_lights_pedestrians_bottom_1")
diff --git a/streets/infrastructure/advanced_warning_light.lua b/streets/infrastructure/advanced_warning_light.lua
deleted file mode 100644
index 0ed5b62..0000000
--- a/streets/infrastructure/advanced_warning_light.lua
+++ /dev/null
@@ -1,47 +0,0 @@
--- Warning light
-
-minetest.register_node("infrastructure:warning_light", {
-	description = "Warning light",
-	tiles = {
-		"infrastructure_warning_light_top.png",
-		"infrastructure_warning_light_bottom.png",
-		"infrastructure_warning_light_right.png",
-		"infrastructure_warning_light_left.png",
-		"infrastructure_warning_light_back.png",
-		{name="infrastructure_warning_light_front_anim.png",animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=3}},
-	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky = 1},
-	light_source = WARNING_LIGHT_LIGHT_RANGE,
-	node_box = {
-		type = "fixed",
-			fixed = {
-				{-5/16, -3/8, 0, 5/16, 0, 0},
-
-				{-1/4, -5/16, 0, 0, -1/16, 1/8},
-
-				{1/16, -1/2, -1/8, 5/16, -1/4, 1/8},
-
-				{-1/16, -1/2, -1/16, 1/16, -3/8, 1/16}
-			}
-	},
-	selection_box = {
-		type = "fixed",
-			fixed = {
-				{-5/16, -3/8, 0, 5/16, 0, 0},
-
-				{-1/4, -5/16, 0 + 0.01, 0, -1/16, 1/8},
-
-				{1/16, -1/2, -1/8, 5/16, -1/4, 1/8},
-
-				{-1/16, -1/2, -1/16, 1/16, -3/8, 1/16}
-			}
-	}
-})
-
-
-
-minetest.register_alias("infrastructure:warning_light_bright", "infrastructure:warning_light")
-minetest.register_alias("infrastructure:warning_light_dark", "infrastructure:warning_light")
diff --git a/streets/infrastructure/crafts.lua b/streets/infrastructure/crafts.lua
deleted file mode 100644
index 9897892..0000000
--- a/streets/infrastructure/crafts.lua
+++ /dev/null
@@ -1,443 +0,0 @@
--- **************************************************************************************************** MATERIALS
-
--- Galvanized steel
-	if minetest.get_modpath("technic") then
-		technic.register_alloy_recipe({input = {"default:steel_ingot 6", "technic:zinc_ingot 1"}, output = "infrastructure:galvanized_steel 6", time = 4})
-	else
-		minetest.register_craft({
-			output = '"infrastructure:galvanized_steel" 6',
-			recipe = {
-				{'', 'default:copper_ingot', ''},
-				{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
-				{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}
-			}
-		})
-	end
-
--- Galvanized steel fence
-	minetest.register_craft({
-		output = '"infrastructure:fence_galvanized_steel" 6',
-		recipe = {
-			{'infrastructure:galvanized_steel', 'infrastructure:galvanized_steel', 'infrastructure:galvanized_steel'},
-			{'infrastructure:galvanized_steel', 'infrastructure:galvanized_steel', 'infrastructure:galvanized_steel'}
-		}
-	})
-
--- **************************************************************************************************** PRECAST CONCRETE
-
--- Concrete seperating wall
-	minetest.register_craft({
-		output = '"infrastructure:precast_concrete_seperating_wall" 5',
-		recipe = {
-			{'', 'infrastructure:concrete', ''},
-			{'', 'infrastructure:concrete', ''},
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'}
-		}
-	})
-
--- Concrete cylinder
-	minetest.register_craft({
-		output = '"infrastructure:precast_concrete_cylinder" 8',
-		recipe = {
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'},
-			{'infrastructure:concrete', '', 'infrastructure:concrete'},
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'}
-		}
-	})
-
--- Concrete grid paver
-	minetest.register_craft({
-		output = '"infrastructure:precast_concrete_grid_paver" 5',
-		recipe = {
-			{'infrastructure:concrete', '', 'infrastructure:concrete'},
-			{'', 'infrastructure:concrete', ''},
-			{'infrastructure:concrete', '', 'infrastructure:concrete'}
-		}
-	})
-
--- **************************************************************************************************** STEEL STRUCTURES
-
--- Truss
-	minetest.register_craft({
-		output = '"infrastructure:truss" 5',
-		recipe = {
-			{'infrastructure:galvanized_steel', '', 'infrastructure:galvanized_steel'},
-			{'', 'infrastructure:galvanized_steel', ''},
-			{'infrastructure:galvanized_steel', '', 'infrastructure:galvanized_steel'}
-		}
-	})
-
--- Wire netting
-	minetest.register_craft({
-		output = '"infrastructure:wire_netting" 10',
-		recipe = {
-			{'', 'infrastructure:galvanized_steel', ''},
-			{'infrastructure:galvanized_steel', '', 'infrastructure:galvanized_steel'},
-			{'', 'infrastructure:galvanized_steel', ''}
-		}
-	})
-
--- Razor wire
-	minetest.register_craft({
-		output = '"infrastructure:razor_wire" 5',
-		recipe = {
-			{'infrastructure:galvanized_steel'},
-			{'default:cactus'},
-			{'infrastructure:galvanized_steel'}
-		}
-	})
-
--- Drainage channel grating
-	minetest.register_craft({
-		output = '"infrastructure:drainage_channel_grating" 2',
-		recipe = {
-			{'infrastructure:galvanized_steel', '', 'infrastructure:galvanized_steel'}
-		}
-	})
-
--- Louver
-	minetest.register_craft({
-		output = '"infrastructure:drainage_channel_grating" 2',
-		recipe = {
-			{'infrastructure:galvanized_steel'},
-			{''},
-			{'infrastructure:galvanized_steel'}
-		}
-	})
-
--- Riffled sheet
-	minetest.register_craft({
-		output = '"infrastructure:riffled_sheet" 4',
-		recipe = {
-			{'infrastructure:galvanized_steel', 'infrastructure:fence_galvanized_steel'},
-			{'infrastructure:fence_galvanized_steel', 'infrastructure:galvanized_steel'}
-		}
-	})
-
--- Corrugated sheet
-	minetest.register_craft({
-		output = '"infrastructure:corrugated_sheet" 4',
-		recipe = {
-			{"","infrastructure:galvanized_steel",""},
-			{"infrastructure:galvanized_steel","","infrastructure:galvanized_steel"}
-		}
-	})
-
--- Louvers
-	minetest.register_craft({
-		output = "infrastructure:louver_opened",
-		recipe = {
-			{"infrastructure:fence_galvanized_steel","infrastructure:galvanized_steel","infrastructure:fence_galvanized_steel"},
-			{"","",""},
-			{"infrastructure:fence_galvanized_steel","infrastructure:galvanized_steel","infrastructure:fence_galvanized_steel"}
-		}
-	})
-
--- **************************************************************************************************** ADVANCED ITEMS
-
--- Raised pavement marker yellow/yellow
-	minetest.register_craft({
-		output = '"infrastructure:marker_yellow_yellow" 1',
-		recipe = {
-			{'wool:yellow', 'infrastructure:asphalt', 'wool:yellow'},
-			{'infrastructure:asphalt', 'infrastructure:asphalt', 'infrastructure:asphalt'}
-		}
-	})
-
--- Raised pavement marker red/yellow
-	minetest.register_craft({
-		output = '"infrastructure:marker_red_yellow" 1',
-		recipe = {
-			{'wool:yellow', 'infrastructure:asphalt', 'wool:red'},
-			{'infrastructure:asphalt', 'infrastructure:asphalt', 'infrastructure:asphalt'}
-		}
-	})
-
--- Retroreflective delineators
-	minetest.register_craft({
-		output = '"infrastructure:delineator" 1',
-		recipe = {
-			{'wool:yellow', 'infrastructure:concrete', 'wool:red'},
-			{'', 'infrastructure:concrete', ''},
-			{'', 'infrastructure:concrete', ''}
-		}
-	})
-
-	minetest.register_craft({
-		output = '"infrastructure:delineator_guardrail" 1',
-		recipe = {
-			{'wool:yellow', 'infrastructure:concrete', 'wool:red'},
-			{'', 'infrastructure:concrete', ''}
-		}
-	})
-
--- Wire rope safety barrier
-	minetest.register_craft({
-		output = '"infrastructure:wire_rope_safety_barrier" 1',
-		recipe = {
-			{'default:steel_ingot', '', 'default:steel_ingot'},
-			{'', 'default:steel_ingot', ''},
-			{'', 'default:steel_ingot', ''}
-		}
-	})
-
--- Cable barrier terminal
-	minetest.register_craft({
-		output = '"infrastructure:cable_barrier_terminal" 1',
-		recipe = {
-			{'default:steel_ingot', '', ''},
-			{'', 'default:steel_ingot', ''},
-			{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}
-		}
-	})
-
--- Corrugated guide rail
-	minetest.register_craft({
-		output = '"infrastructure:corrugated_guide_rail" 1',
-		recipe = {
-			{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
-			{'', 'default:steel_ingot', ''},
-			{'', 'default:steel_ingot', ''}
-		}
-	})
-
--- Energy absorbing terminal
-	minetest.register_craft({
-		output = '"infrastructure:energy_absorbing_terminal" 1',
-		recipe = {
-			{'', 'default:steel_ingot', ''},
-			{'default:steel_ingot', 'default:steel_ingot', ''},
-			{'', 'default:steel_ingot', ''}
-		}
-	})
-
-	minetest.register_craft({
-		output = '"infrastructure:energy_absorbing_terminal" 1',
-		recipe = {
-			{'infrastructure:energy_absorbing_terminal_inversed'}
-		}
-	})
-
-	minetest.register_craft({
-		output = '"infrastructure:energy_absorbing_terminal_inversed" 1',
-		recipe = {
-			{'infrastructure:energy_absorbing_terminal'}
-		}
-	})
-
--- Fitch barrel
-	minetest.register_craft({
-		output = '"infrastructure:fitch_barrel" 1',
-		recipe = {
-			{'wool:black', 'wool:black', 'wool:black'},
-			{'wool:yellow', 'default:sand', 'wool:yellow'},
-			{'wool:yellow', 'wool:yellow', 'wool:yellow'}
-		}
-	})
-
--- Crowd control barricade
-	minetest.register_craft({
-		output = '"infrastructure:crowd_control_barricade" 1',
-		recipe = {
-			{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
-			{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
-			{'default:steel_ingot', '', 'default:steel_ingot'}
-		}
-	})
-
-if ENABLE_EMERGENCY_PHONE then
--- Emergency phone
-	minetest.register_craft({
-		output = '"infrastructure:emergency_phone" 1',
-		recipe = {
-			{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
-			{'default:mese_crystal', 'default:apple', 'default:mese_crystal'},
-			{'default:mese_crystal', 'default:stick', 'default:mese_crystal'}
-		}
-	})
-	minetest.register_craft({
-		output = '"infrastructure:emergency_phone" 1',
-		recipe = {
-			{'default:mese', 'default:mese', 'default:mese'},
-			{'default:mese', 'default:apple', 'default:mese'},
-			{'default:mese', 'default:stick', 'default:mese'}
-		}
-	})
-end
-
--- Manhole cover
-	minetest.register_craft({
-		output = '"infrastructure:manhole_cover_closed" 1',
-		recipe = {
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'},
-			{'infrastructure:concrete', 'default:steel_ingot', 'infrastructure:concrete'},
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'}
-		}
-	})
-
--- Traffic lights for pedestrians
-	minetest.register_craft({
-		output = '"infrastructure:traffic_lights_pedestrians" 1',
-		recipe = {
-			{'', 'default:steel_ingot', ''},
-			{'default:steel_ingot', 'wool:red', 'default:steel_ingot'},
-			{'default:steel_ingot', 'wool:green', 'default:steel_ingot'}
-		}
-	})
-
--- Crosswalk warning light
-	minetest.register_craft({
-		output = '"infrastructure:crosswalk_warning_light" 1',
-		recipe = {
-			{'', 'default:steel_ingot', ''},
-			{'default:steel_ingot', 'wool:yellow', 'default:steel_ingot'},
-			{'', 'wool:green', ''}
-		}
-	})
-
--- Curve chevron
-	minetest.register_craft({
-		output = '"infrastructure:curve_chevron" 1',
-		recipe = {
-			{'wool:yellow', 'wool:black', 'wool:yellow'},
-			{'wool:black', 'wool:yellow', 'wool:yellow'},
-			{'wool:yellow', 'wool:black', 'wool:yellow'}
-		}
-	})
-
--- Crosswalk lighting
-	minetest.register_craft({
-		output = '"infrastructure:crosswalk_lighting" 1',
-		recipe = {
-			{'wool:white', 'wool:white', 'wool:white'},
-			{'', 'mesecons_torch:mesecon_torch_on', ''},
-			{'wool:white', 'wool:white', 'wool:white'}
-		}
-	})
-
--- Crosswalk safety sign
-	minetest.register_craft({
-		output = '"infrastructure:crosswalk_safety_sign" 1',
-		recipe = {
-			{'', 'wool:green', ''},
-			{'', 'wool:green', ''},
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'}
-		}
-	})
-
--- Road sign crosswalk
-	minetest.register_craft({
-		output = '"infrastructure:road_sign_crosswalk" 1',
-		recipe = {
-			{'wool:green', 'wool:green', 'wool:green'},
-			{'wool:green', 'wool:blue', 'wool:green'},
-			{'wool:green', 'wool:green', 'wool:green'}
-		}
-	})
-
--- Road sign right_of_way
-	minetest.register_craft({
-		output = '"infrastructure:road_sign_right_of_way" 1',
-		recipe = {
-			{"", 'wool:white', ""},
-			{'wool:white', 'wool:yellow', 'wool:white'},
-			{"", 'wool:white', ""}
-		}
-	})
-
--- Road sign stop
-	minetest.register_craft({
-		output = '"infrastructure:road_sign_stop" 1',
-		recipe = {
-			{'wool:red', 'wool:red', 'wool:red'},
-			{'wool:red', 'wool:white', 'wool:red'},
-			{'wool:red', 'wool:red', 'wool:red'}
-		}
-	})
-
--- Road sign yield
-	minetest.register_craft({
-		output = '"infrastructure:road_sign_yield" 1',
-		recipe = {
-			{'wool:orange', 'wool:orange', 'wool:orange'},
-			{'wool:red', 'wool:orange', 'wool:red'},
-			{'', 'wool:red', ''}
-		}
-	})
-
--- Automatic warning device
-	minetest.register_craft({
-		output = '"infrastructure:automatic_warning_device" 1',
-		recipe = {
-			{'wool:red', 'default:steel_ingot', 'wool:red'},
-			{'', 'default:steel_ingot', ''},
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'}
-		}
-	})
-
--- Boom barrier
-	minetest.register_craft({
-		output = '"infrastructure:boom_barrier_mechanism" 1',
-		recipe = {
-			{'default:steel_ingot', 'default:steel_ingot', ''},
-			{'', 'default:steel_ingot', ''},
-			{'infrastructure:concrete', 'infrastructure:concrete', 'infrastructure:concrete'}
-		}
-	})
-
-	minetest.register_craft({
-		output = '"infrastructure:boom_barrier_arm" 1',
-		recipe = {
-			{'', 'wool:red', ''},
-			{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}
-		}
-	})
-
--- Aircraft warning light
-	minetest.register_craft({
-		output = '"infrastructure:aircraft_warning_light" 1',
-		recipe = {
-			{'', 'wool:red', ''},
-			{'wool:red', 'default:torch', 'wool:red'},
-			{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}
-		}
-	})
-
--- Warning light
-	minetest.register_craft({
-		output = '"infrastructure:warning_light" 1',
-		recipe = {
-			{'wool:yellow', 'wool:yellow', ''},
-			{'wool:yellow', 'default:torch', ''},
-			{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}
-		}
-	})
-
--- Anti-dazzling panel
-	minetest.register_craft({
-		output = '"infrastructure:anti_dazzling_panel" 1',
-		recipe = {
-			{'wool:grey', 'wool:grey'},
-			{'wool:grey', 'wool:yellow'},
-			{'wool:grey', 'wool:grey'}
-		}
-	})
-
--- Traffic cone
-	minetest.register_craft({
-		output = '"infrastructure:traffic_cone" 1',
-		recipe = {
-			{'', 'wool:orange', ''},
-			{'wool:orange', '', 'wool:orange'},
-		}
-	})
-
--- Noise barrier
-	minetest.register_craft({
-		output = '"infrastructure:noise_barrier" 1',
-		recipe = {
-			{'default:steel_ingot', 'wool:green', 'default:steel_ingot'},
-			{'wool:green', 'default:steel_ingot', 'wool:green'},
-			{'default:steel_ingot', 'wool:green', 'default:steel_ingot'}
-		}
-	})
diff --git a/streets/infrastructure/depends.txt b/streets/infrastructure/depends.txt
deleted file mode 100644
index af1119b..0000000
--- a/streets/infrastructure/depends.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-default
-moreblocks
-mesecons
-wool
-streetsmod
-prefab
-digilines
-technic?
diff --git a/streets/infrastructure/init.lua b/streets/infrastructure/init.lua
deleted file mode 100644
index 76d94f3..0000000
--- a/streets/infrastructure/init.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-infrastructure = {}
-
--- Load settings
-dofile(minetest.get_modpath("infrastructure").."/settings.lua")
-
--- Register nodes
-dofile(minetest.get_modpath("infrastructure").."/nodes.lua")
--- Register special nodes
-dofile(minetest.get_modpath("infrastructure").."/nodes_extension.lua")
--- Register advanced devices
-dofile(minetest.get_modpath("infrastructure").."/advanced_road_signs.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_emergency_phone.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_traffic_lights_pedestrians.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_crosswalk_warning_light.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_lane_control_lights.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_curve_chevron.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_crosswalk_lighting.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_crosswalk_safety_sign.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_automatic_warning_device.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_boom_barrier.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_aircraft_warning_light.lua")
-dofile(minetest.get_modpath("infrastructure").."/advanced_warning_light.lua")
--- Register crafting recipes
-dofile(minetest.get_modpath("infrastructure").."/crafts.lua")
-
-print("Infrastructure mod loaded succesfully!")
diff --git a/streets/infrastructure/nodes.lua b/streets/infrastructure/nodes.lua
deleted file mode 100644
index e0455ee..0000000
--- a/streets/infrastructure/nodes.lua
+++ /dev/null
@@ -1,1473 +0,0 @@
--- **************************************************************************************************** MATERIALS
-
--- Asphalt block
-	minetest.register_alias("infrastructure:asphalt", "streets:asphalt")
-
--- Concrete block
-	minetest.register_alias("infrastructure:concrete", "technic:concrete")
-
--- Concrete fence
-	minetest.register_alias("infrastructure:fence_concrete", "prefab:concrete_fence")
-
--- Galvanized steel block
-	minetest.register_node("infrastructure:galvanized_steel", {
-		description = "Galvanized steel",
-		tiles = {"infrastructure_galvanized_steel.png"},
-		drawtype = "normal",
-		paramtype = "light",
-		groups = {cracky = 2},
-	})
-	minetest.register_alias("galvanized_steel", "infrastructure:galvanized_steel")
-
--- Galvanized steel fence
-	minetest.register_node("infrastructure:fence_galvanized_steel", {
-		description = "Galvanized steel fence",
-		drawtype = "fencelike",
-		tiles = {"infrastructure_galvanized_steel.png"},
-		paramtype = "light",
-		is_ground_content = true,
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/8, -1/2, -1/8, 1/8, 1/2, 1/8},
-		},
-		groups = {cracky = 2},
-	})
-
-
--- **************************************************************************************************** PRECAST CONCRETE
-
--- Concrete seperating wall
-	minetest.register_node("infrastructure:precast_concrete_seperating_wall", {
-		description = "Precast concrete seperating wall",
-		tiles = {"infrastructure_concrete.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-5/16, -1/2, -7/16, 5/16, -1/4, 7/16},
-				{-1/16, -1/4, -7/16, 1/16, 1/2, 7/16},
-				{-3/16, -1/2, -5/16, 3/16, 0, -1/4},
-				{-3/16, -1/2, 1/4, 3/16, 0, 5/16}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-5/16, -1/2, -7/16, 5/16, -1/4, 7/16},
-				{-1/16, -1/4, -7/16, 1/16, 1/2, 7/16},
-				{-3/16, -1/2, -5/16, 3/16, 0, -1/4},
-				{-3/16, -1/2, 1/4, 3/16, 0, 5/16}
-			}
-		}
-	})
-
--- Concrete cylinder
-	minetest.register_node("infrastructure:precast_concrete_cylinder", {
-		description = "Precast concrete cylinder",
-		tiles = {"infrastructure_concrete.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		walkable = false,
-		climbable = true,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{3/8, -1/2, -1/2, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, -3/8, 1/2, 1/2},
-				{-1/2, -1/2, 3/8, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, 1/2, 1/2, -3/8}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{3/8, -1/2, -1/2, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, -3/8, 1/2, 1/2},
-				{-1/2, -1/2, 3/8, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, 1/2, 1/2, -3/8}
-			}
-		}
-	})
-
--- Concrete grid paver
-	minetest.register_node("infrastructure:precast_concrete_grid_paver", {
-		description = "Precast concrete grid paver",
-		tiles = {
-			"infrastructure_grid_paver_top.png",
-			"infrastructure_grid_paver_bottom.png",
-			"infrastructure_concrete.png",
-			"infrastructure_concrete.png",
-			"infrastructure_concrete.png",
-			"infrastructure_concrete.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, -1/2, 1/2, -1/2, 1/2},
-				{-1/2, -1/2 + 1/128, -1/2, 1/2, -1/2 + 1/128, 1/2},
-				{-1/2, -1/2 + 2/128, -1/2, 1/2, -1/2 + 2/128, 1/2},
-				{-1/2, -1/2 + 3/128, -1/2, 1/2, -1/2 + 3/128, 1/2},
-				{-1/2, -1/2 + 4/128, -1/2, 1/2, -1/2 + 4/128, 1/2},
-				{-1/2, -1/2 + 5/128, -1/2, 1/2, -1/2 + 5/128, 1/2},
-				{-1/2, -1/2 + 6/128, -1/2, 1/2, -1/2 + 6/128, 1/2},
-				{-1/2, -1/2 + 7/128, -1/2, 1/2, -1/2 + 7/128, 1/2},
-				{-1/2, -1/2 + 8/128, -1/2, 1/2, -1/2 + 8/128, 1/2},
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 1/2, -1/2 + 8/128, 1/2}
-		},
-
-		after_place_node = function(pos)
-			pos.y = pos.y - 1
-			local node = minetest.get_node(pos)
-			if (node.name == "default:dirt_with_grass") then
-				pos.y = pos.y + 1
-				local node = minetest.get_node(pos)
-				node.name = "infrastructure:precast_concrete_grid_paver_with_grass"
-				minetest.swap_node(pos, node)
-			end
-		end
-	})
-
-	minetest.register_node("infrastructure:precast_concrete_grid_paver_with_grass", {
-		description = "Precast concrete grid paver with grass",
-		tiles = {
-			"infrastructure_grid_paver_top.png",
-			"infrastructure_grid_paver_bottom.png",
-			"infrastructure_grid_paver_grass.png",
-			"infrastructure_grid_paver_grass.png",
-			"infrastructure_grid_paver_grass.png",
-			"infrastructure_grid_paver_grass.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2,not_in_creative_inventory = 1},
-		drop = "infrastructure:precast_concrete_grid_paver",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, -1/2, 1/2, -1/2, 1/2},
-				{-1/2, -1/2 + 1/128, -1/2, 1/2, -1/2 + 1/128, 1/2},
-				{-1/2, -1/2 + 2/128, -1/2, 1/2, -1/2 + 2/128, 1/2},
-				{-1/2, -1/2 + 3/128, -1/2, 1/2, -1/2 + 3/128, 1/2},
-				{-1/2, -1/2 + 4/128, -1/2, 1/2, -1/2 + 4/128, 1/2},
-				{-1/2, -1/2 + 5/128, -1/2, 1/2, -1/2 + 5/128, 1/2},
-				{-1/2, -1/2 + 6/128, -1/2, 1/2, -1/2 + 6/128, 1/2},
-				{-1/2, -1/2 + 7/128, -1/2, 1/2, -1/2 + 7/128, 1/2},
-				{-1/2, -1/2 + 8/128, -1/2, 1/2, -1/2 + 8/128, 1/2},
-
-				{-3/8, -1/2, 1/4, -1/8, 0, 1/4},
-				{1/8, -1/2, 1/4, 3/8, 0, 1/4},
-
-				{-1/8, -1/2, 0, 1/8, 0, 0},
-
-				{-3/8, -1/2, -1/4, -1/8, 0, -1/4},
-				{1/8, -1/2, -1/4, 3/8, 0, -1/4},
-
-				{1/4, -1/2, -3/8, 1/4, 0, -1/8},
-				{1/4, -1/2, 1/8, 1/4, 0, 3/8},
-
-				{0, -1/2, -1/8, 0, 0, 1/8},
-
-				{-1/4, -1/2, -3/8, -1/4, 0, -1/8},
-				{-1/4, -1/2, 1/8, -1/4, 0, 3/8}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 1/2, -1/2 + 8/128, 1/2}
-		},
-
-		on_punch = function(pos, node)
-			local node = minetest.get_node(pos)
-			node.name = "infrastructure:precast_concrete_grid_paver"
-			minetest.swap_node(pos, node)
-		end
-	})
-
--- **************************************************************************************************** STEEL STRUCTURES
-
--- Truss
-	minetest.register_node("infrastructure:truss", {
-		description = "Truss",
-		tiles = {"infrastructure_truss.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{1/2, -1/2, -1/2, 1/2, 1/2, 1/2},
-				{-1/2, 1/2, -1/2, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, 1/2, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, -1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, 1/2, -1/2, 1/2},
-				{-1/2, -1/2, -1/2, 1/2, 1/2, -1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 1/2, 1/2, 1/2}
-		}
-	})
-
--- Wire netting
-	minetest.register_node("infrastructure:wire_netting", {
-		description = "Wire netting",
-		tiles = {"infrastructure_wire_netting.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, 0, 1/2, 1/2, 0}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/8, 1/2, 1/2, 1/8}
-		}
-	})
-
--- Razor wire
-	minetest.register_node("infrastructure:razor_wire", {
-		description = "Razor wire",
-		tiles = {"infrastructure_razor_wire.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, 1/2, -1/2, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, 1/2, -1/2, 1/2},
-				{-1/2, -1/2, 1/2, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, -1/2, 1/2, 1/2, -1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 1/2, 1/2, 1/2}
-		},
-
-		walkable = false,
-		damage_per_second = 8
-	})
-
--- Drainage channel grating
-	minetest.register_node("infrastructure:drainage_channel_grating", {
-		description = "Truss",
-		tiles = {
-			"infrastructure_drainage_channel_grating.png",
-			"infrastructure_drainage_channel_grating.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 0, -3/8, 1/2}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 0, -3/8, 1/2}
-		}
-	})
-
--- Louver
-	minetest.register_node("infrastructure:louver_opened", {
-		description = "Louver",
-		tiles = {"infrastructure_galvanized_steel.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, 7/16, 0, 1/2, 1/2, 1/2},
-				{-1/2, -1/16, 0, 1/2, 0, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, 7/16, 0, 1/2, 1/2, 1/2},
-				{-1/2, -1/16, 0, 1/2, 0, 1/2}
-			}
-		},
-
-		on_punch = function(pos, node)
-			minetest.swap_node(pos, {name = "infrastructure:louver_closed", param2 = node.param2})
-		end
-	})
-
-	minetest.register_node("infrastructure:louver_closed", {
-		tiles = {"infrastructure_galvanized_steel.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		drop = "infrastructure:louver_opened",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, 1/16, 7/16, 1/2, 1/2, 1/2},
-				{-1/2, -7/16, 7/16, 1/2, 0, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, 1/16, 7/16, 1/2, 1/2, 1/2},
-				{-1/2, -7/16, 7/16, 1/2, 0, 1/2}
-			}
-		},
-
-		on_punch = function(pos, node)
-			minetest.swap_node(pos, {name = "infrastructure:louver_opened", param2 = node.param2})
-		end
-	})
-
-	minetest.register_alias("infrastructure:louver", "infrastructure:louver_opened")
-
--- Riffled sheet
-	minetest.register_node("infrastructure:riffled_sheet", {
-		description = "Riffled sheet",
-		tiles = {"infrastructure_riffled_sheet.png"},
-		inventory_image = "infrastructure_riffled_sheet.png",
-		wield_image = "infrastructure_riffled_sheet.png",
-		drawtype = "nodebox",
-		paramtype = "light",
-		groups = {cracky = 2, oddly_breakable_by_hand = 1},
-		node_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 1/2, -1/2 + 0.001, 1/2}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/4, -1/2, 1/2, -1/2 + 0.01, 1/2}
-		}
-	})
-
--- Corrugated sheet
-	minetest.register_node("infrastructure:corrugated_sheet", {
-		description = "corrugated sheet",
-		tiles = {"infrastructure_corrugated_sheet.png"},
-		inventory_image = "infrastructure_corrugated_sheet.png",
-		wield_image = "infrastructure_corrugated_sheet.png",
-		drawtype = "raillike",
-		paramtype = "light",
-		groups = {cracky = 2, oddly_breakable_by_hand = 1},
-	})
-
--- **************************************************************************************************** ADVANCED ITEMS
-
--- Displacement
-	function displacement(pos, placer)
-		local displaced_node = minetest.get_node(pos)
-		local fdir = minetest.dir_to_facedir(placer:get_look_dir())
-		pos.y = pos.y - 1
-		local node = minetest.get_node(pos)
-
-		if ((string.find(node.name, "_three_quarter") ~= nil) or (string.find(node.name, "_displacement_1") ~= nil)) then
-			pos.y = pos.y + 1
-			minetest.set_node(pos, {name = displaced_node.name.."_displacement_1", param2 = fdir})
-		elseif (((string.find(node.name, "slab_") ~= nil) and (string.find(node.name, "_quarter") == nil)) or (string.find(node.name, "_displacement_2") ~= nil)) then
-			pos.y = pos.y + 1
-			minetest.set_node(pos, {name = displaced_node.name.."_displacement_2", param2 = fdir})
-		elseif (((string.find(node.name, "_quarter") ~= nil) and (string.find(node.name, "_three_quarter") == nil)) or (string.find(node.name, "_displacement_3") ~= nil)) then
-			pos.y = pos.y + 1
-			minetest.set_node(pos, {name = displaced_node.name.."_displacement_3", param2 = fdir})
-		end
-	end
-
--- Raised pavement marker yellow/yellow
-	minetest.register_node("infrastructure:marker_yellow_yellow", {
-		description = "Raised pavement marker with yellow & yellow retroreflectors",
-		tiles = {
-			"infrastructure_marker_top_yellow_yellow.png",
-			"infrastructure_marker_bottom_side.png",
-			"infrastructure_marker_bottom_side.png",
-			"infrastructure_marker_bottom_side.png",
-			"infrastructure_marker_side_yellow.png",
-			"infrastructure_marker_side_yellow.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3},
-		walkable = false,
-		light_source = MARKER_LIGHT_RANGE,
-		sunlight_propagates = true,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, -1/16, -3/8, 1/8},
-				{-1/16, -1/2, -1/8, 1/16, -7/16, 1/8},
-				{1/16, -1/2, -1/8, 1/8, -3/8, 1/8},
-				{-1/16, -7/16, -1/16, 1/16, -3/8, 1/16}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, -1/16, -3/8, 1/8},
-				{-1/16, -1/2, -1/8, 1/16, -7/16, 1/8},
-				{1/16, -1/2, -1/8, 1/8, -3/8, 1/8},
-				{-1/16, -7/16, -1/16, 1/16, -3/8, 1/16}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:marker_yellow_yellow_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_marker_top_yellow_yellow.png",
-				"infrastructure_marker_bottom_side.png",
-				"infrastructure_marker_bottom_side.png",
-				"infrastructure_marker_bottom_side.png",
-				"infrastructure_marker_side_yellow.png",
-				"infrastructure_marker_side_yellow.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 3, not_in_creative_inventory = 1},
-			walkable = false,
-			light_source = MARKER_LIGHT_RANGE,
-			sunlight_propagates = true,
-			drop = "infrastructure:marker_yellow_yellow",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, -1/16, -3/8 - i/4, 1/8},
-					{-1/16, -1/2 - i/4, -1/8, 1/16, -7/16 - i/4, 1/8},
-					{1/16, -1/2 - i/4, -1/8, 1/8, -3/8 - i/4, 1/8},
-					{-1/16, -7/16 - i/4, -1/16, 1/16, -3/8 - i/4, 1/16}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, -1/16, -3/8 - i/4, 1/8},
-					{-1/16, -1/2 - i/4, -1/8, 1/16, -7/16 - i/4, 1/8},
-					{1/16, -1/2 - i/4, -1/8, 1/8, -3/8 - i/4, 1/8},
-					{-1/16, -7/16 - i/4, -1/16, 1/16, -3/8 - i/4, 1/16}
-				}
-			}
-		})
-	end
-
--- Raised pavement marker red/yellow
-	minetest.register_node("infrastructure:marker_red_yellow", {
-		description = "Raised pavement marker with red & yellow retroreflectors",
-		tiles = {
-			"infrastructure_marker_top_red_yellow.png",
-			"infrastructure_marker_bottom_side.png",
-			"infrastructure_marker_bottom_side.png",
-			"infrastructure_marker_bottom_side.png",
-			"infrastructure_marker_side_yellow.png",
-			"infrastructure_marker_side_red.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3},
-		walkable = false,
-		light_source = MARKER_LIGHT_RANGE,
-		sunlight_propagates = true,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, -1/16, -3/8, 1/8},
-				{-1/16, -1/2, -1/8, 1/16, -7/16, 1/8},
-				{1/16, -1/2, -1/8, 1/8, -3/8, 1/8},
-				{-1/16, -7/16, -1/16, 1/16, -3/8, 1/16}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, -1/16, -3/8, 1/8},
-				{-1/16, -1/2, -1/8, 1/16, -7/16, 1/8},
-				{1/16, -1/2, -1/8, 1/8, -3/8, 1/8},
-				{-1/16, -7/16, -1/16, 1/16, -3/8, 1/16}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:marker_red_yellow_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_marker_top_red_yellow.png",
-				"infrastructure_marker_bottom_side.png",
-				"infrastructure_marker_bottom_side.png",
-				"infrastructure_marker_bottom_side.png",
-				"infrastructure_marker_side_yellow.png",
-				"infrastructure_marker_side_red.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 3, not_in_creative_inventory = 1},
-			walkable = false,
-			light_source = MARKER_LIGHT_RANGE,
-			sunlight_propagates = true,
-			drop = "infrastructure:marker_red_yellow",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, -1/16, -3/8 - i/4, 1/8},
-					{-1/16, -1/2 - i/4, -1/8, 1/16, -7/16 - i/4, 1/8},
-					{1/16, -1/2 - i/4, -1/8, 1/8, -3/8 - i/4, 1/8},
-					{-1/16, -7/16 - i/4, -1/16, 1/16, -3/8 - i/4, 1/16}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, -1/16, -3/8 - i/4, 1/8},
-					{-1/16, -1/2 - i/4, -1/8, 1/16, -7/16 - i/4, 1/8},
-					{1/16, -1/2 - i/4, -1/8, 1/8, -3/8 - i/4, 1/8},
-					{-1/16, -7/16 - i/4, -1/16, 1/16, -3/8 - i/4, 1/16}
-				}
-			}
-		})
-	end
-
--- Retroreflective delineators
-	minetest.register_node("infrastructure:delineator", {
-		description = "Retroreflective delineator",
-		tiles = {
-			"infrastructure_concrete.png",
-			"infrastructure_concrete.png",
-			"infrastructure_delineator_wrapper_right.png",
-			"infrastructure_delineator_wrapper_left.png",
-			"infrastructure_delineator_retroreflector_yellow.png",
-			"infrastructure_delineator_retroreflector_red.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3},
-		light_source = DELINEATOR_LIGHT_RANGE,
-		sunlight_propagates = true,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, 1/8, 1/2, -1/16},
-				{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-				{-1/8, -1/2, 1/16, 1/8, 1/2, 1/8}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, 1/8, 1/2, -1/16},
-				{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-				{-1/8, -1/2, 1/16, 1/8, 1/2, 1/8}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	minetest.register_node("infrastructure:delineator_guardrail", {
-		description = "Retroreflective delineator for guardrail",
-		tiles = {
-			"infrastructure_concrete.png",
-			"infrastructure_concrete.png",
-			"infrastructure_delineator_wrapper_right.png",
-			"infrastructure_delineator_wrapper_left.png",
-			"[combine:32x32:0,12=infrastructure_delineator_retroreflector_yellow.png:0,-20=infrastructure_delineator_retroreflector_yellow.png",
-			"[combine:32x32:0,12=infrastructure_delineator_retroreflector_red.png:0,-20=infrastructure_delineator_retroreflector_red.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 3},
-		light_source = DELINEATOR_LIGHT_RANGE,
-		sunlight_propagates = true,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -3/8, -1/32, 1/8, 1/8, 1/32},
-				{1/8, -5/8, -1/16, 3/16, -1/4, 1/16}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -3/8, -1/32, 1/8, 1/8, 1/32},
-				{1/8, -5/8, -1/16, 3/16, -1/4, 1/16}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:delineator_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_concrete.png",
-				"infrastructure_concrete.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_delineator_wrapper_right.png:0,"..tostring(i * 8 - 32).."=infrastructure_delineator_wrapper_right.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_delineator_wrapper_left.png:0,"..tostring(i * 8 - 32).."=infrastructure_delineator_wrapper_left.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_delineator_retroreflector_yellow.png:0,"..tostring(i * 8 - 32).."=infrastructure_delineator_retroreflector_yellow.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_delineator_retroreflector_red.png:0,"..tostring(i * 8 - 32).."=infrastructure_delineator_retroreflector_red.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 3, not_in_creative_inventory = 1},
-			light_source = DELINEATOR_LIGHT_RANGE,
-			sunlight_propagates = true,
-			drop = "infrastructure:delineator",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, 1/8, 1/2 - i/4, -1/16},
-					{-1/16, -1/2 - i/4, -1/16, 1/16, 1/2 - i/4, 1/16},
-					{-1/8, -1/2 - i/4, 1/16, 1/8, 1/2 - i/4, 1/8}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, 1/8, 1/2 - i/4, -1/16},
-					{-1/16, -1/2 - i/4, -1/16, 1/16, 1/2 - i/4, 1/16},
-					{-1/8, -1/2 - i/4, 1/16, 1/8, 1/2 - i/4, 1/8}
-				}
-			}
-		})
-
-		minetest.register_node("infrastructure:delineator_guardrail_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_concrete.png",
-				"infrastructure_concrete.png",
-				"[combine:32x32:0,"..tostring(12 + i * 8).."=infrastructure_delineator_wrapper_right.png:0,"..tostring(i * 8 - 20).."=infrastructure_delineator_wrapper_right.png",
-				"[combine:32x32:0,"..tostring(12 + i * 8).."=infrastructure_delineator_wrapper_left.png:0,"..tostring(i * 8 - 20).."=infrastructure_delineator_wrapper_left.png",
-				"[combine:32x32:0,"..tostring(12 + i * 8).."=infrastructure_delineator_retroreflector_yellow.png:0,"..tostring(i * 8 - 20).."=infrastructure_delineator_retroreflector_yellow.png",
-				"[combine:32x32:0,"..tostring(12 + i * 8).."=infrastructure_delineator_retroreflector_red.png:0,"..tostring(i * 8 - 20).."=infrastructure_delineator_retroreflector_red.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 3, not_in_creative_inventory = 1},
-			light_source = DELINEATOR_LIGHT_RANGE,
-			sunlight_propagates = true,
-			drop = "infrastructure:delineator_guardrail",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -3/8 - i/4, -1/32, 1/8, 1/8 - i/4, 1/32},
-					{1/8, -5/8 - i/4, -1/16, 3/16, -1/4 - i/4, 1/16}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -3/8 - i/4, -1/32, 1/8, 1/8 - i/4, 1/32},
-					{1/8, -5/8 - i/4, -1/16, 3/16, -1/4 - i/4, 1/16}
-				}
-			}
-		})
-	end
-
--- Wire rope safety barrier
-	minetest.register_node("infrastructure:wire_rope_safety_barrier", {
-		description = "Wire rope safety barrier",
-		tiles = {
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_wire_rope_safety_barrier_back.png",
-			"infrastructure_wire_rope_safety_barrier_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = 1,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/16, 1/8, -1/4, 1/16},
-				{-1/8, -1/2, -1/16, -1/16, -3/16, 1/16},
-				{1/16, -1/2, -1/16, 1/8, 1/16, 1/16},
-				{-1/8, -1/8, -1/16, 1/8, 0, 1/16},
-				{-1/8, -1/8, -1/16, -1/16, 1/2, 1/16},
-				{-1/8, 1/8, -1/16, 1/8, 1/4, 1/16},
-				{1/16, 1/8, -1/16, 1/8, 1/2, 1/16},
-
-				{-1/32, 1/4, -1/2, 1/32, 5/16, 1/2},
-				{-1/32, 0, -1/2, 1/32, 1/16, 1/2},
-				{-1/32, -1/4, -1/2, 1/32, -3/16, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/16, 1/8, 1/2, 1/16},
-
-				{-1/32, 1/4, -1/2, 1/32, 5/16, 1/2},
-				{-1/32, 0, -1/2, 1/32, 1/16, 1/2},
-				{-1/32, -1/4, -1/2, 1/32, -3/16, 1/2}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:wire_rope_safety_barrier_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_wire_rope_safety_barrier_back.png:0,"..tostring(i * 8 - 32).."=infrastructure_wire_rope_safety_barrier_back.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_wire_rope_safety_barrier_front.png:0,"..tostring(i * 8 - 32).."=infrastructure_wire_rope_safety_barrier_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = 1,
-			drop = "infrastructure:wire_rope_safety_barrier",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/16, 1/8, -1/4 - i/4, 1/16},
-					{-1/8, -1/2 - i/4, -1/16, -1/16, -3/16 - i/4, 1/16},
-					{1/16, -1/2 - i/4, -1/16, 1/8, 1/16 - i/4, 1/16},
-					{-1/8, -1/8 - i/4, -1/16, 1/8, 0 - i/4, 1/16},
-					{-1/8, -1/8 - i/4, -1/16, -1/16, 1/2 - i/4, 1/16},
-					{-1/8, 1/8 - i/4, -1/16, 1/8, 1/4 - i/4, 1/16},
-					{1/16, 1/8 - i/4, -1/16, 1/8, 1/2 - i/4, 1/16},
-
-					{-1/32, 1/4 - i/4, -1/2, 1/32, 5/16 - i/4, 1/2},
-					{-1/32, 0 - i/4, -1/2, 1/32, 1/16 - i/4, 1/2},
-					{-1/32, -1/4 - i/4, -1/2, 1/32, -3/16 - i/4, 1/2}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/16, 1/8, 1/2 - i/4, 1/16},
-
-					{-1/32, 1/4 - i/4, -1/2, 1/32, 5/16 - i/4, 1/2},
-					{-1/32, 0 - i/4, -1/2, 1/32, 1/16 - i/4, 1/2},
-					{-1/32, -1/4 - i/4, -1/2, 1/32, -3/16 - i/4, 1/2}
-				}
-			}
-		})
-	end
-
--- Cable barrier terminal
-	minetest.register_node("infrastructure:cable_barrier_terminal", {
-		description = "Cable barrier terminal",
-		tiles = {
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_cable_barrier_terminal_back.png",
-			"infrastructure_cable_barrier_terminal_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = 1,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2},
-				{-1/4, -3/8, -1/4, 1/4, 1/2, -1/8},
-				{-1/4, -3/8, -1/8, -3/16, 0, 1/8},
-				{3/16, -3/8, -1/8, 1/4, 0, 1/8},
-
-				{-1/16, 7/32, -3/8, 1/16, 11/32, 1/4},
-				{-1/16, -1/32, -3/8, 1/16, 3/32, 1/4},
-				{-1/16, -9/32, -3/8, 1/16, -5/32, 1/4},
-
-				{-1/32, 1/4, 0, 1/32, 5/16, 1/2},
-				{-1/32, 0, 0, 1/32, 1/16, 1/2},
-				{-1/32, -1/4, 0, 1/32, -3/16, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -1/2, -1/2, 1/4, -3/8, 1/2},
-				{-1/4, -3/8, -1/4, 1/4, 1/2, -1/8},
-				{-1/4, -3/8, -1/8, -3/16, 0, 1/8},
-				{3/16, -3/8, -1/8, 1/4, 0, 1/8},
-
-				{-1/16, 7/32, -3/8, 1/16, 11/32, 1/4},
-				{-1/16, -1/32, -3/8, 1/16, 3/32, 1/4},
-				{-1/16, -9/32, -3/8, 1/16, -5/32, 1/4},
-
-				{-1/32, 1/4, 0, 1/32, 5/16, 1/2},
-				{-1/32, 0, 0, 1/32, 1/16, 1/2},
-				{-1/32, -1/4, 0, 1/32, -3/16, 1/2}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:cable_barrier_terminal_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_cable_barrier_terminal_back.png:0,"..tostring(i * 8 - 32).."=infrastructure_cable_barrier_terminal_back.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_cable_barrier_terminal_front.png:0,"..tostring(i * 8 - 32).."=infrastructure_cable_barrier_terminal_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = 1,
-			drop = "infrastructure:cable_barrier_terminal",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/4, -1/2 - i/4, -1/2, 1/4, -3/8 - i/4, 1/2},
-					{-1/4, -3/8 - i/4, -1/4, 1/4, 1/2 - i/4, -1/8},
-					{-1/4, -3/8 - i/4, -1/8, -3/16, 0 - i/4, 1/8},
-					{3/16, -3/8 - i/4, -1/8, 1/4, 0 - i/4, 1/8},
-
-					{-1/16, 7/32 - i/4, -3/8, 1/16, 11/32 - i/4, 1/4},
-					{-1/16, -1/32 - i/4, -3/8, 1/16, 3/32 - i/4, 1/4},
-					{-1/16, -9/32 - i/4, -3/8, 1/16, -5/32 - i/4, 1/4},
-
-					{-1/32, 1/4 - i/4, 0, 1/32, 5/16 - i/4, 1/2},
-					{-1/32, 0 - i/4, 0, 1/32, 1/16 - i/4, 1/2},
-					{-1/32, -1/4 - i/4, 0, 1/32, -3/16 - i/4, 1/2}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/4, -1/2 - i/4, -1/2, 1/4, -3/8 - i/4, 1/2},
-					{-1/4, -3/8 - i/4, -1/4, 1/4, 1/2 - i/4, -1/8},
-					{-1/4, -3/8 - i/4, -1/8, -3/16, 0 - i/4, 1/8},
-					{3/16, -3/8 - i/4, -1/8, 1/4, 0 - i/4, 1/8},
-
-					{-1/16, 7/32 - i/4, -3/8, 1/16, 11/32 - i/4, 1/4},
-					{-1/16, -1/32 - i/4, -3/8, 1/16, 3/32 - i/4, 1/4},
-					{-1/16, -9/32 - i/4, -3/8, 1/16, -5/32 - i/4, 1/4},
-
-					{-1/32, 1/4 - i/4, 0, 1/32, 5/16 - i/4, 1/2},
-					{-1/32, 0 - i/4, 0, 1/32, 1/16 - i/4, 1/2},
-					{-1/32, -1/4 - i/4, 0, 1/32, -3/16 - i/4, 1/2}
-				}
-			}
-		})
-	end
-
--- Corrugated guide rail
-	minetest.register_node("infrastructure:corrugated_guide_rail", {
-		description = "Corrugated guide rail",
-		tiles = {
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_corrugated_guide_rail_side.png",
-			"infrastructure_corrugated_guide_rail_side.png",
-			"infrastructure_corrugated_guide_rail_back.png",
-			"infrastructure_corrugated_guide_rail_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = 1,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, 1/8, 1/2, -1/16},
-				{-1/16, -1/2, -1/16, 1/16, 1/2, 1/16},
-				{-1/8, -1/2, 1/16, 1/8, 1/2, 1/8},
-
-				{-1/2, 1/4, -1/4, 1/2, 3/8, -1/8},
-				{-1/2, 1/8, -3/8, 1/2, 1/4, -1/4},
-				{-1/2, 0, -1/4, 1/2, 1/8, -1/8},
-				{-1/2, -1/8, -3/8, 1/2, 0, -1/4},
-				{-1/2, -1/4, -1/4, 1/2, -1/8, -1/8}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/8, -1/2, -1/8, 1/8, 1/2, 1/8},
-
-				{-1/2, 1/4, -1/4, 1/2, 3/8, -1/8},
-				{-1/2, 1/8, -3/8, 1/2, 1/4, -1/4},
-				{-1/2, 0, -1/4, 1/2, 1/8, -1/8},
-				{-1/2, -1/8, -3/8, 1/2, 0, -1/4},
-				{-1/2, -1/4, -1/4, 1/2, -1/8, -1/8}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:corrugated_guide_rail_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_corrugated_guide_rail_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_corrugated_guide_rail_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_corrugated_guide_rail_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_corrugated_guide_rail_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_corrugated_guide_rail_back.png:0,"..tostring(i * 8 - 32).."=infrastructure_corrugated_guide_rail_back.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_corrugated_guide_rail_front.png:0,"..tostring(i * 8 - 32).."=infrastructure_corrugated_guide_rail_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = 1,
-			drop = "infrastructure:corrugated_guide_rail",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, 1/8, 1/2 - i/4, -1/16},
-					{-1/16, -1/2 - i/4, -1/16, 1/16, 1/2 - i/4, 1/16},
-					{-1/8, -1/2 - i/4, 1/16, 1/8, 1/2 - i/4, 1/8},
-
-					{-1/2, 1/4 - i/4, -1/4, 1/2, 3/8 - i/4, -1/8},
-					{-1/2, 1/8 - i/4, -3/8, 1/2, 1/4 - i/4, -1/4},
-					{-1/2, 0 - i/4, -1/4, 1/2, 1/8 - i/4, -1/8},
-					{-1/2, -1/8 - i/4, -3/8, 1/2, 0 - i/4, -1/4},
-					{-1/2, -1/4 - i/4, -1/4, 1/2, -1/8 - i/4, -1/8}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/8, -1/2 - i/4, -1/8, 1/8, 1/2 - i/4, 1/8},
-
-					{-1/2, 1/4 - i/4, -1/4, 1/2, 3/8 - i/4, -1/8},
-					{-1/2, 1/8 - i/4, -3/8, 1/2, 1/4 - i/4, -1/4},
-					{-1/2, 0 - i/4, -1/4, 1/2, 1/8 - i/4, -1/8},
-					{-1/2, -1/8 - i/4, -3/8, 1/2, 0 - i/4, -1/4},
-					{-1/2, -1/4 - i/4, -1/4, 1/2, -1/8 - i/4, -1/8}
-				}
-			}
-		})
-	end
-
--- Energy absorbing terminal
-	minetest.register_node("infrastructure:energy_absorbing_terminal", {
-		description = "Energy absorbing terminal",
-		tiles = {
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_energy_absorbing_terminal_back.png",
-			"infrastructure_energy_absorbing_terminal_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/4, 1/8, 0, 1/2, 1/4},
-				{-3/8, -1/4, 1/4, -1/8, 3/8, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/4, 1/8, 0, 1/2, 1/4},
-				{-3/8, -1/4, 1/4, -1/8, 3/8, 1/2}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	minetest.register_node("infrastructure:energy_absorbing_terminal_inversed", {
-		description = "Energy absorbing terminal inversed",
-		tiles = {
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_energy_absorbing_terminal_back.png",
-			"infrastructure_energy_absorbing_terminal_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{0, -1/4, 1/8, 1/2, 1/2, 1/4},
-				{1/8, -1/4, 1/4, 3/8, 3/8, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{0, -1/4, 1/8, 1/2, 1/2, 1/4},
-				{1/8, -1/4, 1/4, 3/8, 3/8, 1/2}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:energy_absorbing_terminal_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_energy_absorbing_terminal_back.png:0,"..tostring(i * 8 - 32).."=infrastructure_energy_absorbing_terminal_back.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_energy_absorbing_terminal_front.png:0,"..tostring(i * 8 - 32).."=infrastructure_energy_absorbing_terminal_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-			drop = "infrastructure:energy_absorbing_terminal",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/4 - i/4, 1/8, 0, 1/2 - i/4, 1/4},
-					{-3/8, -1/4 - i/4, 1/4, -1/8, 3/8 - i/4, 1/2}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/4 - i/4, 1/8, 0, 1/2 - i/4, 1/4},
-					{-3/8, -1/4 - i/4, 1/4, -1/8, 3/8 - i/4, 1/2}
-				}
-			}
-		})
-
-		minetest.register_node("infrastructure:energy_absorbing_terminal_inversed_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_galvanized_steel.png:0,"..tostring(i * 8 - 32).."=infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_energy_absorbing_terminal_back.png:0,"..tostring(i * 8 - 32).."=infrastructure_energy_absorbing_terminal_back.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_energy_absorbing_terminal_front.png:0,"..tostring(i * 8 - 32).."=infrastructure_energy_absorbing_terminal_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-			drop = "infrastructure:energy_absorbing_terminal_inversed",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{0, -1/4 - i/4, 1/8, 1/2, 1/2 - i/4, 1/4},
-					{1/8, -1/4 - i/4, 1/4, 3/8, 3/8 - i/4, 1/2}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{0, -1/4 - i/4, 1/8, 1/2, 1/2 - i/4, 1/4},
-					{1/8, -1/4 - i/4, 1/4, 3/8, 3/8 - i/4, 1/2}
-				}
-			}
-		})
-	end
-
--- Fitch barrel
-	minetest.register_node("infrastructure:fitch_barrel", {
-		description = "Fitch barrel",
-		tiles = {
-			"infrastructure_fitch_barrel_top.png",
-			"infrastructure_fitch_barrel_bottom.png",
-			"infrastructure_fitch_barrel_side.png",
-			"infrastructure_fitch_barrel_side.png",
-			"infrastructure_fitch_barrel_side.png",
-			"infrastructure_fitch_barrel_side.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		groups = {cracky = 2},
-		light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-		node_box = {
-			type = "fixed",
-			fixed = {-3/8, -1/2, -3/8, 3/8, 1/2, 3/8}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-3/8, -1/2, -3/8, 3/8, 1/2, 3/8}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:fitch_barrel_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_fitch_barrel_top.png",
-				"infrastructure_fitch_barrel_bottom.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_fitch_barrel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_fitch_barrel_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_fitch_barrel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_fitch_barrel_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_fitch_barrel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_fitch_barrel_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_fitch_barrel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_fitch_barrel_side.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-			drop = "infrastructure:fitch_barrel",
-			node_box = {
-				type = "fixed",
-				fixed = {-3/8, -1/2 - i/4, -3/8, 3/8, 1/2 - i/4, 3/8}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {-3/8, -1/2 - i/4, -3/8, 3/8, 1/2 - i/4, 3/8}
-			}
-		})
-	end
-
--- Crowd control barricade
-	minetest.register_node("infrastructure:crowd_control_barricade", {
-		description = "Crowd control barricade",
-		tiles = {
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_crowd_control_barricade_back.png",
-			"infrastructure_crowd_control_barricade_front.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = 1,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/4, 0, 1/2, 1/2, 0},
-
-				{-7/16, -1/2, -1/32, -3/8, 1/8, 1/32},
-				{3/8, -1/2, -1/32, 7/16, 1/8, 1/32},
-
-				{-7/16, -1/2, -1/4, -3/8, -7/16, 1/4},
-				{3/8, -1/2, -1/4, 7/16, -7/16, 1/4}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/4, 0, 1/2, 1/2, 0},
-
-				{-7/16, -1/2, -1/32, -3/8, 1/8, 1/32},
-				{3/8, -1/2, -1/32, 7/16, 1/8, 1/32},
-
-				{-7/16, -1/2, -1/4, -3/8, -7/16, 1/4},
-				{3/8, -1/2, -1/4, 7/16, -7/16, 1/4}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:crowd_control_barricade_"..tostring(i), {
-			tiles = {
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"infrastructure_galvanized_steel.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_crowd_control_barricade_back.png:0,"..tostring(i * 8 - 32).."=infrastructure_crowd_control_barricade_back.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_crowd_control_barricade_front.png:0,"..tostring(i * 8 - 32).."=infrastructure_crowd_control_barricade_front.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = 1,
-			drop = "infrastructure:crowd_control_barricade",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/4 - i/4, 0, 1/2, 1/2 - i/4, 0},
-
-					{-7/16, -1/2 - i/4, -1/32, -3/8, 1/8 - i/4, 1/32},
-					{3/8, -1/2 - i/4, -1/32, 7/16, 1/8 - i/4, 1/32},
-
-					{-7/16, -1/2 - i/4, -1/4, -3/8, -7/16 - i/4, 1/4},
-					{3/8, -1/2 - i/4, -1/4, 7/16, -7/16 - i/4, 1/4}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/2, -1/4 - i/4, 0, 1/2, 1/2 - i/4, 0},
-
-					{-7/16, -1/2 - i/4, -1/32, -3/8, 1/8 - i/4, 1/32},
-					{3/8, -1/2 - i/4, -1/32, 7/16, 1/8 - i/4, 1/32},
-
-					{-7/16, -1/2 - i/4, -1/4, -3/8, -7/16 - i/4, 1/4},
-					{3/8, -1/2 - i/4, -1/4, 7/16, -7/16 - i/4, 1/4}
-				}
-			}
-		})
-	end
-
--- Anti-dazzling panel
-	minetest.register_node("infrastructure:anti_dazzling_panel", {
-		description = "Anti-dazzling panel",
-		tiles = {
-			"infrastructure_anti_dazzling_panel_top_bottom.png",
-			"infrastructure_anti_dazzling_panel_top_bottom.png",
-			"infrastructure_anti_dazzling_panel_side.png",
-			"infrastructure_anti_dazzling_panel_side.png",
-			"infrastructure_anti_dazzling_panel_side.png",
-			"infrastructure_anti_dazzling_panel_side.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = 1,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -1/2, 0, 1/4, 1/2, 0},
-				{-1/8, -1/2, -1/16, 1/8, -3/8, 1/16}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -1/2, 0, 1/4, 1/2, 0},
-				{-1/8, -1/2, -1/16, 1/8, -3/8, 1/16}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:anti_dazzling_panel_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_anti_dazzling_panel_top_bottom.png",
-				"infrastructure_anti_dazzling_panel_top_bottom.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_anti_dazzling_panel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_anti_dazzling_panel_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_anti_dazzling_panel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_anti_dazzling_panel_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_anti_dazzling_panel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_anti_dazzling_panel_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_anti_dazzling_panel_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_anti_dazzling_panel_side.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			paramtype2 = "facedir",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			light_source = 1,
-			drop = "infrastructure:anti_dazzling_panel",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/4, -1/2 - i/4, 0, 1/4, 1/2 - i/4, 0},
-					{-1/8, -1/2 - i/4, -1/16, 1/8, -3/8 - i/4, 1/16}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/4, -1/2 - i/4, 0, 1/4, 1/2 - i/4, 0},
-					{-1/8, -1/2 - i/4, -1/16, 1/8, -3/8 - i/4, 1/16}
-				}
-			}
-		})
-	end
-
--- Traffic cone
-	minetest.register_node("infrastructure:traffic_cone", {
-		description = "Traffic cone",
-		tiles = {
-			"infrastructure_traffic_cone_top.png",
-			"infrastructure_traffic_cone_bottom.png",
-			"infrastructure_traffic_cone_side.png",
-			"infrastructure_traffic_cone_side.png",
-			"infrastructure_traffic_cone_side.png",
-			"infrastructure_traffic_cone_side.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		groups = {cracky = 2},
-		walkable = false,
-		light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -1/2, 0, 1/4, 1/4, 0},
-				{0, -1/2, -1/4, 0, 1/4, 1/4},
-
-				{-3/8, -1/2, -1/8, 3/8, -3/8, 1/8},
-				{-1/8, -1/2, -3/8, 1/8, -3/8, 3/8},
-
-				{-3/8, -1/2 + 0.001, -3/8, 3/8, -1/2 + 0.001, 3/8}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/4, -1/2, 0, 1/4, 1/4, 0},
-				{0, -1/2, -1/4, 0, 1/4, 1/4},
-
-				{-3/8, -1/2, -1/8, 3/8, -3/8, 1/8},
-				{-1/8, -1/2, -3/8, 1/8, -3/8, 3/8},
-
-				{-3/8, -1/2 + 0.001, -3/8, 3/8, -1/2 + 0.001, 3/8}
-			}
-		},
-
-		after_place_node = function(pos, placer)
-			displacement(pos, placer)
-		end
-	})
-
-	for i = 1, 3 do
-		minetest.register_node("infrastructure:traffic_cone_displacement_"..tostring(i), {
-			tiles = {
-				"infrastructure_traffic_cone_top.png",
-				"infrastructure_traffic_cone_bottom.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_traffic_cone_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_traffic_cone_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_traffic_cone_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_traffic_cone_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_traffic_cone_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_traffic_cone_side.png",
-				"[combine:32x32:0,"..tostring(i * 8).."=infrastructure_traffic_cone_side.png:0,"..tostring(i * 8 - 32).."=infrastructure_traffic_cone_side.png"
-			},
-			drawtype = "nodebox",
-			paramtype = "light",
-			groups = {cracky = 2, not_in_creative_inventory = 1},
-			walkable = false,
-			light_source = ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE,
-			drop = "infrastructure:traffic_cone",
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-1/4, -1/2 - i/4, 0, 1/4, 1/4 - i/4, 0},
-					{0, -1/2 - i/4, -1/4, 0, 1/4 - i/4, 1/4},
-
-					{-3/8, -1/2 - i/4, -1/8, 3/8, -3/8 - i/4, 1/8},
-					{-1/8, -1/2 - i/4, -3/8, 1/8, -3/8 - i/4, 3/8},
-
-					{-3/8, -1/2 + 0.001 - i/4, -3/8, 3/8, -1/2 + 0.001 - i/4, 3/8}
-				}
-			},
-			selection_box = {
-				type = "fixed",
-				fixed = {
-					{-1/4, -1/2 - i/4, 0, 1/4, 1/4 - i/4, 0},
-					{0, -1/2 - i/4, -1/4, 0, 1/4 - i/4, 1/4},
-
-					{-3/8, -1/2 - i/4, -1/8, 3/8, -3/8 - i/4, 1/8},
-					{-1/8, -1/2 - i/4, -3/8, 1/8, -3/8 - i/4, 3/8},
-
-					{-3/8, -1/2 + 0.001 - i/4, -3/8, 3/8, -1/2 + 0.001 - i/4, 3/8}
-				}
-			}
-		})
-	end
-
--- Noise barrier
-	minetest.register_node("infrastructure:noise_barrier", {
-		description = "Noise barrier",
-		tiles = {
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_galvanized_steel.png",
-			"infrastructure_noise_barrier.png",
-			"infrastructure_noise_barrier.png"
-		},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 2},
-		light_source = 1,
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, 5/16, 1/2, 1/2, 7/16},
-
-				{-1/2, -1/2, 1/4, 1/2, -7/16, 1/2},
-				{-1/2, 7/16, 1/4, 1/2, 1/2, 1/2},
-				{-1/2, -1/2, 1/4, -7/16, 1/2, 1/2},
-				{7/16, -1/2, 1/4, 1/2, 1/2, 1/2}
-			}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {
-				{-1/2, -1/2, 1/4, 1/2, 1/2, 1/2},
-			}
-		}
-	})
diff --git a/streets/infrastructure/nodes_extension.lua b/streets/infrastructure/nodes_extension.lua
deleted file mode 100644
index 8eebdba..0000000
--- a/streets/infrastructure/nodes_extension.lua
+++ /dev/null
@@ -1,162 +0,0 @@
--- **************************************************************************************************** MATERIALS
-
--- Galvanized steel stair, slab, panel and microblock
-	register_stair_slab_panel_micro("infrastructure", "galvanized_steel", "infrastructure:galvanized_steel",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=2},
-			{"infrastructure_galvanized_steel.png"},
-			"Galvanized steel",
-			"galvanized_steel",
-			0)
-
--- **************************************************************************************************** CENTER LINES
-
--- Asphalt stair, slab, panel and microblock with center solid line
-	register_stair_slab_panel_micro("infrastructure", "asphalt_center_solid_line", "infrastructure:asphalt_center_solid_line",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{
-				"streets_asphalt.png^infrastructure_single_yellow_line.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png"
-			},
-			"Asphalt with center solid line",
-			"asphalt_center_solid_line",
-			0)
-
--- Asphalt stair, slab, panel and microblock with center solid line on one side
-	register_stair_slab_panel_micro("infrastructure", "asphalt_center_solid_one_side", "infrastructure:asphalt_center_solid_one_side",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{
-				"streets_asphalt.png^infrastructure_solid_yellow_line_one_side.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png"
-			},
-			"Asphalt with center solid line on one side",
-			"asphalt_center_solid_one_side",
-			0)
-
--- Asphalt stair, slab, panel and microblock with center solid double line
-	register_stair_slab_panel_micro("infrastructure", "asphalt_center_solid_double", "infrastructure:asphalt_center_solid_double",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{
-				"streets_asphalt.png^infrastructure_double_yellow_line.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png"
-			},
-			"Asphalt with center solid double line",
-			"asphalt_center_solid_double",
-			0)
-
--- Asphalt block with center corner single line
-	register_stair_slab_panel_micro("infrastructure", "asphalt_center_corner_single", "infrastructure:asphalt_center_corner_single",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{
-				"streets_asphalt.png^infrastructure_single_yellow_line_corner.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png"
-			},
-			"Asphalt with center corner single line",
-			"asphalt_center_corner_single",
-			0)
-
--- Asphalt block with center corner double line
-	register_stair_slab_panel_micro("infrastructure", "asphalt_center_corner_double", "infrastructure:asphalt_center_corner_double",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{
-				"streets_asphalt.png^infrastructure_solid_double_yellow_line_corner.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png",
-				"streets_asphalt.png"
-			},
-			"Asphalt with center corner double line",
-			"asphalt_center_corner_double",
-			0)
-
--- **************************************************************************************************** TRAFFIC MARKS
-
--- Asphalt stair, slab, panel and microblock with arrow straight
-	register_stair_slab_panel_micro("infrastructure", "asphalt_arrow_straight", "infrastructure:asphalt_arrow_straight",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{"streets_arrow_straight.png", "infrastructure_asphalt.png"},
-			"Asphalt with arrow straight",
-			"asphalt_arrow_straight",
-			0)
-
--- Asphalt stair, slab, panel and microblock with arrow straight + left
-	register_stair_slab_panel_micro("infrastructure", "asphalt_arrow_straight_left", "infrastructure:asphalt_arrow_straight_left",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{"streets_asphalt.png^streets_arrow_straight_left.png", "infrastructure_asphalt.png"},
-			"Asphalt with arrow straight + left",
-			"asphalt_arrow_straight_left",
-			0)
-
--- Asphalt stair, slab, panel and microblock with arrow straight + right
-	register_stair_slab_panel_micro("infrastructure", "asphalt_arrow_straight_right", "infrastructure:asphalt_arrow_straight_right",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{"streets_asphalt.png^streets_arrow_straight_right.png", "infrastructure_asphalt.png"},
-			"Asphalt with arrow straight + right",
-			"asphalt_arrow_straight_right",
-			0)
-
--- Asphalt stair, slab, panel and microblock with arrow left
-	register_stair_slab_panel_micro("infrastructure", "asphalt_arrow_left", "infrastructure:asphalt_arrow_left",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{"streets_asphalt.png^streets_arrow_left.png", "infrastructure_asphalt.png"},
-			"Asphalt with arrow left",
-			"asphalt_arrow_left",
-			0)
-
--- Asphalt stair, slab, panel and microblock with arrow right
-	register_stair_slab_panel_micro("infrastructure", "asphalt_arrow_right", "infrastructure:asphalt_arrow_right",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{"streets_asphalt.png^streets_arrow_right.png", "infrastructure_asphalt.png"},
-			"Asphalt with arrow right",
-			"asphalt_arrow_right",
-			0)
-
--- Asphalt stair, slab, panel and microblock with "P"-sign
-	register_stair_slab_panel_micro("infrastructure", "asphalt_parking", "infrastructure:asphalt_parking",
-			{not_in_creative_inventory=NOT_IN_CREATIVE_INVENTORY, cracky=1},
-			{"streets_asphalt.png^streets_parking.png", "infrastructure_asphalt.png"},
-			"Asphalt with a parking sign",
-			"asphalt_parking",
-			0)
-
--- Register known infrastructure nodes in circular saw if avaiable
-	if circular_saw then
-		for i,v in ipairs({
--- Materials
-			"asphalt",
-			"concrete",
-			"galvanized_steel",
--- Center lines
-			"asphalt_center_dashed",
-			"asphalt_center_solid",
-			"asphalt_center_solid_one_side",
-			"asphalt_center_solid_double",
-			"asphalt_center_corner_single",
-			"asphalt_center_corner_double",
--- Traffic marks
-			"asphalt_arrow_straight",
-			"asphalt_arrow_straight_left",
-			"asphalt_arrow_straight_right",
-			"asphalt_arrow_left",
-			"asphalt_arrow_right",
-			"asphalt_parking"
-		}) do
-			table.insert(circular_saw.known_stairs, "infrastructure:"..v);
-		end
-	end
diff --git a/streets/infrastructure/settings.lua b/streets/infrastructure/settings.lua
deleted file mode 100644
index 1433e22..0000000
--- a/streets/infrastructure/settings.lua
+++ /dev/null
@@ -1,49 +0,0 @@
--- This file stores all settings for the "Infrastructure mod"
-
--- Stairs, slabs, panels and microblocks
-	NOT_IN_CREATIVE_INVENTORY = 1			-- an integer 0 or 1	-> default = 1		| Do you want it to be hide in your creative inventory?
-
--- Raised pavement marker
-	MARKER_LIGHT_RANGE = 4				-- an integer		-> default = 4		| How much light do you want it to give?
-
--- Retroreflective delineator
-	DELINEATOR_LIGHT_RANGE = 8			-- an integer		-> default = 8		| How much light do you want it to give?
-
--- Energy absorbing terminal
-	ENERGY_ABSORBING_TERMINAL_LIGHT_RANGE = 8	-- an integer		-> default = 8		| How much light do you want it to give?
-
--- Emergency phone
-	ENABLE_EMERGENCY_PHONE = true			-- true or false	-> default = true	| Do you want it to be enabled in your game?
-	HEALTH_TO_TRIGGER = 5				-- an integer		-> default = 5		| When will the player be healed? How low must his health be?
-	HEALTH_TO_RESTORING = 10			-- an integer		-> default = 10		| To what will the health be set?
-	EMERGENCY_PHONE_LIGHT_RANGE = 12		-- an integer		-> default = 12		| How much light do you want it to give?
-	EMERGENCY_PHONE_VOLUME = 0.1			-- a float		-> default = 0.1	| How noisy should be the dialing sound?
-
--- Traffic lights
-	TRAFFIC_LIGHTS_LIGHT_RANGE = 12			-- an integer		-> default = 12		| How much light do you want it to give?
-	TRAFFIC_LIGHTS_VOLUME = 0			-- a float		-> default = 0.1	| How noisy should be the beep sound?
-
--- Automatic warning device
-	AUTOMATIC_WARNING_DEVICE_LIGHT_RANGE = 12	-- an integer		-> default = 12		| How much light do you want it to give?
-	AUTOMATIC_WARNING_DEVICE_VOLUME = 0.5		-- a float		-> default = 0.5	| How noisy should be the bell sound?
-
--- Boom barrier
-	BOOM_BARRIER_LIGHT_RANGE = 6			-- an integer		-> default = 6		| How much light do you want it to give?
-	BOOM_BARRIER_VOLUME = 0.4			-- a float		-> default = 0.1	| How noisy should be the mechanism sound?
-
--- Curve chevron
-	CURVE_CHEVRON_LIGHT_RANGE = 12			-- an integer		-> default = 12		| How much light do you want it to give?
-
--- Crosswalk lighting
-	CROSSWALK_LIGHTING_LIGHT_RANGE = 15		-- an integer		-> default = 15		| How much light do you want it to give?
-
--- Crosswalk safety sign
-	CROSSWALK_SAFETY_SIGN_LIGHT_RANGE = 8		-- an integer		-> default = 8		| How much light do you want it to give?
-
--- Crosswalk safety sign
-	RETROREFLECTIVE_SURFACE_LIGHT_RANGE = 8		-- an integer		-> default = 8		| How much light do you want it to give?
-
--- Aircraft warning light
-	AIRCRAFT_WARNING_LIGHT_LIGHT_RANGE = 15		-- an integer		-> default = 15		| How much light do you want it to give?
--- Warning light
-	WARNING_LIGHT_LIGHT_RANGE = 15			-- an integer		-> default = 15		| How much light do you want it to give?
diff --git a/streets/infrastructure/sounds/infrastructure_automatic_warning_device.ogg b/streets/infrastructure/sounds/infrastructure_automatic_warning_device.ogg
deleted file mode 100644
index 71d1679..0000000
Binary files a/streets/infrastructure/sounds/infrastructure_automatic_warning_device.ogg and /dev/null differ
diff --git a/streets/infrastructure/sounds/infrastructure_boom_barrier.ogg b/streets/infrastructure/sounds/infrastructure_boom_barrier.ogg
deleted file mode 100644
index 4106df2..0000000
Binary files a/streets/infrastructure/sounds/infrastructure_boom_barrier.ogg and /dev/null differ
diff --git a/streets/infrastructure/sounds/infrastructure_ebell.ogg b/streets/infrastructure/sounds/infrastructure_ebell.ogg
deleted file mode 100644
index d59d1b9..0000000
Binary files a/streets/infrastructure/sounds/infrastructure_ebell.ogg and /dev/null differ
diff --git a/streets/infrastructure/sounds/infrastructure_emergency_phone.ogg b/streets/infrastructure/sounds/infrastructure_emergency_phone.ogg
deleted file mode 100644
index 7e84eb2..0000000
Binary files a/streets/infrastructure/sounds/infrastructure_emergency_phone.ogg and /dev/null differ
diff --git a/streets/infrastructure/sounds/infrastructure_traffic_lights_1.ogg b/streets/infrastructure/sounds/infrastructure_traffic_lights_1.ogg
deleted file mode 100644
index d790e9a..0000000
Binary files a/streets/infrastructure/sounds/infrastructure_traffic_lights_1.ogg and /dev/null differ
diff --git a/streets/infrastructure/sounds/infrastructure_traffic_lights_2.ogg b/streets/infrastructure/sounds/infrastructure_traffic_lights_2.ogg
deleted file mode 100644
index 8fa7753..0000000
Binary files a/streets/infrastructure/sounds/infrastructure_traffic_lights_2.ogg and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_aircraft_warning_light_side_anim.png b/streets/infrastructure/textures/infrastructure_aircraft_warning_light_side_anim.png
deleted file mode 100644
index 40c1558..0000000
Binary files a/streets/infrastructure/textures/infrastructure_aircraft_warning_light_side_anim.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_aircraft_warning_light_top_anim.png b/streets/infrastructure/textures/infrastructure_aircraft_warning_light_top_anim.png
deleted file mode 100644
index 8f223dc..0000000
Binary files a/streets/infrastructure/textures/infrastructure_aircraft_warning_light_top_anim.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_anti_dazzling_panel_side.png b/streets/infrastructure/textures/infrastructure_anti_dazzling_panel_side.png
deleted file mode 100644
index 5965006..0000000
Binary files a/streets/infrastructure/textures/infrastructure_anti_dazzling_panel_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_anti_dazzling_panel_top_bottom.png b/streets/infrastructure/textures/infrastructure_anti_dazzling_panel_top_bottom.png
deleted file mode 100644
index 0f257bd..0000000
Binary files a/streets/infrastructure/textures/infrastructure_anti_dazzling_panel_top_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_asphalt.png b/streets/infrastructure/textures/infrastructure_asphalt.png
deleted file mode 100644
index 2906a0d..0000000
Binary files a/streets/infrastructure/textures/infrastructure_asphalt.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device.png
deleted file mode 100644
index d5f6c62..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_bottom.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_bottom.png
deleted file mode 100644
index 87ddf0c..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle.png
deleted file mode 100644
index 5185a29..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_anim.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_anim.png
deleted file mode 100644
index 575ebca..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_anim.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_off.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_off.png
deleted file mode 100644
index ac85b26..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_off.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_side.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_side.png
deleted file mode 100644
index 7c50472..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_center_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_anim.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_anim.png
deleted file mode 100644
index 6d6851b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_anim.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_off.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_off.png
deleted file mode 100644
index 3acc761..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_off.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_side.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_side.png
deleted file mode 100644
index 8d73676..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_left_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_anim.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_anim.png
deleted file mode 100644
index 5517f0d..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_anim.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_off.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_off.png
deleted file mode 100644
index d3e378a..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_off.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_side.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_side.png
deleted file mode 100644
index cb6a9bc..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_right_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_side.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_side.png
deleted file mode 100644
index 469addf..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_middle_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_top.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_top.png
deleted file mode 100644
index a9fb96f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_automatic_warning_device_top_side.png b/streets/infrastructure/textures/infrastructure_automatic_warning_device_top_side.png
deleted file mode 100644
index 49412ec..0000000
Binary files a/streets/infrastructure/textures/infrastructure_automatic_warning_device_top_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png b/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png
deleted file mode 100644
index 70b1cd3..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_darkfirst.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png b/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png
deleted file mode 100644
index ea7368e..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_anim_lightfirst.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_bottom_front_back.png b/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_bottom_front_back.png
deleted file mode 100644
index e283612..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_bottom_front_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_bright.png b/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_bright.png
deleted file mode 100644
index 0e6e50c..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_left_right_bright.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_top.png b/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_top.png
deleted file mode 100644
index 5f997a4..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_h_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_left.png b/streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_left.png
deleted file mode 100644
index 87b3bbb..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_left.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_right.png b/streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_right.png
deleted file mode 100644
index c777597..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_arm_v_right.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_h_bottom.png b/streets/infrastructure/textures/infrastructure_boom_barrier_h_bottom.png
deleted file mode 100644
index c7fbfea..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_h_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_h_front_back.png b/streets/infrastructure/textures/infrastructure_boom_barrier_h_front_back.png
deleted file mode 100644
index 5d019fc..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_h_front_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_h_left.png b/streets/infrastructure/textures/infrastructure_boom_barrier_h_left.png
deleted file mode 100644
index 08348fb..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_h_left.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_h_right.png b/streets/infrastructure/textures/infrastructure_boom_barrier_h_right.png
deleted file mode 100644
index 5399be8..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_h_right.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_h_top.png b/streets/infrastructure/textures/infrastructure_boom_barrier_h_top.png
deleted file mode 100644
index 7796232..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_h_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_v_bottom.png b/streets/infrastructure/textures/infrastructure_boom_barrier_v_bottom.png
deleted file mode 100644
index 9ae9ed3..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_v_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_v_front_back.png b/streets/infrastructure/textures/infrastructure_boom_barrier_v_front_back.png
deleted file mode 100644
index d7b7a3b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_v_front_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_v_left.png b/streets/infrastructure/textures/infrastructure_boom_barrier_v_left.png
deleted file mode 100644
index 4ddd606..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_v_left.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_boom_barrier_v_right.png b/streets/infrastructure/textures/infrastructure_boom_barrier_v_right.png
deleted file mode 100644
index 91c5600..0000000
Binary files a/streets/infrastructure/textures/infrastructure_boom_barrier_v_right.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_cable_barrier_terminal_back.png b/streets/infrastructure/textures/infrastructure_cable_barrier_terminal_back.png
deleted file mode 100644
index 5f90cf2..0000000
Binary files a/streets/infrastructure/textures/infrastructure_cable_barrier_terminal_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_cable_barrier_terminal_front.png b/streets/infrastructure/textures/infrastructure_cable_barrier_terminal_front.png
deleted file mode 100644
index 607f6d9..0000000
Binary files a/streets/infrastructure/textures/infrastructure_cable_barrier_terminal_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_concrete.png b/streets/infrastructure/textures/infrastructure_concrete.png
deleted file mode 100644
index 3be0c52..0000000
Binary files a/streets/infrastructure/textures/infrastructure_concrete.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_back.png b/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_back.png
deleted file mode 100644
index d7aaf99..0000000
Binary files a/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_front.png b/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_front.png
deleted file mode 100644
index c3a7b37..0000000
Binary files a/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_side.png b/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_side.png
deleted file mode 100644
index 739e6de..0000000
Binary files a/streets/infrastructure/textures/infrastructure_corrugated_guide_rail_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_corrugated_sheet.png b/streets/infrastructure/textures/infrastructure_corrugated_sheet.png
deleted file mode 100644
index 9b6bef4..0000000
Binary files a/streets/infrastructure/textures/infrastructure_corrugated_sheet.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_lighting_back.png b/streets/infrastructure/textures/infrastructure_crosswalk_lighting_back.png
deleted file mode 100644
index fd73443..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_lighting_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_lighting_bottom.png b/streets/infrastructure/textures/infrastructure_crosswalk_lighting_bottom.png
deleted file mode 100644
index f6f5db9..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_lighting_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_lighting_front.png b/streets/infrastructure/textures/infrastructure_crosswalk_lighting_front.png
deleted file mode 100644
index bf6bf01..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_lighting_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign.png b/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign.png
deleted file mode 100644
index b20ca91..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_front_back.png b/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_front_back.png
deleted file mode 100644
index 2ff6832..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_front_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_side.png b/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_side.png
deleted file mode 100644
index 9e7c58c..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_bottom_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top.png b/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top.png
deleted file mode 100644
index 6ba1c7b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_front_back.png b/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_front_back.png
deleted file mode 100644
index f115876..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_front_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_side.png b/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_side.png
deleted file mode 100644
index 9db3518..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_safety_sign_top_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_back.png b/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_back.png
deleted file mode 100644
index 51d024b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_anim.png b/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_anim.png
deleted file mode 100644
index a21529f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_anim.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_bright.png b/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_bright.png
deleted file mode 100644
index 3525a3c..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_bright.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_dark.png b/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_dark.png
deleted file mode 100644
index 357bda3..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crosswalk_warning_light_front_dark.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crowd_control_barricade_back.png b/streets/infrastructure/textures/infrastructure_crowd_control_barricade_back.png
deleted file mode 100644
index 0f5c6ea..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crowd_control_barricade_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_crowd_control_barricade_front.png b/streets/infrastructure/textures/infrastructure_crowd_control_barricade_front.png
deleted file mode 100644
index a16c363..0000000
Binary files a/streets/infrastructure/textures/infrastructure_crowd_control_barricade_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_curve_chevron_left_bright.png b/streets/infrastructure/textures/infrastructure_curve_chevron_left_bright.png
deleted file mode 100644
index 199751f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_curve_chevron_left_bright.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_curve_chevron_left_dark.png b/streets/infrastructure/textures/infrastructure_curve_chevron_left_dark.png
deleted file mode 100644
index f7d68f5..0000000
Binary files a/streets/infrastructure/textures/infrastructure_curve_chevron_left_dark.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_curve_chevron_right_bright.png b/streets/infrastructure/textures/infrastructure_curve_chevron_right_bright.png
deleted file mode 100644
index d1bae78..0000000
Binary files a/streets/infrastructure/textures/infrastructure_curve_chevron_right_bright.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_curve_chevron_right_dark.png b/streets/infrastructure/textures/infrastructure_curve_chevron_right_dark.png
deleted file mode 100644
index b8f442f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_curve_chevron_right_dark.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_delineator_retroreflector_red.png b/streets/infrastructure/textures/infrastructure_delineator_retroreflector_red.png
deleted file mode 100644
index b2d4336..0000000
Binary files a/streets/infrastructure/textures/infrastructure_delineator_retroreflector_red.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_delineator_retroreflector_yellow.png b/streets/infrastructure/textures/infrastructure_delineator_retroreflector_yellow.png
deleted file mode 100644
index b6fe651..0000000
Binary files a/streets/infrastructure/textures/infrastructure_delineator_retroreflector_yellow.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_delineator_wrapper_left.png b/streets/infrastructure/textures/infrastructure_delineator_wrapper_left.png
deleted file mode 100644
index a4d0edd..0000000
Binary files a/streets/infrastructure/textures/infrastructure_delineator_wrapper_left.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_delineator_wrapper_right.png b/streets/infrastructure/textures/infrastructure_delineator_wrapper_right.png
deleted file mode 100644
index 2743183..0000000
Binary files a/streets/infrastructure/textures/infrastructure_delineator_wrapper_right.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_drainage_channel_grating.png b/streets/infrastructure/textures/infrastructure_drainage_channel_grating.png
deleted file mode 100644
index dc720cd..0000000
Binary files a/streets/infrastructure/textures/infrastructure_drainage_channel_grating.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_emergency_phone_bottom.png b/streets/infrastructure/textures/infrastructure_emergency_phone_bottom.png
deleted file mode 100644
index 8106816..0000000
Binary files a/streets/infrastructure/textures/infrastructure_emergency_phone_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_emergency_phone_front.png b/streets/infrastructure/textures/infrastructure_emergency_phone_front.png
deleted file mode 100644
index 1153717..0000000
Binary files a/streets/infrastructure/textures/infrastructure_emergency_phone_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_emergency_phone_side.png b/streets/infrastructure/textures/infrastructure_emergency_phone_side.png
deleted file mode 100644
index 930437c..0000000
Binary files a/streets/infrastructure/textures/infrastructure_emergency_phone_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_emergency_phone_top.png b/streets/infrastructure/textures/infrastructure_emergency_phone_top.png
deleted file mode 100644
index 2ff4038..0000000
Binary files a/streets/infrastructure/textures/infrastructure_emergency_phone_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_back.png b/streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_back.png
deleted file mode 100644
index 6264bd5..0000000
Binary files a/streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_front.png b/streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_front.png
deleted file mode 100644
index cd20a40..0000000
Binary files a/streets/infrastructure/textures/infrastructure_energy_absorbing_terminal_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_fitch_barrel_bottom.png b/streets/infrastructure/textures/infrastructure_fitch_barrel_bottom.png
deleted file mode 100644
index 7664b97..0000000
Binary files a/streets/infrastructure/textures/infrastructure_fitch_barrel_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_fitch_barrel_side.png b/streets/infrastructure/textures/infrastructure_fitch_barrel_side.png
deleted file mode 100644
index 7471830..0000000
Binary files a/streets/infrastructure/textures/infrastructure_fitch_barrel_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_fitch_barrel_top.png b/streets/infrastructure/textures/infrastructure_fitch_barrel_top.png
deleted file mode 100644
index 223e119..0000000
Binary files a/streets/infrastructure/textures/infrastructure_fitch_barrel_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_galvanized_steel.png b/streets/infrastructure/textures/infrastructure_galvanized_steel.png
deleted file mode 100644
index 841e68b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_galvanized_steel.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_grid_paver_bottom.png b/streets/infrastructure/textures/infrastructure_grid_paver_bottom.png
deleted file mode 100644
index de051cf..0000000
Binary files a/streets/infrastructure/textures/infrastructure_grid_paver_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_grid_paver_grass.png b/streets/infrastructure/textures/infrastructure_grid_paver_grass.png
deleted file mode 100644
index 87bae79..0000000
Binary files a/streets/infrastructure/textures/infrastructure_grid_paver_grass.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_grid_paver_top.png b/streets/infrastructure/textures/infrastructure_grid_paver_top.png
deleted file mode 100644
index ea079c3..0000000
Binary files a/streets/infrastructure/textures/infrastructure_grid_paver_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_lane_control_lights_1.png b/streets/infrastructure/textures/infrastructure_lane_control_lights_1.png
deleted file mode 100644
index e2c5d16..0000000
Binary files a/streets/infrastructure/textures/infrastructure_lane_control_lights_1.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_lane_control_lights_2.png b/streets/infrastructure/textures/infrastructure_lane_control_lights_2.png
deleted file mode 100644
index 913572a..0000000
Binary files a/streets/infrastructure/textures/infrastructure_lane_control_lights_2.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_lane_control_lights_3.png b/streets/infrastructure/textures/infrastructure_lane_control_lights_3.png
deleted file mode 100644
index ffe4e01..0000000
Binary files a/streets/infrastructure/textures/infrastructure_lane_control_lights_3.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_lane_control_lights_4.png b/streets/infrastructure/textures/infrastructure_lane_control_lights_4.png
deleted file mode 100644
index 6b24780..0000000
Binary files a/streets/infrastructure/textures/infrastructure_lane_control_lights_4.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_lane_control_lights_5.png b/streets/infrastructure/textures/infrastructure_lane_control_lights_5.png
deleted file mode 100644
index 1a8afcb..0000000
Binary files a/streets/infrastructure/textures/infrastructure_lane_control_lights_5.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_lane_control_lights_6.png b/streets/infrastructure/textures/infrastructure_lane_control_lights_6.png
deleted file mode 100644
index 6e149d7..0000000
Binary files a/streets/infrastructure/textures/infrastructure_lane_control_lights_6.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_manhole_cover_side.png b/streets/infrastructure/textures/infrastructure_manhole_cover_side.png
deleted file mode 100644
index 11bf08e..0000000
Binary files a/streets/infrastructure/textures/infrastructure_manhole_cover_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_manhole_cover_top_bottom.png b/streets/infrastructure/textures/infrastructure_manhole_cover_top_bottom.png
deleted file mode 100644
index 4338a82..0000000
Binary files a/streets/infrastructure/textures/infrastructure_manhole_cover_top_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_marker_bottom_side.png b/streets/infrastructure/textures/infrastructure_marker_bottom_side.png
deleted file mode 100644
index 6cf3e60..0000000
Binary files a/streets/infrastructure/textures/infrastructure_marker_bottom_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_marker_side_red.png b/streets/infrastructure/textures/infrastructure_marker_side_red.png
deleted file mode 100644
index 5a5ae22..0000000
Binary files a/streets/infrastructure/textures/infrastructure_marker_side_red.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_marker_side_yellow.png b/streets/infrastructure/textures/infrastructure_marker_side_yellow.png
deleted file mode 100644
index a3a439d..0000000
Binary files a/streets/infrastructure/textures/infrastructure_marker_side_yellow.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_marker_top_red_yellow.png b/streets/infrastructure/textures/infrastructure_marker_top_red_yellow.png
deleted file mode 100644
index afebd88..0000000
Binary files a/streets/infrastructure/textures/infrastructure_marker_top_red_yellow.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_marker_top_yellow_yellow.png b/streets/infrastructure/textures/infrastructure_marker_top_yellow_yellow.png
deleted file mode 100644
index de9d4d6..0000000
Binary files a/streets/infrastructure/textures/infrastructure_marker_top_yellow_yellow.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_noise_barrier.png b/streets/infrastructure/textures/infrastructure_noise_barrier.png
deleted file mode 100644
index a52a243..0000000
Binary files a/streets/infrastructure/textures/infrastructure_noise_barrier.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_razor_wire.png b/streets/infrastructure/textures/infrastructure_razor_wire.png
deleted file mode 100644
index 150a98f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_razor_wire.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_riffled_sheet.png b/streets/infrastructure/textures/infrastructure_riffled_sheet.png
deleted file mode 100644
index 0f83bce..0000000
Binary files a/streets/infrastructure/textures/infrastructure_riffled_sheet.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_crosswalk_back.png b/streets/infrastructure/textures/infrastructure_road_sign_crosswalk_back.png
deleted file mode 100644
index 590e65d..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_crosswalk_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_crosswalk_front.png b/streets/infrastructure/textures/infrastructure_road_sign_crosswalk_front.png
deleted file mode 100644
index 78b5dce..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_crosswalk_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_retroreflective_surface.png b/streets/infrastructure/textures/infrastructure_road_sign_retroreflective_surface.png
deleted file mode 100644
index f9c95c1..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_retroreflective_surface.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_right_of_way_back.png b/streets/infrastructure/textures/infrastructure_road_sign_right_of_way_back.png
deleted file mode 100644
index a98467f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_right_of_way_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_right_of_way_front.png b/streets/infrastructure/textures/infrastructure_road_sign_right_of_way_front.png
deleted file mode 100644
index 0f52f69..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_right_of_way_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_stop_back.png b/streets/infrastructure/textures/infrastructure_road_sign_stop_back.png
deleted file mode 100644
index d87b178..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_stop_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_stop_front.png b/streets/infrastructure/textures/infrastructure_road_sign_stop_front.png
deleted file mode 100644
index 42a099f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_stop_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_yield_back.png b/streets/infrastructure/textures/infrastructure_road_sign_yield_back.png
deleted file mode 100644
index d934905..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_yield_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_road_sign_yield_front.png b/streets/infrastructure/textures/infrastructure_road_sign_yield_front.png
deleted file mode 100644
index caad0cc..0000000
Binary files a/streets/infrastructure/textures/infrastructure_road_sign_yield_front.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_cone_bottom.png b/streets/infrastructure/textures/infrastructure_traffic_cone_bottom.png
deleted file mode 100644
index c9a5137..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_cone_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_cone_side.png b/streets/infrastructure/textures/infrastructure_traffic_cone_side.png
deleted file mode 100644
index 134837f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_cone_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_cone_top.png b/streets/infrastructure/textures/infrastructure_traffic_cone_top.png
deleted file mode 100644
index 2dca4ae..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_cone_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians.png
deleted file mode 100644
index 9cd1470..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_back.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_back.png
deleted file mode 100644
index 357011d..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_1.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_1.png
deleted file mode 100644
index a689dc4..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_1.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_2.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_2.png
deleted file mode 100644
index a689dc4..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_2.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_3.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_3.png
deleted file mode 100644
index 7729d96..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_3.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_4.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_4.png
deleted file mode 100644
index 7729d96..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_bottom_front_4.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_back.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_back.png
deleted file mode 100644
index 708d59b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_1.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_1.png
deleted file mode 100644
index 737c426..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_1.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_2.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_2.png
deleted file mode 100644
index 737c426..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_2.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_3.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_3.png
deleted file mode 100644
index 8d22856..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_3.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_4.png b/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_4.png
deleted file mode 100644
index 8d22856..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_pedestrians_top_front_4.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_side.png b/streets/infrastructure/textures/infrastructure_traffic_lights_side.png
deleted file mode 100644
index 01076e3..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_side.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles.png
deleted file mode 100644
index 393422a..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_1.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_1.png
deleted file mode 100644
index 4cbb75b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_1.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_2.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_2.png
deleted file mode 100644
index c81f500..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_2.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_3.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_3.png
deleted file mode 100644
index f55108c..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_3.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_4.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_4.png
deleted file mode 100644
index c81f500..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_bottom_4.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_1.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_1.png
deleted file mode 100644
index 116ae46..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_1.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_2.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_2.png
deleted file mode 100644
index 4a57e89..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_2.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_3.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_3.png
deleted file mode 100644
index 9dab2ea..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_3.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_4.png b/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_4.png
deleted file mode 100644
index ddc2364..0000000
Binary files a/streets/infrastructure/textures/infrastructure_traffic_lights_vehicles_top_4.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_truss.png b/streets/infrastructure/textures/infrastructure_truss.png
deleted file mode 100644
index ba628f1..0000000
Binary files a/streets/infrastructure/textures/infrastructure_truss.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_warning_light_back.png b/streets/infrastructure/textures/infrastructure_warning_light_back.png
deleted file mode 100644
index 0301aee..0000000
Binary files a/streets/infrastructure/textures/infrastructure_warning_light_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_warning_light_bottom.png b/streets/infrastructure/textures/infrastructure_warning_light_bottom.png
deleted file mode 100644
index e7090a0..0000000
Binary files a/streets/infrastructure/textures/infrastructure_warning_light_bottom.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_warning_light_front_anim.png b/streets/infrastructure/textures/infrastructure_warning_light_front_anim.png
deleted file mode 100644
index 601725b..0000000
Binary files a/streets/infrastructure/textures/infrastructure_warning_light_front_anim.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_warning_light_left.png b/streets/infrastructure/textures/infrastructure_warning_light_left.png
deleted file mode 100644
index e519af4..0000000
Binary files a/streets/infrastructure/textures/infrastructure_warning_light_left.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_warning_light_right.png b/streets/infrastructure/textures/infrastructure_warning_light_right.png
deleted file mode 100644
index 4bd42dc..0000000
Binary files a/streets/infrastructure/textures/infrastructure_warning_light_right.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_warning_light_top.png b/streets/infrastructure/textures/infrastructure_warning_light_top.png
deleted file mode 100644
index 898ed0f..0000000
Binary files a/streets/infrastructure/textures/infrastructure_warning_light_top.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_wire_netting.png b/streets/infrastructure/textures/infrastructure_wire_netting.png
deleted file mode 100644
index a685e97..0000000
Binary files a/streets/infrastructure/textures/infrastructure_wire_netting.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_back.png b/streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_back.png
deleted file mode 100644
index 31418f3..0000000
Binary files a/streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_back.png and /dev/null differ
diff --git a/streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_front.png b/streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_front.png
deleted file mode 100644
index 3e46bd1..0000000
Binary files a/streets/infrastructure/textures/infrastructure_wire_rope_safety_barrier_front.png and /dev/null differ
diff --git a/streets/labels/depends.txt b/streets/labels/depends.txt
deleted file mode 100644
index 365a8df..0000000
--- a/streets/labels/depends.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-default
-streetsmod
-wool?
-moreblocks?
diff --git a/streets/labels/init.lua b/streets/labels/init.lua
deleted file mode 100644
index 93dcf37..0000000
--- a/streets/labels/init.lua
+++ /dev/null
@@ -1,355 +0,0 @@
---[[
-	StreetsMod: All kinds of asphalt with labels
-]]
-
-streets.register_label = function(friendlyname,name,tex,craft)
-	minetest.register_node(":streets:mark_"..name,{
-		description = streets.S("Marking Overlay: "..friendlyname),
-		tiles = {tex,"streets_rw_transparent.png"},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {snappy = 3,attached_node = 1,oddly_breakable_by_hand = 1},
-		sunlight_propagates = true,
-		walkable = false,
-		inventory_image = tex,
-		wield_image = tex,
-		after_place_node = function(pos)
-			local node = minetest.get_node(pos)
-			local lower_pos = {x = pos.x, y = pos.y-1, z = pos.z}
-			local lower_node = minetest.get_node(lower_pos)
-			if lower_node.name == "streets:asphalt" then
-				lower_node.name = "streets:mark_"..(node.name:sub(14)).."_on_asphalt"
-				lower_node.param2 = node.param2
-				minetest.set_node(lower_pos,lower_node)
-				minetest.remove_node(pos)
-			end
-		end,				
-		node_box = {
-			type = "fixed",
-			fixed = {-0.5,-0.5,-0.5,0.5,-0.499,0.5}
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}
-		}
-	})
-
-	minetest.register_node(":streets:mark_"..name.."_on_asphalt",{
-		description = streets.S("Asphalt With Marking: "..friendlyname),
-		groups = {cracky=3},
-		tiles = {"streets_asphalt.png^"..tex,"streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^"..tex.."^[transformR180","streets_asphalt.png^"..tex},
-		paramtype2 = "facedir"
-	})
-
-	minetest.register_craft({
-		output = "streets:mark_"..name.."_on_asphalt",
-		type = "shapeless",
-		recipe = {"streets:asphalt","streets:mark_"..name}
-	})
-
-	minetest.register_craft({
-		output = "streets:mark_"..name.." 6",
-		recipe = craft
-	})
-	if minetest.get_modpath("moreblocks") then
-		stairsplus:register_all("streets", name, "streets:mark_"..name.."_on_asphalt", {
-			description = "Asphalt with Marking: "..friendlyname,
-			tiles = {"streets_asphalt.png^"..tex,"streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^"..tex.."^[transformR180","streets_asphalt.png^"..tex},
-			groups = {cracky=3}
-		})
-	end
-end
-
-
---White Markings
-streets.register_label("Solid White Side Line","solid_white_side_line","streets_asphalt_side.png",{
-		{"","",""},
-		{"","",""},
-		{"dye:white","dye:white","dye:white"}
-	})
-
-minetest.register_alias("streets:asphalt_side","streets:mark_solid_white_side_line_on_asphalt")
-minetest.register_alias("streets:asphalt_sideline","streets:mark_solid_white_side_line_on_asphalt")
-
-streets.register_label("Solid White Side Line (rotated)","solid_white_side_line_rotated","streets_asphalt_side.png^[transformR180",{{"streets:mark_solid_white_side_line"}})
-
-minetest.register_alias("streets:asphalt_sideline_r","streets:mark_solid_white_side_line_rotated_on_asphalt")
-
-
-streets.register_label("Solid White Center Line","solid_white_center_line","streets_asphalt_solid_line.png",{
-		{"","dye:white",""},
-		{"","dye:white",""},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_middle","streets:mark_solid_white_center_line_on_asphalt")
-minetest.register_alias("streets:asphalt_solid_line","streets:mark_solid_white_center_line_on_asphalt")
-
-
-streets.register_label("Dashed White Center Line","dashed_white_center_line","streets_asphalt_dashed_line.png",{
-		{"","dye:white",""},
-		{"","",""},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_middle_dashed","streets:mark_dashed_white_center_line_on_asphalt")
-minetest.register_alias("streets:asphalt_dashed_line","streets:mark_dashed_white_center_line_on_asphalt")
-
-
-streets.register_label("Solid White Side Line (corner)","solid_white_side_line_corner","streets_asphalt_outer_edge.png",{
-		{"dye:white","dye:white","dye:white"},
-		{"dye:white","",""},
-		{"dye:white","",""}
-	})
-
-minetest.register_alias("streets:asphalt_outer_edge","streets:mark_solid_white_side_line_corner_on_asphalt")
-
-
-streets.register_label("Solid White Side Line (corner, rotated)","solid_white_side_line_corner_rotated","streets_asphalt_outer_edge.png^[transformR270",{{"streets:mark_solid_white_line_corner"}})
-
-minetest.register_alias("streets:asphalt_outer_edge_r","streets:mark_solid_white_side_line_corner_rotated_on_asphalt")
-
-
-streets.register_label("Parking (white)","white_parking","streets_parking.png",{
-		{"","dye:white","dye:white"},
-		{"","dye:white","dye:white"},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_parking","streets:mark_white_parking_on_asphalt")
-
-
-streets.register_label("White Arrow (straight)","white_arrow_straight","streets_arrow_straight.png",{
-		{"","",""},
-		{"","dye:white",""},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_arrow_straight","streets:mark_white_arrow_straight_on_asphalt")
-
-
-streets.register_label("White Arrow (left)","white_arrow_left","streets_arrow_left.png",{
-		{"","",""},
-		{"dye:white","dye:white",""},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_arrow_left","streets:mark_white_arrow_left_on_asphalt")
-
-
-streets.register_label("White Arrow (right)","white_arrow_right","streets_arrow_right.png",{
-		{"","",""},
-		{"","dye:white","dye:white"},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_arrow_right","streets:mark_white_arrow_right_on_asphalt")
-
-
-streets.register_label("White Arrow (left+straight)","white_arrow_left_straight","streets_arrow_straight_left.png",{
-		{"","dye:white",""},
-		{"dye:white","dye:white",""},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_arrow_straight_left","streets:mark_white_arrow_left_straight_on_asphalt")
-
-
-streets.register_label("White Arrow (straight+right)","white_arrow_straight_right","streets_arrow_straight_right.png",{
-		{"","dye:white",""},
-		{"","dye:white","dye:white"},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_arrow_straight_right","streets:mark_white_arrow_straight_right_on_asphalt")
-
-
-streets.register_label("White Arrow (left+straight+right)","white_arrow_left_straight_right","streets_arrow_alldirs.png",{
-		{"","dye:white",""},
-		{"dye:white","dye:white","dye:white"},
-		{"","dye:white",""}
-	})
-
-minetest.register_alias("streets:asphalt_arrow_alldirs","streets:mark_white_arrow_left_straight_right_on_asphalt")
-
-
---Yellow streetsmod markings
-
-streets.register_label("Solid Yellow Center Line","solid_yellow_center_line","streets_rw_solid_line.png",{
-		{"","dye:yellow",""},
-		{"","dye:yellow",""},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_asphalt_solid","streets:mark_solid_yellow_center_line")
-
-
-streets.register_label("Dashed Yellow Center Line","dashed_yellow_center_line","streets_rw_dashed_line.png",{
-		{"","dye:yellow",""},
-		{"","",""},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_asphalt_dashed","streets:mark_dashed_yellow_center_line")
-
-
-streets.register_label("Yellow X","yellow_x","streets_rw_cross.png",{
-		{"dye:yellow","","dye:yellow"},
-		{"","dye:yellow",""},
-		{"dye:yellow","","dye:yellow"}
-	})
-
-minetest.register_alias("streets:rw_cross","streets:mark_yellow_x")
-
-
-streets.register_label("Solid Yellow Side Line (corner)","solid_yellow_side_line_corner","streets_rw_outer_edge.png",{
-		{"dye:yellow","dye:yellow","dye:yellow"},
-		{"dye:yellow","",""},
-		{"dye:yellow","",""}
-	})
-
-minetest.register_alias("streets:rw_outer_edge","streets:solid_yellow_side_line_corner")
-
-
-streets.register_label("Solid Yellow Side Line (corner,rotated)","solid_yellow_side_line_corner_rotated","streets_rw_outer_edge.png^[transformR270",{{"streets:mark_solid_yellow_side_line_corner"}})
-
-minetest.register_alias("streets:rw_outer_edge","streets:solid_yellow_side_line_corner")
-
-
-streets.register_label("Parking (yellow)","yellow_parking","streets_rw_parking.png",{
-		{"","dye:yellow","dye:yellow"},
-		{"","dye:yellow","dye:yellow"},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_parking","streets:mark_yellow_parking")
-
-
-streets.register_label("Yellow Arrow (straight)","yellow_arrow_straight","streets_rw_arrow_straight.png",{
-		{"","",""},
-		{"","dye:yellow",""},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_straight","streets:mark_yellow_arrow_straight")
-
-
-streets.register_label("Yellow Arrow (left)","yellow_arrow_left","streets_rw_arrow_left.png",{
-		{"","",""},
-		{"dye:yellow","dye:yellow",""},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_left","streets:mark_yellow_arrow_left")
-
-
-streets.register_label("Yellow Arrow (right)","yellow_arrow_right","streets_rw_arrow_right.png",{
-		{"","",""},
-		{"","dye:yellow","dye:yellow"},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_right","streets:mark_yellow_arrow_right")
-
-
-streets.register_label("Yellow Arrow (left+straight)","yellow_arrow_left_straight","streets_rw_arrow_straight_left.png",{
-		{"","dye:yellow",""},
-		{"dye:yellow","dye:yellow",""},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_straight_left","streets:mark_yellow_arrow_left_straight")
-
-
-streets.register_label("Yellow Arrow (straight+right)","yellow_arrow_straight_right","streets_rw_arrow_straight_right.png",{
-		{"","dye:yellow",""},
-		{"","dye:yellow","dye:yellow"},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_straight_right","streets:mark_yellow_arrow_straight_right")
-
-
-streets.register_label("Yellow Arrow (left+straight+right)","yellow_arrow_left_straight_right","streets_rw_arrow_alldirs.png",{
-		{"","dye:yellow",""},
-		{"dye:yellow","dye:yellow","dye:yellow"},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("streets:rw_alldirs","streets:mark_yellow_arrow_left_straight_right")
-
-streets.register_label("Solid Yellow Side Line","solid_yellow_side_line","streets_rw_asphalt_side.png",{
-		{"dye:yellow","",""},
-		{"dye:yellow","",""},
-		{"dye:yellow","",""}
-	})
-
-minetest.register_alias("streets:rw_sideline","streets:mark_solid_yellow_side_line")
-
-streets.register_label("Solid Yellow Side Line (rotated)","solid_yellow_side_line_rotated","streets_rw_asphalt_side.png^[transformR180",{{"streets:mark_solid_yellow_side_line"}})
-
-
---Infrastructure markings
-
-streets.register_label("Solid Yellow Center Line (wide)","solid_yellow_center_line_wide","infrastructure_single_yellow_line.png",{
-		{"","",""},
-		{"dye:yellow","dye:yellow","dye:yellow"},
-		{"","",""}
-	})
-
-minetest.register_alias("infrastructure:asphalt_center_solid_line","streets:mark_solid_yellow_center_line_wide_on_asphalt")
-
-
-streets.register_label("Solid Yellow Center Line (wide,offset)","solid_yellow_center_line_wide_offset","infrastructure_solid_yellow_line_one_side.png",{
-		{"","",""},
-		{"","",""},
-		{"dye:yellow","dye:yellow","dye:yellow"}
-	})
-
-minetest.register_alias("infrastructure:asphalt_center_solid_one_side","streets:mark_solid_yellow_center_line_wide_offset_on_asphalt")
-
-
-streets.register_label("Double Yellow Center Line (wide)","double_yellow_center_line_wide","infrastructure_double_yellow_line.png",{
-		{"dye:yellow","dye:yellow","dye:yellow"},
-		{"","",""},
-		{"dye:yellow","dye:yellow","dye:yellow"}
-	})
-
-minetest.register_alias("infrastructure:asphalt_center_solid_double","streets:mark_double_yellow_center_line_wide_on_asphalt")
-
-
-streets.register_label("Solid Yellow Center Line (wide,corner)","solid_yellow_center_line_wide_corner","infrastructure_single_yellow_line_corner.png",{
-		{"","dye:yellow","dye:yellow"},
-		{"","dye:yellow",""},
-		{"","dye:yellow",""}
-	})
-
-minetest.register_alias("infrastructure:asphalt_center_corner_single","streets:mark_solid_yellow_center_line_wide_corner_on_asphalt")
-
-
-streets.register_label("Double Yellow Center Line (wide,corner)","double_yellow_center_line_wide_corner","infrastructure_solid_double_yellow_line_corner.png",{
-		{"dye:yellow","dye:yellow","dye:yellow"},
-		{"dye:yellow","",""},
-		{"dye:yellow","","dye:yellow"}
-	})
-
-minetest.register_alias("infrastructure:asphalt_center_corner_double","streets:mark_double_yellow_center_line_wide_corner_on_asphalt")
-
-
-minetest.register_alias("infrastructure:asphalt_arrow_straight", "streets:asphalt_arrow_straight")
-
-
-minetest.register_alias("infrastructure:asphalt_arrow_straight_left", "streets:asphalt_arrow_straight_left")
-
-
-minetest.register_alias("infrastructure:asphalt_arrow_straight_right", "streets:asphalt_arrow_straight_left")
-
-
-minetest.register_alias("infrastructure:asphalt_arrow_left", "streets:asphalt_arrow_left")
-
-
-minetest.register_alias("infrastructure:asphalt_arrow_right", "streets:asphalt_arrow_right")
-
-
-minetest.register_alias("infrastructure:asphalt_parking", "streets:asphalt_parking")
diff --git a/streets/labels/textures/infrastructure_double_yellow_line.png b/streets/labels/textures/infrastructure_double_yellow_line.png
deleted file mode 100644
index 3f21c45..0000000
Binary files a/streets/labels/textures/infrastructure_double_yellow_line.png and /dev/null differ
diff --git a/streets/labels/textures/infrastructure_single_yellow_line.png b/streets/labels/textures/infrastructure_single_yellow_line.png
deleted file mode 100644
index a9ca74b..0000000
Binary files a/streets/labels/textures/infrastructure_single_yellow_line.png and /dev/null differ
diff --git a/streets/labels/textures/infrastructure_single_yellow_line_corner.png b/streets/labels/textures/infrastructure_single_yellow_line_corner.png
deleted file mode 100644
index a41d06a..0000000
Binary files a/streets/labels/textures/infrastructure_single_yellow_line_corner.png and /dev/null differ
diff --git a/streets/labels/textures/infrastructure_solid_double_yellow_line_corner.png b/streets/labels/textures/infrastructure_solid_double_yellow_line_corner.png
deleted file mode 100644
index 09a3719..0000000
Binary files a/streets/labels/textures/infrastructure_solid_double_yellow_line_corner.png and /dev/null differ
diff --git a/streets/labels/textures/infrastructure_solid_yellow_line_one_side.png b/streets/labels/textures/infrastructure_solid_yellow_line_one_side.png
deleted file mode 100644
index 0cff2e9..0000000
Binary files a/streets/labels/textures/infrastructure_solid_yellow_line_one_side.png and /dev/null differ
diff --git a/streets/labels/textures/streets_arrow_alldirs.png b/streets/labels/textures/streets_arrow_alldirs.png
deleted file mode 100644
index c31eeaa..0000000
Binary files a/streets/labels/textures/streets_arrow_alldirs.png and /dev/null differ
diff --git a/streets/labels/textures/streets_arrow_left.png b/streets/labels/textures/streets_arrow_left.png
deleted file mode 100644
index d33a5eb..0000000
Binary files a/streets/labels/textures/streets_arrow_left.png and /dev/null differ
diff --git a/streets/labels/textures/streets_arrow_right.png b/streets/labels/textures/streets_arrow_right.png
deleted file mode 100644
index ae6450d..0000000
Binary files a/streets/labels/textures/streets_arrow_right.png and /dev/null differ
diff --git a/streets/labels/textures/streets_arrow_straight.png b/streets/labels/textures/streets_arrow_straight.png
deleted file mode 100644
index d4899b9..0000000
Binary files a/streets/labels/textures/streets_arrow_straight.png and /dev/null differ
diff --git a/streets/labels/textures/streets_arrow_straight_left.png b/streets/labels/textures/streets_arrow_straight_left.png
deleted file mode 100644
index 2f5ddce..0000000
Binary files a/streets/labels/textures/streets_arrow_straight_left.png and /dev/null differ
diff --git a/streets/labels/textures/streets_arrow_straight_right.png b/streets/labels/textures/streets_arrow_straight_right.png
deleted file mode 100644
index 661d4bf..0000000
Binary files a/streets/labels/textures/streets_arrow_straight_right.png and /dev/null differ
diff --git a/streets/labels/textures/streets_asphalt_dashed_line.png b/streets/labels/textures/streets_asphalt_dashed_line.png
deleted file mode 100644
index 5a13fac..0000000
Binary files a/streets/labels/textures/streets_asphalt_dashed_line.png and /dev/null differ
diff --git a/streets/labels/textures/streets_asphalt_outer_edge.png b/streets/labels/textures/streets_asphalt_outer_edge.png
deleted file mode 100644
index 53c1489..0000000
Binary files a/streets/labels/textures/streets_asphalt_outer_edge.png and /dev/null differ
diff --git a/streets/labels/textures/streets_asphalt_side.png b/streets/labels/textures/streets_asphalt_side.png
deleted file mode 100644
index 9edce81..0000000
Binary files a/streets/labels/textures/streets_asphalt_side.png and /dev/null differ
diff --git a/streets/labels/textures/streets_asphalt_side_r.png b/streets/labels/textures/streets_asphalt_side_r.png
deleted file mode 100644
index a067fda..0000000
Binary files a/streets/labels/textures/streets_asphalt_side_r.png and /dev/null differ
diff --git a/streets/labels/textures/streets_asphalt_solid_line.png b/streets/labels/textures/streets_asphalt_solid_line.png
deleted file mode 100644
index 0353aed..0000000
Binary files a/streets/labels/textures/streets_asphalt_solid_line.png and /dev/null differ
diff --git a/streets/labels/textures/streets_parking.png b/streets/labels/textures/streets_parking.png
deleted file mode 100644
index a091ef5..0000000
Binary files a/streets/labels/textures/streets_parking.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_arrow_left.png b/streets/labels/textures/streets_rw_arrow_left.png
deleted file mode 100644
index 6a51a51..0000000
Binary files a/streets/labels/textures/streets_rw_arrow_left.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_arrow_right.png b/streets/labels/textures/streets_rw_arrow_right.png
deleted file mode 100644
index 05f503f..0000000
Binary files a/streets/labels/textures/streets_rw_arrow_right.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_arrow_straight.png b/streets/labels/textures/streets_rw_arrow_straight.png
deleted file mode 100644
index 0c9e613..0000000
Binary files a/streets/labels/textures/streets_rw_arrow_straight.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_arrow_straight_left.png b/streets/labels/textures/streets_rw_arrow_straight_left.png
deleted file mode 100644
index 0429c81..0000000
Binary files a/streets/labels/textures/streets_rw_arrow_straight_left.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_arrow_straight_right.png b/streets/labels/textures/streets_rw_arrow_straight_right.png
deleted file mode 100644
index 02367d7..0000000
Binary files a/streets/labels/textures/streets_rw_arrow_straight_right.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_asphalt_side.png b/streets/labels/textures/streets_rw_asphalt_side.png
deleted file mode 100644
index 83c8a6e..0000000
Binary files a/streets/labels/textures/streets_rw_asphalt_side.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_cross.png b/streets/labels/textures/streets_rw_cross.png
deleted file mode 100644
index a1f34b0..0000000
Binary files a/streets/labels/textures/streets_rw_cross.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_dashed_line.png b/streets/labels/textures/streets_rw_dashed_line.png
deleted file mode 100644
index 4eb211e..0000000
Binary files a/streets/labels/textures/streets_rw_dashed_line.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_dashed_line_crossing.png b/streets/labels/textures/streets_rw_dashed_line_crossing.png
deleted file mode 100644
index bebe4c5..0000000
Binary files a/streets/labels/textures/streets_rw_dashed_line_crossing.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_dashed_line_curve.png b/streets/labels/textures/streets_rw_dashed_line_curve.png
deleted file mode 100644
index 4a59805..0000000
Binary files a/streets/labels/textures/streets_rw_dashed_line_curve.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_dashed_line_tjunction.png b/streets/labels/textures/streets_rw_dashed_line_tjunction.png
deleted file mode 100644
index 144480b..0000000
Binary files a/streets/labels/textures/streets_rw_dashed_line_tjunction.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_outer_edge.png b/streets/labels/textures/streets_rw_outer_edge.png
deleted file mode 100644
index 54f16ea..0000000
Binary files a/streets/labels/textures/streets_rw_outer_edge.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_parking.png b/streets/labels/textures/streets_rw_parking.png
deleted file mode 100644
index aea7fb5..0000000
Binary files a/streets/labels/textures/streets_rw_parking.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_solid_line.png b/streets/labels/textures/streets_rw_solid_line.png
deleted file mode 100644
index 3396d63..0000000
Binary files a/streets/labels/textures/streets_rw_solid_line.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_solid_line_crossing.png b/streets/labels/textures/streets_rw_solid_line_crossing.png
deleted file mode 100644
index 4f911ed..0000000
Binary files a/streets/labels/textures/streets_rw_solid_line_crossing.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_solid_line_curve.png b/streets/labels/textures/streets_rw_solid_line_curve.png
deleted file mode 100644
index 596983c..0000000
Binary files a/streets/labels/textures/streets_rw_solid_line_curve.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_solid_line_tjunction.png b/streets/labels/textures/streets_rw_solid_line_tjunction.png
deleted file mode 100644
index e6d11e7..0000000
Binary files a/streets/labels/textures/streets_rw_solid_line_tjunction.png and /dev/null differ
diff --git a/streets/labels/textures/streets_rw_transparent.png b/streets/labels/textures/streets_rw_transparent.png
deleted file mode 100644
index 9f466f4..0000000
Binary files a/streets/labels/textures/streets_rw_transparent.png and /dev/null differ
diff --git a/streets/license.txt b/streets/license.txt
deleted file mode 100644
index fa53ac9..0000000
--- a/streets/license.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-    "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-    "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-    "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-    "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-    "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-    "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-    "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-    "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-    "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-    "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-    "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-    to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-    to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-    to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-    to Distribute and Publicly Perform Adaptations.
-
-    For the avoidance of doubt:
-        Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-        Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-        Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-    You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-    You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-    If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-    Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-    This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-    Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-    Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-    Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-    If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-    No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-    This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-    The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
diff --git a/streets/manholes/depends.txt b/streets/manholes/depends.txt
deleted file mode 100644
index 48ef5e1..0000000
--- a/streets/manholes/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-streetsmod
\ No newline at end of file
diff --git a/streets/manholes/init.lua b/streets/manholes/init.lua
deleted file mode 100644
index b9a2f40..0000000
--- a/streets/manholes/init.lua
+++ /dev/null
@@ -1,88 +0,0 @@
---[[
-	StreetsMod: Manholes in asphalt
-]]
-minetest.register_node(":streets:manhole",{
-	description = streets.S("Simple manhole"),
-	tiles = {"streets_asphalt.png^streets_manhole.png","streets_asphalt.png"},
-	groups	= {cracky=3}
-})
-
-minetest.register_node(":streets:manhole_adv_closed",{
-	description = streets.S("Advanced manhole"),
-	tiles = {"streets_asphalt.png^streets_manhole_advanced.png","streets_asphalt.png"},
-	groups = {cracky=3},
-	drawtype = "nodebox",
-	paramtype = "light",
-	sunlight_propagates = true,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			--Walls
-			{-0.5,-0.5,-0.5,-0.3,0.5,0.5},
-			{-0.5,-0.5,-0.5,0.5,0.5,-0.3},
-			{0.3,-0.5,-0.5,0.5,0.5,0.5},
-			{-0.5,-0.5,0.3,0.5,0.5,0.5},
-			--Cover
-			{-0.5,0.4,-0.1,0.5,0.5,0.1},
-			{-0.1,0.4,-0.5,0.1,0.5,0.5},
-			{-0.2,0.4,-0.2,0.2,0.5,0.2}
-		}
-	},
-	selection_box = {
-		type = "regular",
-	},
-	on_rightclick = function(pos,node,clicker)
-		minetest.set_node(pos,{name="streets:manhole_adv_open"})
-	end
-})
-minetest.register_node(":streets:manhole_adv_open",{
-	description = streets.S("Advanced manhole"),
-	tiles = {"streets_asphalt.png^streets_manhole_advanced.png","streets_asphalt.png"},
-	groups = {cracky=3,not_in_creative_inventory=1},
-	drawtype = "nodebox",
-	paramtype = "light",
-	drop = "streets:manhole_adv_closed",
-	climbable = true,
-	walkable = false,
-	sunlight_propagates = true,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			--Walls
-			{-0.5,-0.5,-0.5,-0.3,0.5,0.5},
-			{-0.5,-0.5,-0.5,0.5,0.5,-0.3},
-			{0.3,-0.5,-0.5,0.5,0.5,0.5},
-			{-0.5,-0.5,0.3,0.5,0.5,0.5},
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			--Walls
-			{-0.5,-0.5,-0.5,-0.3,0.5,0.5},
-			{-0.5,-0.5,-0.5,0.5,0.5,-0.3},
-			{0.3,-0.5,-0.5,0.5,0.5,0.5},
-			{-0.5,-0.5,0.3,0.5,0.5,0.5},
-		}
-	},
-	on_rightclick = function(pos,node,clicker)
-		minetest.set_node(pos,{name="streets:manhole_adv_closed"})
-	end
-})
-
-minetest.register_craft({
-	output = "streets:manhole_adv_closed 2",
-	recipe = {
-		{"streets:asphalt", "default:steel_ingot", "streets:asphalt"},
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"streets:asphalt", "default:steel_ingot", "streets:asphalt"}
-	}
-})
-minetest.register_craft({
-	output = "streets:manhole 3",
-	recipe = {
-		{"streets:asphalt", "streets:asphalt", "streets:asphalt"},
-		{"streets:asphalt", "default:steel_ingot", "streets:asphalt"},
-		{"streets:asphalt", "streets:asphalt", "streets:asphalt"}
-	}
-})
\ No newline at end of file
diff --git a/streets/modpack.txt b/streets/modpack.txt
deleted file mode 100644
index 48abf62..0000000
--- a/streets/modpack.txt
+++ /dev/null
@@ -1 +0,0 @@
-This file indicates that the current folder is a modpack. Please also read readme.txt for more information.
\ No newline at end of file
diff --git a/streets/readme.txt b/streets/readme.txt
deleted file mode 100644
index 7d2f32d..0000000
Binary files a/streets/readme.txt and /dev/null differ
diff --git a/streets/roadsigns/depends.txt b/streets/roadsigns/depends.txt
deleted file mode 100644
index e088256..0000000
--- a/streets/roadsigns/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-streetsmod?
diff --git a/streets/roadsigns/init.lua b/streets/roadsigns/init.lua
deleted file mode 100644
index e44b68a..0000000
--- a/streets/roadsigns/init.lua
+++ /dev/null
@@ -1,42 +0,0 @@
---[[
-	StreetsMod: Poles and signs
-]]
-streets.workshop = {}
-
-streets.workshop.register_sign  = function(nodename, desc, img, rrecipe, rtime)
-	
-	minetest.register_node(nodename,{
-		description = desc,
-		tiles = {img},
-		inventory_image = img,
-		wield_image = img,
-		groups = {snappy = 1,attached_node = 1},
-		on_construct = function(pos)
-			local meta = minetest.get_meta(pos)
-			meta:set_string("infotext", desc)
-		end,
-		drawtype = "nodebox",
-		node_box = {
-		type = "wallmounted",
-		fixed = {
-		{-0.4,-0.5,-0.4,0.4,-0.4,0.4}
-		}
-		},
-		paramtype = "light",
-		paramtype2 = "wallmounted",
-		walkable = false,
-		sunlight_propagates = true,
-		selection_box = {
-		type = "wallmounted"
-		},
-		streets = {
-		signworkshop = {
-		recipe = rrecipe,
-		time = rtime
-		}
-		}
-	})
-end
-
-dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/signs.lua")
-dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/workshop.lua")
diff --git a/streets/roadsigns/signs.lua b/streets/roadsigns/signs.lua
deleted file mode 100644
index 9b8b129..0000000
--- a/streets/roadsigns/signs.lua
+++ /dev/null
@@ -1,17 +0,0 @@
--- example: streets.workshop.register_sign(nodename, desc, img, recipe, time)
-streets.workshop.register_sign(":streets:sign_blank", streets.S("Empty sign"), "streets_sign_back.png", {"default:steel_ingot","","",""}, 3)
-
-streets.workshop.register_sign(":streets:sign_lava", streets.S("Warning sign (lava)"), "streets_sign_lava.png", {"streets:sign_blank","bucket:bucket_lava","",""}, 5)
-
-streets.workshop.register_sign(":streets:sign_water", streets.S("Warning sign (water)"), "streets_sign_water.png", {"streets:sign_blank","bucket:bucket_water","",""}, 5)
-
-streets.workshop.register_sign(":streets:sign_construction", streets.S("Warning sign (Construction area)"), "streets_sign_construction.png", {"streets:sign_blank","default:dirt","",""}, 5)
-
-
-streets.workshop.register_sign(":streets:sign_mine", streets.S("Notice sign (Public Mine Ahead)"), "streets_sign_mine.png", {"streets:sign_blank","default:dirt","",""}, 5)
-
-streets.workshop.register_sign(":streets:sign_shop", streets.S("Notice sign (Shop/Mall Ahead)"), "streets_sign_shop.png", {"streets:sign_blank","default:dirt","",""}, 5)
-
-streets.workshop.register_sign(":streets:sign_workshop", streets.S("Notice sign (Public Workshop Ahead)"), "streets_sign_workshop.png", {"streets:sign_blank","default:dirt","",""}, 5)
-
-streets.workshop.register_sign(":streets:sign_grasswalk", streets.S("Warning sign (No walking on the grass)"), "streets_sign_grasswalk.png", {"streets:sign_blank","default:dirt","",""}, 5)
diff --git a/streets/roadsigns/workshop.lua b/streets/roadsigns/workshop.lua
deleted file mode 100644
index c11b167..0000000
--- a/streets/roadsigns/workshop.lua
+++ /dev/null
@@ -1,158 +0,0 @@
---[[
-	StreetsMod: Create signs in the signworkshop
-]]
-local forms = {
-	inactive = {
-		"size[12,10]",
-		"label[3.5,0;"..streets.S("Sign workshop - Create signs for your roads!").."]",
-		"label[0,0.5;"..streets.S("Available signs:").."]",
-		"list[context;streets:signworkshop_list;0,1;5,4]",
-		"label[9,0.5;"..streets.S("Needed stuff:").."]",
-		"list[context;streets:signworkshop_recipe;8,1;4,1]",
-		"label[9,2;"..streets.S("Put it here:").."]",
-		"list[context;streets:signworkshop_input;8,3;4,1]",
-		"button[8,4;2,1;streets:signworkshop_send;"..streets.S("Start!").."]",
-		"label[5.8,0.5;"..streets.S("Selected:").."]",
-		"list[context;streets:signworkshop_select;6,1;1,1]",
-		"label[5.8,2.5;"..streets.S("Output:").."]",
-		"list[context;streets:signworkshop_output;6,3;1,1]",
-		"list[current_player;main;2,6;8,1]",
-		"list[current_player;main;2,7.25;8,3;8]",
-		default.gui_bg,
-		default.gui_bg_img,
-		default.gui_slots,
-		default.get_hotbar_bg(2, 6)
-	},
-	active = {
-		"size[12,10]",
-		"label[3.5,0;"..streets.S("Sign workshop - Create signs for your roads!").."]",
-		"label[0,0.5;"..streets.S("Available signs:").."]",
-		"list[context;streets:signworkshop_list;0,1;5,4]",
-		"label[9,0.5;"..streets.S("Needed stuff:").."]",
-		"list[context;streets:signworkshop_recipe;8,1;4,1]",
-		"label[9,2;"..streets.S("Put it here:").."]",
-		"list[context;streets:signworkshop_input;8,3;4,1]",
-		"label[5.8,0.5;"..streets.S("Selected:").."]",
-		"list[context;streets:signworkshop_select;6,1;1,1]",
-		"label[5.8,2.5;"..streets.S("Output:").."]",
-		"list[context;streets:signworkshop_output;6,3;1,1]",
-		"list[current_player;main;2,6;8,1]",
-		"list[current_player;main;2,7.25;8,3;8]",
-		default.gui_bg,
-		default.gui_bg_img,
-		default.gui_slots,
-		default.get_hotbar_bg(2, 6),
-		--
-	}
-}
-
-streets.workshop.signs = {}
-minetest.after(0, function()
-	for k, v in pairs(minetest.registered_nodes) do
-		if v.streets and v.streets.signworkshop then
-			table.insert(streets.workshop.signs, k)
-		end
-	end
-end)
-
-minetest.register_node(":streets:signworkshop",{
-	description = streets.S("Sign workshop"),
-	tiles = {"streets_signworkshop_top.png","streets_signworkshop_bottom.png","streets_signworkshop_side.png","streets_signworkshop_side.png","streets_signworkshop_side.png","streets_signworkshop_front.png"},
-	groups = {cracky = 1, level = 2},
-	paramtype2 = "facedir",
-	after_place_node = function(pos)
-		minetest.get_meta(pos):set_string("formspec",table.concat(forms.inactive))
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		inv:set_size("streets:signworkshop_list",5*4)
-		inv:set_size("streets:signworkshop_recipe",3*2)
-		inv:set_size("streets:signworkshop_input",4*1)
-		inv:set_size("streets:signworkshop_select",1*1)
-		inv:set_size("streets:signworkshop_output",1*1)
-		-- Fill
-		for k, v in pairs(streets.workshop.signs) do
-			inv:add_item("streets:signworkshop_list", v)
-		end
-		-- Meta
-		meta:set_string("infotext",streets.S("Sign workshop idle"))
-		meta:set_string("idle","y")
-	end,
-	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		if listname ~= "streets:signworkshop_input" then
-			return 0
-		else
-			return 1
-		end
-	end,
-	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-		-- Move items inside input slots
-		if to_list == "streets:signworkshop_input" and from_list == "streets:signworkshop_input" then
-			return 1
-		-- List -> selection
-		elseif from_list == "streets:signworkshop_list" and to_list == "streets:signworkshop_select" then
-			local inv = minetest.get_meta(pos):get_inventory()
-			local selected = inv:get_stack("streets:signworkshop_list",from_index):to_table()
-			local need = minetest.registered_nodes[selected.name].streets.signworkshop.recipe
-			inv:set_list("streets:signworkshop_recipe",{need[1],need[2],need[3],need[4]})
-			return 1
-		-- selection -> list
-		elseif from_list == "streets:signworkshop_select" and to_list == "streets:signworkshop_list" then
-			local inv = minetest.get_meta(pos):get_inventory()
-			inv:set_list("streets:signworkshop_recipe",{"","","",""})
-			return 1
-		-- Every other case
-		else
-			return 0
-		end
-	end,
-	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		if listname == "streets:signworkshop_input" or listname == "streets:signworkshop_output" then
-			return 99
-		else
-			return 0
-		end
-	end,
-	on_receive_fields = function(pos, formname, fields, sender)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-		--
-		if inv:is_empty("streets:signworkshop_input") ~= true and inv:is_empty("streets:signworkshop_select") ~= true and meta:get_string("idle") == "y" then
-			local selection = inv:get_stack("streets:signworkshop_select",1):get_name()
-			local def = minetest.registered_nodes[selection].streets.signworkshop
-			local need = inv:get_list("streets:signworkshop_recipe")
-			local has = inv:get_list("streets:signworkshop_input")
-			for k, v in pairs(need) do
-				need[k] = need[k]:to_table()
-				if need[k] == nil then need[k] = { name = "" } end
-			end
-			for k, v in pairs(has) do
-				has[k] = has[k]:to_table()
-				if has[k] == nil then has[k] = { name = "" } end
-			end
-			if need[1].name == has[1].name and need[2].name == has[2].name and need[3].name == has[3].name and need[4].name == has[4].name then
-				meta:set_string("infotext",streets.S("Sign workshop working"))
-				meta:set_string("idle","n")
-				meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;"..streets.S("Please wait %s seconds..."):format(def.time).."]")
-				-- Clear input
-				inv:set_list("streets:signworkshop_input",{"","","",""})
-				minetest.after(def.time,function()
-					-- Reset infotext and meta
-					meta:set_string("infotext",streets.S("Sign workshop idle"))
-					meta:set_string("idle","y")
-					meta:set_string("formspec",table.concat(forms.inactive))
-					-- Fill output
-					inv:add_item("streets:signworkshop_output",selection)
-				end)
-			end
-		end
-	end
-})
-
-minetest.register_craft({
-	output = "streets:signworkshop",
-	recipe = {
-		{"default:steel_ingot","default:glass","default:steel_ingot"},
-		{"default:steel_ingot","default:diamond","default:steel_ingot"},
-		{"default:cobble","default:cobble","default:cobble"}
-	}
-})
diff --git a/streets/screenshot.png b/streets/screenshot.png
deleted file mode 100644
index d9bf232..0000000
Binary files a/streets/screenshot.png and /dev/null differ
diff --git a/streets/steelsupport/depends.txt b/streets/steelsupport/depends.txt
deleted file mode 100644
index 48ef5e1..0000000
--- a/streets/steelsupport/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-streetsmod
\ No newline at end of file
diff --git a/streets/steelsupport/init.lua b/streets/steelsupport/init.lua
deleted file mode 100644
index 56cc084..0000000
--- a/streets/steelsupport/init.lua
+++ /dev/null
@@ -1,20 +0,0 @@
---[[
-	StreetsMod: Steel support for hanging signs on highways etc.
-]]
-minetest.register_node(":streets:steel_support",{
-	description = streets.S("Steel support"),
-	tiles = {"streets_support.png"},
-	groups = {cracky = 1},
-	drawtype = "glasslike_framed",
-	climbable = true,
-	sunlight_propagates = true,
-	paramtype = "light",
-})
-minetest.register_craft({
-	output = "streets:steel_support 5",
-	recipe = {
-		{"default:steel_ingot","","default:steel_ingot"},
-		{"","default:steel_ingot",""},
-		{"default:steel_ingot","","default:steel_ingot"}
-	}
-})
\ No newline at end of file
diff --git a/streets/streetlamps/depends.txt b/streets/streetlamps/depends.txt
deleted file mode 100644
index f507470..0000000
--- a/streets/streetlamps/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-default
-streetsmod
-mesecons?
\ No newline at end of file
diff --git a/streets/streetlamps/init.lua b/streets/streetlamps/init.lua
deleted file mode 100644
index fa99824..0000000
--- a/streets/streetlamps/init.lua
+++ /dev/null
@@ -1,128 +0,0 @@
---[[
-	StreetsMod: Streetlamps
-]]
---[[minetest.register_node(":streets:streetlamp_basic_controller",{
-	description = streets.S("Trafficlight"),
-	tiles = {"streets_lampcontroller_top.png","streets_lampcontroller_bottom.png","streets_lampcontroller_sides.png"},
-	groups = {cracky = 1, not_in_creative_inventory = 1},
-	drawtype = "nodebox",
-	paramtype = "light",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,-0.5,-0.5,0.5,0.5,0.5},
-			{-0.05,0.5,-0.05,0.05,1.6,0.05}
-		}
-	},
-	selection_box = 	{
-		type = "fixed",
-		fixed = {
-			{-0.5,-0.5,-0.5,0.5,0.5,0.5},
-			{-0.3,1.5,-0.3,0.3,4.5,0.3}
-		}
-	},
-	mesecons = {
-		effector = {
-			action_on = function(pos,node)
-				minetest.set_node({x = pos.x, y = pos.y + 4, z = pos.z},{name = "streets:streetlamp_basic_top_on"})
-			end,
-			action_off = function(pos,node)
-				minetest.set_node({x = pos.x, y = pos.y + 4, z = pos.z},{name = "streets:streetlamp_basic_top_off"})
-			end
-		}
-	},
-	after_dig_node = function(pos)
-		minetest.remove_node({x = pos.x, y = pos.y + 2, z = pos.z})
-		minetest.remove_node({x = pos.x, y = pos.y + 3, z = pos.z})
-		minetest.remove_node({x = pos.x, y = pos.y + 4, z = pos.z})
-		minetest.chat_send_all("!!!")
-	end
-})]]
-
-minetest.register_node(":streets:streetlamp_basic_bottom",{
-	drop = "",
-	description = streets.S("Street lamp"),
-	tiles = {"streets_lamps_basic_bottom.png"},
-	inventory_image = "streets_lamps_basi_inv.png",
-	groups = {cracky = 1},
-	paramtype = "light",
-	drawtype = "nodebox",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.15,-0.5,-0.15,0.15,0.4,0.15},
-			{-0.1,0.4,-0.1,0.1,0.5,0.1}
-		}
-	},
-	pointable = false,
-	after_place_node = function(pos,placer,itemstack)
-		minetest.set_node({x = pos.x, y = pos.y + 1, z = pos.z},{name = "streets:streetlamp_basic_middle"})
-		minetest.set_node({x = pos.x, y = pos.y + 2, z = pos.z},{name = "streets:streetlamp_basic_top_on"})
-		-- minetest.set_node({x = pos.x, y = pos.y - 2, z = pos.z},{name = "streets:streetlamp_basic_controller"})
-	end
-})
-minetest.register_node(":streets:streetlamp_basic_middle",{
-	drop = "",
-	description = streets.S("U cheater U"),
-	groups = {cracky = 1, not_in_creative_inventory = 1},
-	tiles = {"streets_lamps_basic_middle.png"},
-	paramtype = "light",
-	drawtype = "nodebox",
-	pointable = false,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.1,-0.5,-0.1,0.1,0.5,0.1}
-		}
-	}
-})
---[[minetest.register_node(":streets:streetlamp_basic_top_off",{
-	drop = "",
-	description = streets.S("U cheater U"),
-	groups = {cracky = 1, not_in_creative_inventory = 1},
-	paramtype = "light",
-	drawtype = "nodebox",
-	pointable = false,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.1,-0.5,-0.1,0.1,-0.4,0.1},
-			{-0.3,-0.4,-0.3,0.3,0.5,0.3}
-		}
-	}
-})]]
-minetest.register_node(":streets:streetlamp_basic_top_on",{
-	drop = "streets:streetlamp_basic_bottom",
-	description = streets.S("U cheater U"),
-	groups = {cracky = 1, not_in_creative_inventory = 1},
-	tiles = {"streets_lamps_basic_top_top.png","streets_lamps_basic_top_top.png","streets_lamps_basic_top.png","streets_lamps_basic_top.png","streets_lamps_basic_top.png","streets_lamps_basic_top.png"},
-	paramtype = "light",
-	drawtype = "nodebox",
-	light_source = 10,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.1,-0.5,-0.1,0.1,-0.4,0.1},
-			{-0.3,-0.4,-0.3,0.3,0.5,0.3}
-		}
-	},
-	selection_box = 	{
-		type = "fixed",
-		fixed = {
-			{-0.3,0.5,-0.3,0.3,-2.5,0.3},
-		}
-	},
-	after_dig_node = function(pos)
-		minetest.remove_node({x = pos.x, y = pos.y - 1, z = pos.z})
-		minetest.remove_node({x = pos.x, y = pos.y - 2, z = pos.z})
-	end
-})
-
-minetest.register_craft({
-	output = "streets:streetlamp_basic_bottom",
-	recipe = {
-		{"default:glass","default:torch","default:glass"},
-		{"","streets:bigpole",""},
-		{"","streets:bigpole",""}
-	}
-})
diff --git a/streets/streetsawards/depends.txt b/streets/streetsawards/depends.txt
deleted file mode 100644
index 42d368b..0000000
--- a/streets/streetsawards/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-streetsmod
-awards?
\ No newline at end of file
diff --git a/streets/streetsawards/init.lua b/streets/streetsawards/init.lua
deleted file mode 100644
index fedc768..0000000
--- a/streets/streetsawards/init.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-if streets.extendedBy.awards == true then
-	awards.register_achievement("award_countryroads",{
-		title = "Roadbuilder",
-		description = "You built some quite big roads!",
-		icon = "novicebuilder.png",
-		trigger =	{
-			type = "place",
-			node = "streets:asphalt",
-			target = 175,
-		},
-	})
-	awards.register_achievement("award_underworld",{
-		title = "Start your sewers!",
-		description = "You placed your first manhole! Did you know that you can open it with a right-click?",
-		icon = "novicebuilder.png",
-		trigger =	{
-			type = "place",
-			node = "streets:manhole_adv_closed",
-			target = 1,
-		},
-	})
-end
\ No newline at end of file
diff --git a/streets/streetsconcrete/depends.txt b/streets/streetsconcrete/depends.txt
deleted file mode 100644
index 48ef5e1..0000000
--- a/streets/streetsconcrete/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-streetsmod
\ No newline at end of file
diff --git a/streets/streetsconcrete/init.lua b/streets/streetsconcrete/init.lua
deleted file mode 100644
index cb29ee9..0000000
--- a/streets/streetsconcrete/init.lua
+++ /dev/null
@@ -1,156 +0,0 @@
---[[
-	StreetsMod: Concrete, Concrete wall (flat), Concrete wall (full)
-]]
-if streets.extendedBy.technic == true then 
-	minetest.register_alias("streets:concrete","technic:concrete")
-	-- Use technic's concrete block for the seperating wall
-	minetest.register_node(":streets:concrete_wall",{
-		description = streets.S("Concrete wall"),
-		tiles = {"technic_concrete_block.png"},
-		groups = {cracky=2},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.4, -0.5, -0.5, 0.4, -0.4, 0.5},
-				{-0.1, -0.4, -0.5, 0.1, 0.5, 0.5}
-			}
-		}
-	})
-	minetest.register_craft({
-		output = "streets:concrete_wall 3",
-		recipe = {
-			{"","technic:concrete",""},
-			{"","technic:concrete",""},
-			{"technic:concrete","technic:concrete","technic:concrete"}
-		}
-	})
-	minetest.register_node(":streets:concrete_wall_flat",{
-		description = streets.S("Concrete wall"),
-		tiles = {"technic_concrete_block.png"},
-		groups = {cracky=2},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.1, -0.5, -0.5, 0.1, 0.5, 0.5}
-			}
-		}
-	})
-	minetest.register_craft({
-		output = "streets:concrete_wall_flat 3",
-		recipe = {
-			{"","technic:concrete",""},
-			{"","technic:concrete",""},
-			{"","",""}
-		}
-	})
-elseif streets.extendedBy.prefab then
-	minetest.register_alias("streets:concrete","prefab:concrete")
-	minetest.register_node(":streets:concrete_wall",{
-		description = streets.S("Concrete wall"),
-		tiles = {"prefab_concrete.png"},
-		groups = {cracky=2},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.4, -0.5, -0.5, 0.4, -0.4, 0.5},
-				{-0.1, -0.4, -0.5, 0.1, 0.5, 0.5}
-			}
-		}
-	})
-	minetest.register_craft({
-		output = "streets:concrete_wall 3",
-		recipe = {
-			{"","streets:concrete",""},
-			{"","streets:concrete",""},
-			{"streets:concrete","streets:concrete","streets:concrete"}
-		}
-	})
-	minetest.register_node(":streets:concrete_wall_flat",{
-		description = streets.S("Concrete wall"),
-		tiles = {"prefab_concrete.png"},
-		groups = {cracky=2},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.1, -0.5, -0.5, 0.1, 0.5, 0.5}
-			}
-		}
-	})
-	minetest.register_craft({
-		output = "streets:concrete_wall_flat 3",
-		recipe = {
-			{"","streets:concrete",""},
-			{"","streets:concrete",""},
-			{"","",""}
-		}
-	})
-else
-	-- Register concrete block with streets' texture and then the seperating wall
-	minetest.register_node(":streets:concrete",{
-		description = streets.S("Concrete"),
-		tiles = {"streets_concrete.png"},
-		groups = {cracky=2}
-	})
-	minetest.register_node(":streets:concrete_wall",{
-		description = streets.S("Concrete wall"),
-		tiles = {"streets_concrete.png"},
-		groups = {cracky=2},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.4, -0.5, -0.5, 0.4, -0.4, 0.5},
-				{-0.1, -0.4, -0.5, 0.1, 0.5, 0.5}
-			}
-		}
-	})
-	minetest.register_craft({
-		output = "streets:concrete_wall 3",
-		recipe = {
-			{"","streets:concrete",""},
-			{"","streets:concrete",""},
-			{"streets:concrete","streets:concrete","streets:concrete"}
-		}
-	})
-	minetest.register_node(":streets:concrete_wall_flat",{
-		description = streets.S("Concrete wall"),
-		tiles = {"streets_concrete.png"},
-		groups = {cracky=2},
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-0.1, -0.5, -0.5, 0.1, 0.5, 0.5}
-			}
-		}
-	})
-	minetest.register_craft({
-		output = "streets:concrete_wall_flat 3",
-		recipe = {
-			{"","streets:concrete",""},
-			{"","streets:concrete",""},
-			{"","",""}
-		}
-	})
-	minetest.register_craft({
-		type = "shapeless",
-		output = "streets:concrete",
-		recipe = {"default:stone"}
-	})
-end
diff --git a/streets/streetshotfix/depends.txt b/streets/streetshotfix/depends.txt
deleted file mode 100644
index 421a27d..0000000
--- a/streets/streetshotfix/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-streetsmod
\ No newline at end of file
diff --git a/streets/streetshotfix/init.lua b/streets/streetshotfix/init.lua
deleted file mode 100644
index d9511c2..0000000
--- a/streets/streetshotfix/init.lua
+++ /dev/null
@@ -1,9 +0,0 @@
---[[
-	StreetsMod Hotfixes in order of creation, signed with date
-]]
--- Hotfix #1; April 14, 2014; https://github.com/webdesigner97/streets/issues/11
-minetest.register_alias("stairs:stair_asphalt","streets:stair_asphalt")
-
--- Hotfix #2; June 27, 2014; https://github.com/webdesigner97/streets/issues/25
-minetest.register_alias("streets:asphalt_stair","streets:stair_asphalt")
-minetest.register_alias("streets:asphalt_slab","streets:slab_asphalt")
\ No newline at end of file
diff --git a/streets/streetsmod/depends.txt b/streets/streetsmod/depends.txt
deleted file mode 100644
index e61e529..0000000
--- a/streets/streetsmod/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-default
-intllib?
-smartfs?
diff --git a/streets/streetsmod/forms.lua b/streets/streetsmod/forms.lua
deleted file mode 100644
index c636c85..0000000
--- a/streets/streetsmod/forms.lua
+++ /dev/null
@@ -1,4 +0,0 @@
--- Form for chatcommand /streets
-	streets.forms.chatcmd = smartfs.create("streets:chatcmd", function(state)
-		state:load(streets.modpath .. "/forms/cmd_streets.smartfs")
-	end)
\ No newline at end of file
diff --git a/streets/streetsmod/forms/cmd_streets.smartfs b/streets/streetsmod/forms/cmd_streets.smartfs
deleted file mode 100644
index 3dbd29c..0000000
--- a/streets/streetsmod/forms/cmd_streets.smartfs
+++ /dev/null
@@ -1 +0,0 @@
-return { ["ele"] = { ["streets:chatcmd_version"] = { ["type"] = "label", ["pos"] = { ["y"] = 1, ["x"] = 6.5 }, ["name"] = "streets:chatcmd_version", ["value"] = "Running version: 1.4.4dev" }, ["streets:chatcmd_guibg"] = { ["type"] = "code", ["name"] = "streets:chatcmd_guibg", ["code"] = "bgcolor[#080808BB;true]background[5,5;1,1;gui_formbg.png;true]" }, ["streets:chatcmd_modlist"] = { ["pos"] = { ["y"] = 1, ["x"] = 0 }, ["size"] = { ["h"] = 5, ["w"] = 6 }, ["type"] = "list", ["name"] = "streets:chatcmd_modlist", ["items"] = { "digilines installed: false", "mesecons installed: false", "moreblocks installed: false", "wool installed: true", "technic installed: false", "prefab installed: false", "awards installed: false" } } }, ["size"] = { ["h"] = 6, ["w"] = 10 } }
\ No newline at end of file
diff --git a/streets/streetsmod/init.lua b/streets/streetsmod/init.lua
deleted file mode 100644
index c9b78b6..0000000
--- a/streets/streetsmod/init.lua
+++ /dev/null
@@ -1,89 +0,0 @@
---[[
-	StreetsMod 1.5 by webdesigner97:
-		License : CC-BY-SA 3.0 Unported (see license.txt)
-		Readme	: see readme.txt
-		Forum	: http://bit.ly/12cPMeo
-		Depends	: default
-]]
-streets	= {}
-
--- Kaeza intllib
-	-- Boilerplate to support localized strings if intllib mod is installed.
-	if minetest.get_modpath("intllib") then
-		streets.S = intllib.Getter()
-	else
-		streets.S = function(s) return s end
-	end
-	
--- Create variable and tables
-	print("Streets: " .. streets.S("Creating variables and tables..."))
-	streets.version	= "1.5"
-	streets.modpath = minetest.get_modpath("streetsmod")
-	streets.extendedBy	= {}
-	streets.load = {
-		start = os.clock(),
-		fin = 0
-	}
-	streets.forms = {}
-
--- rubenwardy: smartfs
-	if not minetest.get_modpath("smartfs") then
-		dofile(streets.modpath .. "/libs/smartfs/smartfs.lua")
-	end
-	
--- Load forms
-	dofile(streets.modpath .. "/forms.lua")
-	
--- Check for mods which change this mod's beahaviour
-	print("Streets: " .. streets.S("Checking installed mods..."))
-	if minetest.get_modpath("wool")	 then
-		streets.extendedBy.wool = true
-	else
-		streets.extendedBy.wool = false
-	end
-	if minetest.get_modpath("technic")	then
-		streets.extendedBy.technic = true
-	else
-		streets.extendedBy.technic = false
-	end
-	if minetest.get_modpath("moreblocks") then
-		streets.extendedBy.moreblocks = true
-	else
-		streets.extendedBy.moreblocks = false
-	end
-	if minetest.get_modpath("mesecons") then
-		streets.extendedBy.mesecons = true
-	else
-		streets.extendedBy.mesecons = false
-	end
-	if minetest.get_modpath("digilines") then
-		streets.extendedBy.digilines = true
-	else
-		streets.extendedBy.digilines = false
-	end
-	if minetest.get_modpath("prefab") then
-		streets.extendedBy.prefab = true
-	else
-		streets.extendedBy.prefab = false
-	end
-	if minetest.get_modpath("awards") then
-		streets.extendedBy.awards = true
-	else
-		streets.extendedBy.awards = false
-	end
-	
--- Streets chatcommand
-	local function round(num, idp)
-		local mult = 10^(idp or 0)
-		return math.floor(num * mult + 0.5) / mult
-	end
-	minetest.register_chatcommand("streets",{
-		description = streets.S("Check version of your installed StreetsMod and find information"),
-		func = function(name,param)
-			streets.forms.chatcmd:show(name);
-		end
-	})
-	
--- Done	
-	print("Streets: " .. streets.S("Setup completed, have fun with StreetsMod") .. " " .. streets.version .. "!")
-	streets.load.fin = os.clock()
diff --git a/streets/streetsmod/libs/smartfs/README.md b/streets/streetsmod/libs/smartfs/README.md
deleted file mode 100644
index df0e166..0000000
--- a/streets/streetsmod/libs/smartfs/README.md
+++ /dev/null
@@ -1,88 +0,0 @@
-smartfs
-=======
-
-This mod provides a 2nd generation way of creating forms - this means that the modder does not need to worry about complex formspec strings
-
-* Expandable: you can register your own elements to use on the form.
-* Easy event handling: use binding to handle events.
-* New elements: Includes a toggle button
-
-License: WTFPL
-To install this library, place the smartfs.lua file in your mod and then include it (dofile).
-There is an init.lua file in the download that shows you how to do this.
-
-#Using Smart Formspec
-Smartfs provides 2nd generation Minetest forms to replace clunky formspec strings. Each smartfs form is a container filled with GUI elements. A number of default elements are included with smartfs, but modders can also define their own custom elements. This document describes the basic usage of the smartfs API.
-
-##Installation
-Smartfs can be used as a library or a mod.
-
-To use smartfs as a library, copy the smartfs.lua file to your mod folder and add
-    dofile(minetest.get\_modpath(minetest.get\_current\_modname()).."/smartfs.lua")
-to the top of any files that use it.
-
-To use smartfs as a mod, add it to your game's mods folder or to the user mods folder and enable it.
-
-## Creating and showing forms
-A form is a rectangular area of the screen upon which all elements are placed. Use the smartfs.create() function to create a new form. This function takes two arguments and returns a form object.
-
-The first argument is a unique string that identifies the form. The second argument is a function that should take a single argument called state which is used to set form properties like size and background color. State also has constructors for all form elements and can be used with state:element_name. Below is a quick example.
-
-    myform = smartfs.create("My Form",function(state)
-        --sets the form's size
-        -- (width, hieght)
-        state:size(5,5)
-
-        --creates a label and places it on the form
-        --(x-pos, y-pos, name, text)
-        state:label(3,3,"label1", "A label!")
-    end)
-
-Forms can be shown to the player by using the show(target) function. The target argument is the name of the player that will see the form.
-
-    myform:show("singleplayer")
-
-Here is a list of steps the library takes.
-* You create a new form using smartfs.create().
-* The form is registered and stored for later use.
-* You show a form to a player using the myform:show()
-* The state is created and stored.
-* The function in smartfs.create runs and creates the elements.
-* The form is displayed to the player.
-
-## Modifying Elements
-Elements have functions of the form element:function(args) where you need to have access to the element object.
-
-You can get the element object by assigning a variable to its creation function like so:
-
-    local button1 = state:button(0,0, 1,4, "btn1", "A button")
-    --button1 is now a table representing the button
-
-You can also get the element by using state:get(name). The example below will retrieve a button with the name "btn1":
-
-    button1 = state:get("btn1")
-    --or
-    state:get("btn1"):onClick(your\_onclick\_function
-
-Both of these methods should be used inside the form creation callback function, the function you pass to smartfs.create, or in event callbacks.
-
-Now that you have located your element you can modify it.
-
-    button1:setPos(4,0)
-
-## Inventory Support
-Smartfs supports adding a button to Inventory+ or Unified Inventory which will open one of your own custom forms. Use the smartfs.add\_to\_inventory(form, icon, title) function where form is the smartfs form linked to by the button, icon is the button image (only for unified inventory), and title is the button text (only for inventory+).
-
-    smartfs.add_to_inventory(form, icon, title)
-
-## Dynamic forms
-Dynamic forms allow you to make a form without having to register it before the game finished loading.
-
-    local state = smartfs.dynamic("smartfs:dyn_form", name)
-    state:load(minetest.get_modpath("smartfs").."/example.smartfs")
-    state:get("btn"):click(function(self,state)
-    	print("Button clicked!")
-    end)
-    state:show()
-
-Make sure you call state:show()
diff --git a/streets/streetsmod/libs/smartfs/api.md b/streets/streetsmod/libs/smartfs/api.md
deleted file mode 100644
index 69e3f47..0000000
--- a/streets/streetsmod/libs/smartfs/api.md
+++ /dev/null
@@ -1,107 +0,0 @@
-#Full API
-##Smartfs
-* smartfs( name ) - returns the form regisered with the name 'name'
-* smartfs.create( name,function ) - creates a new form and adds elements to it by running the function. Use before Minetest loads. (like minetest.register_node)
-* smartfs.element( name, data ) - creates a new element type.
-* smartfs.dynamic( formname, playername ) - creates a dynamic form. Returns state. See example.lua for example. Remember to call state:show()
-* smartfs.add\_to\_inventory(form, icon, title) - Adds a form to an installed advanced inventory. Returns true on success.
-* smartfs.inventory_mod() - Returns the name of an installed and supported inventory mod that will be used above, or null.
-* smartfs.override\_load\_checks() - Allows you to use smartfs.create after the game loads. Not recommended!
-
-##Form
-* form:show( playername [, parameters] ) - shows the form to a player. See state.param.
-* form.name - the name of the form.
-
-##State
-
-### Methods
-* state:size( width,height ) - sets the forms width and height.
-* state:get( name ) - gets an element by name.
-* state:show() - reshows the form to the player.
-* state:close() - closes the form (does not work yet, due to no MT api support).
-* state:load( filepath ) - Loads elements from a file.
-* state:save( filepath ) - Saves elements to a file.
-* state:button( x,y,w,h,name,text [, exit_on_click] ) - create a new button at x,y with name and caption (text)
- * ^ optional: exit_on_click - set to true to exit the form when the button is clicked. ( Also see button.setClose() )
-* state:toggle( x,y,w,h,name,list ) - create a new toggle button at x,y with name and possible list of values
-* state:label( x,y,name,text ) - create a new label at x,y with name and caption (text)
-* state:field( x,y,w,h,name,label ) - create a new field at x,y with label
-  * state:pwdfield( x,y,w,h,name,label ) - create a password field
-  * state:textarea( x,y,w,h,name,label ) - create a new textarea
-* state:image( x,y,w,h,name,imagepath ) - create an image box.
-* state:inventory( x,y,w,h,name ) - create an inventory listing (use 'main' as name for the main player inventory)
-* state:checkbox( x,y,name,label,selected ) - create a check box.
-* state:element( element_type, data ) - Semi-private, create an element with type and data.
-
-### Variables
-* state.player - The name of the player.
-* state.param - The parameters supplied by form:show.
-* state.def - The form definition.
-* state.is_inv - Boolean which is true if this form is being shown as an inventory.
-
-##Button
-* element:setPosition( x,y ) - change the position
-* element:getPosition() - get the current position
-* element:setSize( w,h ) - set the size
-* element:getSize() - get the size
-* element:setText( text ) - set the caption of the button
-* element:getText() - get the caption of the button
-* element:setImage( filename ) - sets the background of the button
-* element:getImage() - get the background filename of the button
-* element:click( func(self,state) ) - specify a function to run when the button is clicked
-
-##Toggle Button
-* element:setPosition( x,y ) - change the position
-* element:getPosition() - get the current position
-* element:setSize( w,h ) - set the size
-* element:getSize() - get the size
-* element:getText() - get the text of the toggle option
-* element:setId( filename ) - sets the selected id
-* element:getId() - get the selected id
-* element:onToggle( func(self,state) ) - specify a function to run when the value if toggled
-
-##Label
-* element:setPosition( x,y ) - change the position
-* element:getPosition() - get the current position
-* element:setText( text ) - set the caption of the label
-* element:getText() - get the caption of the label
-
-##Field and Text Area
-* element:setPosition( x,y ) - change the position
-* element:getPosition() - get the current position
-* element:setSize( w,h ) - set the size
-* element:getSize() - get the size
-* element:setText( text ) - set the caption of the button
-* element:getText() - get the caption of the field
-* element:setImage( filename ) - sets the background of the field
-* element:getImage() - get the background filename of the field
-
-##List box
-* element:onClick( func(self,state,idx) ) - function to run when listbox item idx is clicked
-* element:onDoubleClick( func(self,state,idx) ) - function to run when listbox item idx is double clicked
-* element:setPosition( x,y ) - set the position
-* element:getPosition() - returns {x=x, y=y}
-* element:setSize( w,h ) - set the size
-* element:getSize() - gets the size {w=w, h=h}
-* element:addItem( item ) - appends and item
-* element:removeItem( idx ) - remove item
-* element:popItem() - removes last item and returns
-
-##Inventory listing
-* element:setPosition( x,y ) - set the position
-* element:getPosition() - returns {x=x, y=y}
-* element:setSize( w,h ) - set the size
-* element:getSize() - gets the size {w=w, h=h}
-* element:setLocation( location ) - set a custom inventory location or nil for the default (current_player)
-  * element:usePosition( position ) - use a node metadata attached inventory of the node at the given positon
-  * element:useDetached( name ) - use a detached inventory with the given name
-  * element:usePlayer( name ) - use a player inventory other than the current player
-* element:getLocation() - returns the inventory location (default: current_player)
-* element:setIndex( index ) - set the inventory starting index
-* element:getIndex() - returns the inventory starting index
-
-##Custom Code
-* element:onSubmit( func(self) ) - on form submit
-* element:onBuild( func(self) ) - run every time form is shown. You can set code from here
-* element:setCode( code ) - set the formspec code
-* element:getCode( code ) - get the formspec code
diff --git a/streets/streetsmod/libs/smartfs/depends.txt b/streets/streetsmod/libs/smartfs/depends.txt
deleted file mode 100644
index 4893cdc..0000000
--- a/streets/streetsmod/libs/smartfs/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-unified_inventory?
-inventory_plus?
diff --git a/streets/streetsmod/libs/smartfs/example.lua b/streets/streetsmod/libs/smartfs/example.lua
deleted file mode 100644
index 935dd70..0000000
--- a/streets/streetsmod/libs/smartfs/example.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-dofile(minetest.get_modpath("smartfs").."/smartfs.lua")
-
-s = smartfs.create("smartfs:form",function(state)
-	state:size(10,7)
-	state:label(2,0,"lbl","SmartFS example formspec!")
-	state:field(7,1,3,1,"txt","Textbox")
-	state:image(0,0,2,2,"img","default_stone.png")
-	state:toggle(0,2,3,1,"tg",{"plenty..","of..","custom..","elements"})
-	state:checkbox(2,1,"c","Easy code",true)
-	local res = "smartfs.create(\"smartfs:form\",function(state)\n"
-	res = res .. "\tstate:size(10,7)\n"
-	res = res .. "\tstate:label(2,0,\"lbl\",\"SmartFS example formspec!\")\n"
-	res = res .. "\tstate:field(7,1,3,1,\"txt\",\"Textbox\")\n"
-	res = res .. "\tstate:image(0,0,2,2,\"img\",\"default_stone.png\")\n"
-	res = res .. "\tstate:toggle(0,2,3,1,\"tg\",{\"plenty..\",\"of..\",\"custom..\",\"elements\"})\n"
-	res = res .. "\tstate:checkbox(2,1,\"c\",\"Easy code\",true)\n"
-	res = res .. "end)"
-	state:textarea(1,3.5,9,4,"ta","Code:"):setText(res)
-	return true
-end)
-
-l = smartfs.create("smartfs:load",function(state)
-	state:load(minetest.get_modpath("smartfs").."/example.smartfs")
-	state:get("btn"):click(function(self,state)
-		print("Button clicked!")
-	end)
-	return true
-end)
-
-smartfs.add_to_inventory(l,"icon.png","SmartFS")
-
-minetest.register_chatcommand("sfs_s", {
-	params = "",
-	description = "SmartFS test formspec 1: basics",
-	func = function(name, param)
-		s:show(name)
-	end,
-})
-minetest.register_chatcommand("sfs_l", {
-	params = "",
-	description = "SmartFS test formspec 2: loading",
-	func = function(name, param)
-		l:show(name)
-	end,
-})
-
-minetest.register_chatcommand("sfs_d", {
-	params = "",
-	description = "SmartFS test formspec 3: dynamic",
-	func = function(name, param)
-		local state = smartfs.dynamic("smartfs:dyn_form", name)
-		state:load(minetest.get_modpath("smartfs").."/example.smartfs")
-		state:get("btn"):click(function(self,state)
-			print("Button clicked!")
-		end)
-		state:show()
-	end,
-})
-
-minetest.register_chatcommand("sfs_lc", {
-	params = "",
-	description = "SmartFS test formspec 4: smartfs.create error catching",
-	func = function(name, param)
-		smartfs.create("asdinas",function() end)
-	end
-})
diff --git a/streets/streetsmod/libs/smartfs/example.smartfs b/streets/streetsmod/libs/smartfs/example.smartfs
deleted file mode 100644
index cbbaabf..0000000
--- a/streets/streetsmod/libs/smartfs/example.smartfs
+++ /dev/null
@@ -1 +0,0 @@
-return { ["ele"] = { ["c"] = { ["pos"] = { ["y"] = 1, ["x"] = 1 }, ["label"] = "Check", ["value"] = true, ["type"] = "checkbox", ["name"] = "c" }, ["btn"] = { ["pos"] = { ["y"] = 2, ["x"] = 1 }, ["size"] = { ["h"] = 1, ["w"] = 1 }, ["value"] = "Button", ["type"] = "button", ["name"] = "btn" } }, ["size"] = { ["h"] = 3, ["w"] = 5 } }
\ No newline at end of file
diff --git a/streets/streetsmod/libs/smartfs/init.lua b/streets/streetsmod/libs/smartfs/init.lua
deleted file mode 100644
index b2aaa29..0000000
--- a/streets/streetsmod/libs/smartfs/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-dofile(minetest.get_modpath("smartfs").."/smartfs.lua")
---dofile(minetest.get_modpath("smartfs").."/example.lua")
diff --git a/streets/streetsmod/libs/smartfs/smartfs.lua b/streets/streetsmod/libs/smartfs/smartfs.lua
deleted file mode 100644
index dfa0819..0000000
--- a/streets/streetsmod/libs/smartfs/smartfs.lua
+++ /dev/null
@@ -1,760 +0,0 @@
----------------------------
--- SmartFS: Smart Formspecs
---    by Rubenwardy
----------------------------
-
-smartfs = {
-	_fdef = {},
-	_edef = {},
-	opened = {},
-	inv = {}
-}
-
--- the smartfs() function
-function smartfs.__call(self, name)
-	return smartfs._fdef[name]
-end
-
--- Register forms and elements
-function smartfs.create(name,onload)
-	if smartfs._fdef[name] then
-		error("SmartFS - (Error) Form "..name.." already exists!")
-	end
-	if smartfs.loaded and not smartfs._loaded_override then
-		error("SmartFS - (Error) Forms should be declared while the game loads.")
-	end
-
-	smartfs._fdef[name] = {
-		_reg = onload,
-		name = name,
-		show = smartfs._show_
-	}
-
-	return smartfs._fdef[name]
-end
-function smartfs.override_load_checks()
-	smartfs._loaded_override = true
-end
-
-minetest.after(0, function()
-	smartfs.loaded = true
-end)
-function smartfs.dynamic(name,player)
-	if not smartfs._dynamic_warned then
-		smartfs._dynamic_warned = true
-		print("SmartFS - (Warning) On the fly forms are being used. May cause bad things to happen")
-	end
-	local state = smartfs._makeState_({name=name},player,nil,false)
-	state.show = state._show_
-	smartfs.opened[player] = state
-	return state
-end
-function smartfs.element(name,data)
-	if smartfs._edef[name] then
-		error("SmartFS - (Error) Element type "..name.." already exists!")
-	end
-	smartfs._edef[name] = data
-	return smartfs._edef[name]
-end
-
-function smartfs.inventory_mod()
-	if unified_inventory then
-		return "unified_inventory"
-	elseif inventory_plus then
-		return "inventory_plus"
-	else
-		return nil
-	end
-end
-
-function smartfs.add_to_inventory(form,icon,title)
-	if unified_inventory then
-		unified_inventory.register_button(form.name, {
-			type = "image",
-			image = icon,
-		})
-		unified_inventory.register_page(form.name, {
-			get_formspec = function(player, formspec)
-				local name = player:get_player_name()
-				local opened = smartfs._show_(form, name, nil, true)
-				return {formspec = opened:_getFS_(false)}
-			end
-		})
-		return true
-	elseif inventory_plus then
-		minetest.register_on_joinplayer(function(player)
-			inventory_plus.register_button(player, form.name, title)
-		end)
-		minetest.register_on_player_receive_fields(function(player, formname, fields)
-			if formname == "" and fields[form.name] then
-				local name = player:get_player_name()
-				local opened = smartfs._show_(form, name, nil, true)
-				inventory_plus.set_inventory_formspec(player, opened:_getFS_(true))
-			end
-		end)
-		return true
-	else
-		return false
-	end
-end
-
-function smartfs._makeState_(form,player,params,is_inv)
-	return {
-		_ele = {},
-		def = form,
-		player = player,
-		param = params,
-		is_inv = is_inv,
-		get = function(self,name)
-			return self._ele[name]
-		end,
-		close = function(self)
-			self.closed = true
-		end,
-		size = function(self,w,h)
-			self._size = {w=w,h=h}
-		end,
-		_getFS_ = function(self,size)
-			local res = ""
-			if self._size and size then
-				res = "size["..self._size.w..","..self._size.h.."]"
-			end
-			for key,val in pairs(self._ele) do
-				res = res .. val:build()
-			end
-			return res
-		end,
-		_show_ = function(self)
-			if self.is_inv then
-				if unified_inventory then
-					unified_inventory.set_inventory_formspec(minetest.get_player_by_name(self.player), self.def.name)
-				elseif inventory_plus then
-					inventory_plus.set_inventory_formspec(minetest.get_player_by_name(self.player), self:_getFS_(true))
-				end
-			else
-				local res = self:_getFS_(true)
-				minetest.show_formspec(player,form.name,res)
-			end
-		end,
-		load = function(self,file)
-			local file = io.open(file, "r")
-			if file then
-				local table = minetest.deserialize(file:read("*all"))
-				if type(table) == "table" then
-					if table.size then
-						self._size = table.size
-					end
-					for key,val in pairs(table.ele) do
-						self:element(val.type,val)
-					end
-					return true
-				end
-			end
-			return false
-		end,
-		save = function(self,file)
-			local res = {ele={}}
-
-			if self._size then
-				res.size = self._size
-			end
-
-			for key,val in pairs(self._ele) do
-				res.ele[key] = val.data
-			end
-
-			local file = io.open(file, "w")
-			if file then
-				file:write(minetest.serialize(res))
-				file:close()
-				return true
-			end
-			return false
-		end,
-		button = function(self,x,y,w,h,name,text,exitf)
-			if exitf == nil then exitf = false end
-			return self:element("button",{pos={x=x,y=y},size={w=w,h=h},name=name,value=text,closes=exitf})
-		end,
-		label = function(self,x,y,name,text)
-			return self:element("label",{pos={x=x,y=y},name=name,value=text})
-		end,
-		toggle = function(self,x,y,w,h,name,list)
-			return self:element("toggle",{pos={x=x,y=y},size={w=w,h=h},name=name,id=1,list=list})
-		end,
-		field = function(self,x,y,w,h,name,label)
-			return self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label})
-		end,
-		pwdfield = function(self,x,y,w,h,name,label)
-			local res = self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label})
-			res:isPassword(true)
-			return res
-		end,
-		textarea = function(self,x,y,w,h,name,label)
-			local res = self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label})
-			res:isMultiline(true)
-			return res
-		end,
-		image = function(self,x,y,w,h,name,img)
-			return self:element("image",{pos={x=x,y=y},size={w=w,h=h},name=name,value=img})
-		end,
-		checkbox = function(self,x,y,name,label,selected)
-			return self:element("checkbox",{pos={x=x,y=y},name=name,value=selected,label=label})
-		end,
-		listbox = function(self,x,y,w,h,name)
-			return self:element("list", { pos={x=x,y=y}, size={w=w,h=h}, name=name })
-		end,
-		inventory = function(self,x,y,w,h,name)
-			return self:element("inventory", { pos={x=x,y=y}, size={w=w,h=h}, name=name })
-		end,
-		element = function(self,typen,data)
-			local type = smartfs._edef[typen]
-
-			if not type then
-				error("Element type "..typen.." does not exist!")
-			end
-
-			if self._ele[data.name] then
-				error("Element "..data.name.." already exists")
-			end
-			data.type = typen
-
-			local ele = {
-				name = data.name,
-				root = self,
-				data = data,
-				remove = function(self)
-					self.root._ele[self.name] = nil
-				end
-			}
-
-			for key,val in pairs(type) do
-				ele[key] = val
-			end
-
-			self._ele[data.name] = ele
-
-			return self._ele[data.name]
-		end
-	}
-end
-
--- Show a formspec to a user
-function smartfs._show_(form, player, params, is_inv)
-	local state = smartfs._makeState_(form, player, params, is_inv)
-	state.show = state._show_
-	if form._reg(state)~=false then
-		if not is_inv then
-			smartfs.opened[player] = state
-			state:_show_()
-		else
-			smartfs.inv[player] = state
-		end
-	end
-	return state
-end
-
--- Receive fields from formspec
-local function _sfs_recieve_(state,name,fields)
-	if (fields.quit == "true") then
-		if not state.is_inv then
-			smartfs.opened[name] = nil
-		end
-		return true
-	end
-
-	for key,val in pairs(fields) do
-		if state._ele[key] then
-			state._ele[key].data.value = val
-		end
-	end
-	for key,val in pairs(state._ele) do
-		if val.submit then
-			if (val:submit(fields)==true) then
-				return true
-			end
-		end
-	end
-	if state.closed ~= true then
-		state:_show_()
-	else
-		minetest.show_formspec(name,"","size[5,1]label[0,0;Formspec closing not yet created!]")
-		if not state.is_inv then
-			smartfs.opened[name] = nil
-		end
-	end
-	return true
-end
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	local name = player:get_player_name()
-	if smartfs.opened[name] and not smartfs.opened[name].is_inv then
-		if smartfs.opened[name].def.name == formname then
-			local state = smartfs.opened[name]
-			return _sfs_recieve_(state,name,fields)
-		else
-			smartfs.opened[name] = nil
-		end
-	elseif smartfs.inv[name] and smartfs.inv[name].is_inv then
-		local state = smartfs.inv[name]
-		_sfs_recieve_(state,name,fields)
-	end
-	return false
-end)
-
-
------------------------------------------------------------------
--------------------------  ELEMENTS  ----------------------------
------------------------------------------------------------------
-
-smartfs.element("button",{
-	build = function(self)
-		if self.data.img then
-			return "image_button["..
-				self.data.pos.x..","..self.data.pos.y..
-				";"..
-				self.data.size.w..","..self.data.size.h..
-				";"..
-				self.data.img..
-				";"..
-				self.name..
-				";"..
-				self.data.value..
-				"]"
-		else
-			if self.data.closes then
-				return "button_exit["..
-					self.data.pos.x..","..self.data.pos.y..
-					";"..
-					self.data.size.w..","..self.data.size.h..
-					";"..
-					self.name..
-					";"..
-					self.data.value..
-					"]"
-			else
-				return "button["..
-					self.data.pos.x..","..self.data.pos.y..
-					";"..
-					self.data.size.w..","..self.data.size.h..
-					";"..
-					self.name..
-					";"..
-					self.data.value..
-					"]"
-			end
-		end
-	end,
-	submit = function(self,fields,state)
-		if fields[self.name] and self._click then
-			self:_click(self.root)
-		end
-
-		if self.data.closes then
-			return true
-		end
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setSize = function(self,w,h)
-		self.data.size = {w=w,h=h}
-	end,
-	getSize = function(self,x,y)
-		return self.data.size
-	end,
-	onClick = function(self,func)
-		self._click = func
-	end,
-	click = function(self,func)
-		self._click = func
-	end,
-	setText = function(self,text)
-		self.data.value = text
-	end,
-	getText = function(self)
-		return self.data.value
-	end,
-	setImage = function(self,image)
-		self.data.img = image
-	end,
-	getImage = function(self)
-		return self.data.img
-	end,
-	setClose = function(self,bool)
-		self.data.closes = bool
-	end
-})
-
-smartfs.element("toggle",{
-	build = function(self)
-		return "button["..
-			self.data.pos.x..","..self.data.pos.y..
-			";"..
-			self.data.size.w..","..self.data.size.h..
-			";"..
-			self.name..
-			";"..
-			self.data.list[self.data.id]..
-			"]"
-	end,
-	submit = function(self,fields)
-		if fields[self.name] then
-			self.data.id = self.data.id + 1
-			if self.data.id > #self.data.list then
-				self.data.id = 1
-			end
-			if self._tog then
-				self:_tog(self.root)
-			end
-		end
-	end,
-	onToggle = function(self,func)
-		self._tog = func
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setSize = function(self,w,h)
-		self.data.size = {w=w,h=h}
-	end,
-	getSize = function(self,x,y)
-		return self.data.size
-	end,
-	setId = function(self,id)
-		self.data.id = id
-	end,
-	getId = function(self)
-		return self.data.id
-	end,
-	getText = function(self)
-		return self.data.list[self.data.id]
-	end
-})
-
-smartfs.element("label",{
-	build = function(self)
-		return "label["..
-			self.data.pos.x..","..self.data.pos.y..
-			";"..
-			self.data.value..
-			"]"
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setText = function(self,text)
-		self.data.value = text
-	end,
-	getText = function(self)
-		return self.data.value
-	end
-})
-
-smartfs.element("field",{
-	build = function(self)
-		if self.data.ml then
-			return "textarea["..
-				self.data.pos.x..","..self.data.pos.y..
-				";"..
-				self.data.size.w..","..self.data.size.h..
-				";"..
-				self.name..
-				";"..
-				self.data.label..
-				";"..
-				self.data.value..
-				"]"
-		elseif self.data.pwd then
-			return "pwdfield["..
-				self.data.pos.x..","..self.data.pos.y..
-				";"..
-				self.data.size.w..","..self.data.size.h..
-				";"..
-				self.name..
-				";"..
-				self.data.label..
-				"]"
-		else
-			return "field["..
-				self.data.pos.x..","..self.data.pos.y..
-				";"..
-				self.data.size.w..","..self.data.size.h..
-				";"..
-				self.name..
-				";"..
-				self.data.label..
-				";"..
-				self.data.value..
-				"]"
-		end
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setSize = function(self,w,h)
-		self.data.size = {w=w,h=h}
-	end,
-	getSize = function(self,x,y)
-		return self.data.size
-	end,
-	setText = function(self,text)
-		self.data.value = text
-	end,
-	getText = function(self)
-		return self.data.value
-	end,
-	isPassword = function(self,bool)
-		self.data.pwd = bool
-	end,
-	isMultiline = function(self,bool)
-		self.data.ml = bool
-	end
-})
-
-smartfs.element("image",{
-	build = function(self)
-		return "image["..
-			self.data.pos.x..","..self.data.pos.y..
-			";"..
-			self.data.size.w..","..self.data.size.h..
-			";"..
-			self.data.value..
-			"]"
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setSize = function(self,w,h)
-		self.data.size = {w=w,h=h}
-	end,
-	getSize = function(self,x,y)
-		return self.data.size
-	end,
-	setImage = function(self,text)
-		self.data.value = text
-	end,
-	getImage = function(self)
-		return self.data.value
-	end
-})
-
-smartfs.element("checkbox",{
-	build = function(self)
-		if self.data.value then
-			return "checkbox["..
-				self.data.pos.x..","..self.data.pos.y..
-				";"..
-				self.name..
-				";"..
-				self.data.label..
-				";true]"
-		else
-			return "checkbox["..
-				self.data.pos.x..","..self.data.pos.y..
-				";"..
-				self.name..
-				";"..
-				self.data.label..
-				";false]"
-		end
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setSize = function(self,w,h)
-		self.data.size = {w=w,h=h}
-	end,
-	getSize = function(self,x,y)
-		return self.data.size
-	end,
-	setText = function(self,text)
-		self.data.value = text
-	end,
-	getText = function(self)
-		return self.data.value
-	end
-})
-
-smartfs.element("list",{
-        build = function(self)
-                local listformspec = "textlist["..
-                                     self.data.pos.x..","..self.data.pos.y..
-                                     ";"..
-                                     self.data.size.w..","..self.data.size.h..
-                                     ";"..
-                                     self.data.name..
-                                     ";"
-
-                --loop through the list's items and add them to the formspec
-		if not self.data.items then
-			self.data.items = {" "}
-		end
-                for i,value in ipairs(self.data.items) do
-                    listformspec = listformspec..value..","
-                end
-                listformspec = string.sub(listformspec, 0, -2) --removes extra ,
-                --close out the list items section
-                listformspec = listformspec..";"
-
-                --TODO support selected idx and transparency
-
-                --close formspec definition and return formspec
-                listformspec = listformspec.."]"
-                return listformspec
-        end,
-        submit = function(self,fields)
-                if fields[self.name] then
-                    local _type = string.sub(fields[self.data.name],1,3)
-                    local index = string.sub(fields[self.data.name],5)
-                    if _type == "CHG" and self._click then
-                        self:_click(self.root, index)
-                    elseif _type == "DCL" and self._doubleClick then
-                        self:_doubleClick(self.root, index)
-                    end
-                end
-        end,
-	onClick = function(self, func)
-		self._click = func
-	end,
-	click = function(self, func)
-		self._click = func
-	end,
-	onDoubleClick = function(self, func)
-		self._doubleClick = func
-	end,
-	doubleclick = function(self, func)
-		self._doubleClick = func
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setSize = function(self,w,h)
-		self.data.size = {w=w,h=h}
-	end,
-	getSize = function(self,x,y)
-		return self.data.size
-	end,
-	addItem = function(self, item)
-		if not self.data.items then
-			self.data.items = {" "}
-		end
-		table.insert(self.data.items, item)
-	end,
-	removeItem = function(self,idx)
-		if not self.data.items then
-			self.data.items = {" "}
-		end
-		table.remove(self.data.items,idx)
-	end,
-	popItem = function(self)
-		if not self.data.items then
-			self.data.items = {" "}
-		end
-		local item = self.data.items[#self.data.items]
-		table.remove(self.data.items)
-		return item
-	end
-})
-
-smartfs.element("inventory",{
-	build = function(self)
-		return "list["..
-			(self.data.location or "current_player") ..
-			";"..
-			self.name..
-			";"..
-			self.data.pos.x..","..self.data.pos.y..
-			";"..
-			self.data.size.w..","..self.data.size.h..
-			";"..
-			(self.data.index or "") ..
-			"]"
-	end,
-	setPosition = function(self,x,y)
-		self.data.pos = {x=x,y=y}
-	end,
-	getPosition = function(self,x,y)
-		return self.data.pos
-	end,
-	setSize = function(self,w,h)
-		self.data.size = {w=w,h=h}
-	end,
-	getSize = function(self,x,y)
-		return self.data.size
-	end,
-	-- available inventory locations
-	-- "current_player": Player to whom the menu is shown
-	-- "player:<name>": Any player
-	-- "nodemeta:<X>,<Y>,<Z>": Any node metadata
-	-- "detached:<name>": A detached inventory
-	-- "context" does not apply to smartfs, since there is no node-metadata as context available
-	setLocation = function(self,location)
-		self.data.location = location
-	end,
-	getLocation = function(self)
-		return self.data.location or "current_player"
-	end,
-	usePosition = function(self, pos)
-		self.data.location = string.format("nodemeta:%d,%d,%d", pos.x, pos.y, pos.z)
-	end,
-	usePlayer = function(self, name)
-		self.data.location = "player:" .. name
-	end,
-	useDetached = function(self, name)
-		self.data.location = "detached:" .. name
-	end,
-	setIndex = function(self,index)
-		self.data.index = index
-	end,
-	getIndex = function(self)
-		return self.data.index
-	end
-})
-
-smartfs.element("code",{
-	build = function(self)
-		if self._build then
-			self:_build()
-		end
-
-		return self.data.code
-	end,
-	submit = function(self,fields)
-		if self._sub then
-			self:_sub(fields)
-		end
-	end,
-	onSubmit = function(self,func)
-		self._sub = func
-	end,
-	onBuild = function(self,func)
-		self._build = func
-	end,
-	setCode = function(self,code)
-		self.data.code = code
-	end,
-	getCode = function(self)
-		return self.data.code
-	end
-})
diff --git a/streets/streetsmod/locale/de.txt b/streets/streetsmod/locale/de.txt
deleted file mode 100644
index 57694d3..0000000
--- a/streets/streetsmod/locale/de.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-# Translation file GERMAN
-Setup completed, have fun with StreetsMod=Setup abgeschlossen, viel Spass mit StreetsMod
-Creating variables and tables...=Erstelle Variablen und Tabellen...
-Checking installed mods...=Ueberpruefe installierte Mods...
-Check version of your installed StreetsMod and find information=Ueberpruefe die installierte StreetsMod Version und weitere Infos
-Asphalt=Asphalt
-Asphalt stair=Asphalt Treppe
-Asphalt slab=Asphalt Platte
-Construction fence=Bauzaun
-Delineator=Leitpfosten
-Emergency Phone=Notrufsaeule
-Asphalt with sideline=Asphalt mit Seitenlinie
-Asphalt with solid line=Asphalt mit durchgezogener Linie
-Asphalt with dashed line=Asphalt mit unterbrochener Linie
-Asphalt with sideline (edge)=Asphalt mit Seitenlinie (Ecke)
-Asphalt with parking label=Asphalt mit Parkplatzsymbol
-Asphalt with arrow=Asphalt mit Richtungspfeil
-Simple manhole=Einfacher Gulli
-Advanced manhole=Gulli
-Pole=Stange
-Empty sign=Leeres Schild
-Warning sign (lava)=Gefahrenschild Lava
-Warning sign (water)=Gefahrenschild Wasser
-Warning sign (Construction area)=Gefahrenschild Baustelle
-Warning: Careful of lava=Achtung: Lava
-Warning: Water nearby=Achtung: Wasser
-Warning: Construction area, possible deep excavations=Achtung Baustelle, eventuell tiefe Graeben
-Sign workshop - Create signs for your roads!=Schilderworkshop - Baue Schilder fuer deine Strassen!
-Available signs:=Verfuegbare Schilder
-Needed stuff:=Benoetigt
-Put it here:=Rohstoffe
-Selected:=Ausgewaehlt
-Output:=Ausgabe
-Sign workshop=Schilderworkshop
-Sign workshop idle=Schilderworkshop bereit
-Sign workshop working=Schilderworkshop arbeitet
-Please wait %s seconds... = Bitte warte %s Sekunden...
-Solid line (yellow)=Durchgezogene Linie (gelb)
-Dashed line (yellow)=Unterbrochene Linie (gelb)
-Cross (yellow)=Kreuz (gelb)
-Outer edge (yellow)=Ecklinie (gelb)
-Parking (yellow)=Parkplatzsymbol (gelb)
-Arrow (yellow)=Pfeil (gelb)
-Sideline (yellow)=Seitenlinie (gelb)
-Steel support=Stahlrahmen
-Street lamp=Strassenlampe
-Concrete wall=Betonwand
-Concrete=Beton
-Trafficlight=Ampel
-Running version=Version
-Cheater=Schummler
-Cheater!=Schummler!
-Off=Aus
-Channel=Kanal
-green=Gruen
-red=Rot
-warn=Warnung
-off=Aus
-U cheater U=Du Schummler Du
diff --git a/streets/streetsmod/locale/template.txt.txt b/streets/streetsmod/locale/template.txt.txt
deleted file mode 100644
index 179cc7d..0000000
--- a/streets/streetsmod/locale/template.txt.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-# Translation file for StreetsMod might not be up-to-date.
-Setup completed, have fun with StreetsMod=
-Creating variables and tables...=
-Checking installed mods...=
-Check version of your installed StreetsMod and find information=
-Asphalt=
-Asphalt stair=
-Asphalt slab=
-Construction fence=
-Delineator=
-Emergency Phone=
-Asphalt with sideline=
-Asphalt with solid line=
-Asphalt with dashed line=
-Asphalt with sideline (edge)=
-Asphalt with parking label=
-Asphalt with arrow=
-Simple manhole=
-Advanced manhole=
-Pole=
-Empty sign=
-Warning sign (lava)=
-Warning sign (water)=
-Warning sign (Construction area)=
-Warning: Careful of lava=
-Warning: Water nearby=
-Warning: Construction area, possible deep excavations=
-Sign workshop - Create signs for your roads!=
-Available signs:=
-Needed stuff:=
-Put it here:=
-Selected:=
-Output:=
-Sign workshop=
-Sign workshop idle=
-Sign workshop working=
-Please wait %s seconds... =
-Solid line (yellow)=
-Dashed line (yellow)=
-Cross (yellow)=
-Outer edge (yellow)=
-Parking (yellow)=
-Arrow (yellow)=
-Sideline (yellow)=
-Steel support=
-Street lamp=
-Concrete wall=
-Concrete=
-Trafficlight=
-Running version=
-Cheater=
-Cheater!=
-Off=
-Channel=
-green=
-red=
-warn=
-off=
-U cheater U=
diff --git a/streets/streetsmod/nodeboxes/trafficlight.nbe b/streets/streetsmod/nodeboxes/trafficlight.nbe
deleted file mode 100644
index 189f333..0000000
--- a/streets/streetsmod/nodeboxes/trafficlight.nbe
+++ /dev/null
@@ -1,19 +0,0 @@
-MINETEST NODEBOX EDITOR
-PARSER 1
-NAME test
-
-NODE node1
-POSITION 0 0 0
-NODEBOX nodebox1 -0.1875 -0.5 0.5 0.1875 0.5 0.75
-NODEBOX nodebox2 -0.0625 0.375 0.3125 0.0625 0.4375 0.5
-NODEBOX nodebox3 -0.0625 0.0625 0.3125 0.0625 0.125 0.5
-NODEBOX nodebox4 -0.0625 -0.25 0.3125 0.0625 -0.1875 0.5
-NODEBOX nodebox5 0.0625 0.3125 0.3125 0.125 0.38 0.5
-NODEBOX nodebox6 -0.125 0.3125 0.3125 -0.0625 0.375 0.5
-NODEBOX nodebox7 0.0625 0 0.3125 0.125 0.0625 0.5
-NODEBOX nodebox8 -0.125 0 0.3125 -0.0625 0.0625 0.5
-NODEBOX nodebox9 0.0625 -0.3125 0.3125 0.125 -0.25 0.5
-NODEBOX nodebox10 -0.125 -0.3125 0.3125 -0.0625 -0.25 0.5
-NODEBOX NodeBox11 -0.125 -0.125 0.85 0.125 0.125 0.75
-END NODE
-
diff --git a/streets/streetsmod/readme.txt b/streets/streetsmod/readme.txt
deleted file mode 100644
index a2c9172..0000000
--- a/streets/streetsmod/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is the first loaded mod in this modpack which prepares tables, variables etc.
\ No newline at end of file
diff --git a/streets/streetsmod/textures/streets_asphalt.png b/streets/streetsmod/textures/streets_asphalt.png
deleted file mode 100644
index 1841635..0000000
Binary files a/streets/streetsmod/textures/streets_asphalt.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_concrete.png b/streets/streetsmod/textures/streets_concrete.png
deleted file mode 100644
index 89c7e78..0000000
Binary files a/streets/streetsmod/textures/streets_concrete.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_delineator.png b/streets/streetsmod/textures/streets_delineator.png
deleted file mode 100644
index ae69f2e..0000000
Binary files a/streets/streetsmod/textures/streets_delineator.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_delineator_top.png b/streets/streetsmod/textures/streets_delineator_top.png
deleted file mode 100644
index 3551ffe..0000000
Binary files a/streets/streetsmod/textures/streets_delineator_top.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_fence_bottom.png b/streets/streetsmod/textures/streets_fence_bottom.png
deleted file mode 100644
index 67e572f..0000000
Binary files a/streets/streetsmod/textures/streets_fence_bottom.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_fence_fromtop.png b/streets/streetsmod/textures/streets_fence_fromtop.png
deleted file mode 100644
index f4c0e23..0000000
Binary files a/streets/streetsmod/textures/streets_fence_fromtop.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_fence_inv.png b/streets/streetsmod/textures/streets_fence_inv.png
deleted file mode 100644
index 0446f12..0000000
Binary files a/streets/streetsmod/textures/streets_fence_inv.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_fence_top.png b/streets/streetsmod/textures/streets_fence_top.png
deleted file mode 100644
index 43a3613..0000000
Binary files a/streets/streetsmod/textures/streets_fence_top.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lampcontroller_bottom.png b/streets/streetsmod/textures/streets_lampcontroller_bottom.png
deleted file mode 100644
index cdd5b40..0000000
Binary files a/streets/streetsmod/textures/streets_lampcontroller_bottom.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lampcontroller_sides.png b/streets/streetsmod/textures/streets_lampcontroller_sides.png
deleted file mode 100644
index 39e9960..0000000
Binary files a/streets/streetsmod/textures/streets_lampcontroller_sides.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lampcontroller_top.png b/streets/streetsmod/textures/streets_lampcontroller_top.png
deleted file mode 100644
index 00d2e4c..0000000
Binary files a/streets/streetsmod/textures/streets_lampcontroller_top.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lamps_basi_inv.png b/streets/streetsmod/textures/streets_lamps_basi_inv.png
deleted file mode 100644
index 5c31236..0000000
Binary files a/streets/streetsmod/textures/streets_lamps_basi_inv.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lamps_basic_bottom.png b/streets/streetsmod/textures/streets_lamps_basic_bottom.png
deleted file mode 100644
index 07d123f..0000000
Binary files a/streets/streetsmod/textures/streets_lamps_basic_bottom.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lamps_basic_middle.png b/streets/streetsmod/textures/streets_lamps_basic_middle.png
deleted file mode 100644
index 1370765..0000000
Binary files a/streets/streetsmod/textures/streets_lamps_basic_middle.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lamps_basic_top.png b/streets/streetsmod/textures/streets_lamps_basic_top.png
deleted file mode 100644
index 355f50d..0000000
Binary files a/streets/streetsmod/textures/streets_lamps_basic_top.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_lamps_basic_top_top.png b/streets/streetsmod/textures/streets_lamps_basic_top_top.png
deleted file mode 100644
index 4d6bf22..0000000
Binary files a/streets/streetsmod/textures/streets_lamps_basic_top_top.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_manhole.png b/streets/streetsmod/textures/streets_manhole.png
deleted file mode 100644
index 13dd9ce..0000000
Binary files a/streets/streetsmod/textures/streets_manhole.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_manhole_advanced.png b/streets/streetsmod/textures/streets_manhole_advanced.png
deleted file mode 100644
index a8f876d..0000000
Binary files a/streets/streetsmod/textures/streets_manhole_advanced.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_pole.png b/streets/streetsmod/textures/streets_pole.png
deleted file mode 100644
index af4a378..0000000
Binary files a/streets/streetsmod/textures/streets_pole.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_pole_inv.png b/streets/streetsmod/textures/streets_pole_inv.png
deleted file mode 100644
index fce2292..0000000
Binary files a/streets/streetsmod/textures/streets_pole_inv.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_rw_arrow_alldirs.png b/streets/streetsmod/textures/streets_rw_arrow_alldirs.png
deleted file mode 100644
index 532280e..0000000
Binary files a/streets/streetsmod/textures/streets_rw_arrow_alldirs.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_back.png b/streets/streetsmod/textures/streets_sign_back.png
deleted file mode 100644
index 77d4210..0000000
Binary files a/streets/streetsmod/textures/streets_sign_back.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_construction.png b/streets/streetsmod/textures/streets_sign_construction.png
deleted file mode 100644
index f2c2455..0000000
Binary files a/streets/streetsmod/textures/streets_sign_construction.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_grasswalk.png b/streets/streetsmod/textures/streets_sign_grasswalk.png
deleted file mode 100644
index 1a72dff..0000000
Binary files a/streets/streetsmod/textures/streets_sign_grasswalk.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_lava.png b/streets/streetsmod/textures/streets_sign_lava.png
deleted file mode 100644
index e80f8e2..0000000
Binary files a/streets/streetsmod/textures/streets_sign_lava.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_mine.png b/streets/streetsmod/textures/streets_sign_mine.png
deleted file mode 100644
index 92aaf97..0000000
Binary files a/streets/streetsmod/textures/streets_sign_mine.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_shop.png b/streets/streetsmod/textures/streets_sign_shop.png
deleted file mode 100644
index b30ea8e..0000000
Binary files a/streets/streetsmod/textures/streets_sign_shop.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_water.png b/streets/streetsmod/textures/streets_sign_water.png
deleted file mode 100644
index b941817..0000000
Binary files a/streets/streetsmod/textures/streets_sign_water.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sign_workshop.png b/streets/streetsmod/textures/streets_sign_workshop.png
deleted file mode 100644
index 3c399bc..0000000
Binary files a/streets/streetsmod/textures/streets_sign_workshop.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_signworkshop_bottom.png b/streets/streetsmod/textures/streets_signworkshop_bottom.png
deleted file mode 100644
index 022bb2c..0000000
Binary files a/streets/streetsmod/textures/streets_signworkshop_bottom.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_signworkshop_front.png b/streets/streetsmod/textures/streets_signworkshop_front.png
deleted file mode 100644
index 83317b1..0000000
Binary files a/streets/streetsmod/textures/streets_signworkshop_front.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_signworkshop_side.png b/streets/streetsmod/textures/streets_signworkshop_side.png
deleted file mode 100644
index 509a3e3..0000000
Binary files a/streets/streetsmod/textures/streets_signworkshop_side.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_signworkshop_top.png b/streets/streetsmod/textures/streets_signworkshop_top.png
deleted file mode 100644
index 07f4f06..0000000
Binary files a/streets/streetsmod/textures/streets_signworkshop_top.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sos_bottom.png b/streets/streetsmod/textures/streets_sos_bottom.png
deleted file mode 100644
index 0437ef1..0000000
Binary files a/streets/streetsmod/textures/streets_sos_bottom.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sos_front.png b/streets/streetsmod/textures/streets_sos_front.png
deleted file mode 100644
index ea524dd..0000000
Binary files a/streets/streetsmod/textures/streets_sos_front.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sos_side.png b/streets/streetsmod/textures/streets_sos_side.png
deleted file mode 100644
index af83757..0000000
Binary files a/streets/streetsmod/textures/streets_sos_side.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_sos_top.png b/streets/streetsmod/textures/streets_sos_top.png
deleted file mode 100644
index 4683430..0000000
Binary files a/streets/streetsmod/textures/streets_sos_top.png and /dev/null differ
diff --git a/streets/streetsmod/textures/streets_support.png b/streets/streetsmod/textures/streets_support.png
deleted file mode 100644
index 610a38a..0000000
Binary files a/streets/streetsmod/textures/streets_support.png and /dev/null differ
diff --git a/streets/streetspoles/depends.txt b/streets/streetspoles/depends.txt
deleted file mode 100644
index 421a27d..0000000
--- a/streets/streetspoles/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-streetsmod
\ No newline at end of file
diff --git a/streets/streetspoles/init.lua b/streets/streetspoles/init.lua
deleted file mode 100644
index fe24bf4..0000000
--- a/streets/streetspoles/init.lua
+++ /dev/null
@@ -1,191 +0,0 @@
---[[
-	StreetsMod: Poles
-]]
-
--- Simple pole
-minetest.register_node(":streets:pole_bottom",{
-	description = streets.S("Pole"),
-	tiles = {"streets_pole.png"},
-	groups = {cracky=2},
-	inventory_image = "streets_pole_inv.png",
-	wield_image = "streets_pole_inv.png",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	drawtype = "nodebox",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.1,-0.5,-0.5,0.1,0.5,-0.4},
-			{-0.125,-0.5,-0.525,0.125,-0.3,-0.375}
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-0.1,-0.5,-0.5,0.1,0.5,-0.4}
-		}
-	},
-	after_place_node = function(pos,placer,itemstack)
-		pos.y = pos.y +1
-		if minetest.get_node(pos).name == "air" then
-			minetest.add_node(pos,{name = "streets:pole_top", param2 = minetest.dir_to_facedir(placer:get_look_dir())})
-		else
-			minetest.chat_send_player(placer:get_player_name(),"Not enough free space! A pole has a height of 2 blocks!")
-			pos.y = pos.y -1
-			minetest.remove_node(pos)
-		end
-	end,
-	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		pos.y = pos.y +1
-		if minetest.get_node(pos).name == "streets:pole_top" then
-			minetest.remove_node(pos)
-		end
-	end
-})
-
-minetest.register_node(":streets:pole_top",{
-	description = streets.S("Y u no play minetest without cheating?"),
-	tiles = {"streets_pole.png"},
-	groups = {not_in_creative_inventory=1,cracky=2},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	drawtype = "nodebox",
-	drop = "",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.1,-0.5,-0.5,0.1,0.5,-0.4}
-		}
-	}
-})
-
-minetest.register_craft({
-	output = "streets:pole_bottom 3",
-	recipe = {
-		{"","default:steel_ingot",""},
-		{"","default:steel_ingot",""},
-		{"","default:steel_ingot",""}
-	}
-})
-
--- Big pole
-
-minetest.register_node(":streets:bigpole", {
-	description = "Pole",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	drawtype = "nodebox",
-	tiles = {"streets_pole.png"},
-	sunlight_propagates = true,
-	groups = {cracky = 1, level = 2, bigpole = 1},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.15, -0.5, -0.15, 0.15, 0.5, 0.15}
-		}
-	},
-	on_place = minetest.rotate_node,
-	digiline = {
-		wire = {
-			rules = {
-				{x= 0, y= 0, z=-1},
-				{x= 0, y= 0, z= 1},
-				{x= 1, y= 0, z= 0},
-				{x=-1, y= 0, z= 0},
-				{x= 0, y=-1, z= 0},
-				{x= 0, y= 1, z= 0},
-				{x= 0, y=-2, z= 0}
-			}
-		}
-	}
-})
-minetest.register_node(":streets:bigpole_edge", {
-	description = "Pole",
-	drop = "streets:bigpole",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	drawtype = "nodebox",
-	tiles = {"streets_pole.png"},
-	sunlight_propagates = true,
-	groups = {cracky = 1, level = 2, bigpole = 1},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.15,-0.5,-0.15,0.15,0.15,0.15},
-			{-0.15,-0.15,-0.15,0.15,0.15,-0.5}
-		}
-	},
-	digiline = {
-		wire = {
-			rules = {
-				{x= 0, y= 0, z=-1},
-				{x= 0, y= 0, z= 1},
-				{x= 1, y= 0, z= 0},
-				{x=-1, y= 0, z= 0},
-				{x= 0, y=-1, z= 0},
-				{x= 0, y= 1, z= 0},
-			}
-		}
-	}
-})
-minetest.register_node(":streets:bigpole_tjunction", {
-	description = "Pole",
-	drop = "streets:bigpole",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	drawtype = "nodebox",
-	tiles = {"streets_pole.png"},
-	sunlight_propagates = true,
-	groups = {cracky = 1, level = 2, bigpole = 1},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.15, -0.5, -0.15, 0.15, 0.15, 0.15},
-			{-0.15, -0.15, -0.5, 0.15, 0.15, 0.5}
-		}
-	},
-	digiline = {
-		wire = {
-			rules = {
-				{x= 0, y= 0, z=-1},
-				{x= 0, y= 0, z= 1},
-				{x= 1, y= 0, z= 0},
-				{x=-1, y= 0, z= 0},
-				{x= 0, y=-1, z= 0},
-				{x= 0, y= 1, z= 0},
-			}
-		}
-	}
-})
-minetest.register_craft({
-	output = "streets:bigpole 3",
-	recipe = {
-		{"","",""},
-		{"","default:steel_ingot",""},
-		{"","default:steel_ingot",""}
-	}
-})
-minetest.register_craft({
-	output = "streets:bigpole_edge 3",
-	recipe = {
-		{"","",""},
-		{"streets:bigpole","streets:bigpole",""},
-		{"streets:bigpole","",""}
-	}
-})
-minetest.register_craft({
-	output = "streets:bigpole_edge 3",
-	recipe = {
-		{"","",""},
-		{"streets:bigpole","streets:bigpole",""},
-		{"","streets:bigpole",""}
-	}
-})
-minetest.register_craft({
-	output = "streets:bigpole_tjunction 2",
-	recipe = {
-		{"","",""},
-		{"streets:bigpole_edge","streets:bigpole",""},
-		{"","",""}
-	}
-})
diff --git a/streets/trafficlight/depends.txt b/streets/trafficlight/depends.txt
deleted file mode 100644
index 8d7b8d8..0000000
--- a/streets/trafficlight/depends.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-default
-streetsmod
-digilines?
-mesecons?
\ No newline at end of file
diff --git a/streets/trafficlight/init.lua b/streets/trafficlight/init.lua
deleted file mode 100644
index 38b18c4..0000000
--- a/streets/trafficlight/init.lua
+++ /dev/null
@@ -1,367 +0,0 @@
---[[
-	StreetsMod: inDev Trafficlights
-]]
-dofile(streets.modpath .. "/../trafficlight/old2new.lua")
-
-streets.tlBox =	{
-	--[[ Thank you, rubenwardy, for your awesome NodeboxEditor! Not perfect, but still great! ]]
-	{-0.1875,-0.5,0.5,0.1875,0.5,0.75}, --nodebox1
-	{-0.0625,0.375,0.3125,0.0625,0.4375,0.5}, --nodebox2
-	{-0.0625,0.0625,0.3125,0.0625,0.125,0.5}, --nodebox3
-	{-0.0625,-0.25,0.3125,0.0625,-0.1875,0.5}, --nodebox4
-	{0.0625,0.3125,0.3125,0.125,0.38,0.5}, --nodebox5
-	{-0.125,0.3125,0.3125,-0.0625,0.375,0.5}, --nodebox6
-	{0.0625,0,0.3125,0.125,0.0625,0.5}, --nodebox7
-	{-0.125,0,0.3125,-0.0625,0.0625,0.5}, --nodebox8
-	{0.0625,-0.3125,0.3125,0.125,-0.25,0.5}, --nodebox9
-	{-0.125,-0.3125,0.3125,-0.0625,-0.25,0.5}, --nodebox10
-	{-0.125, -0.125, 0.85, 0.125, 0.125, 0.75}, -- NodeBox11
-}
-
-streets.tlRhythm = {
-	toRed = {
-		{name = "streets:trafficlight_top_yellow", pauseBefore = 0},
-		{name = "streets:trafficlight_top_red", pauseBefore = 3}
-	},
-	toGreen = {
-		{name = "streets:trafficlight_top_green", pauseBefore = 0}
-	},
-	toOff = {
-		{name = "streets:trafficlight_top_off", pauseBefore = 0}
-	},
-	toWarn = {
-		{name = "streets:trafficlight_top_warn", pauseBefore = 0}
-	},
-	toFlashRed = {
-		{name = "streets:trafficlight_top_flashred", pauseBefore = 0}
-	}
-}
-
-streets.tlRhythm_left = {
-	toRed = {
-		{name = "streets:trafficlight_top_left_yellow", pauseBefore = 0},
-		{name = "streets:trafficlight_top_left_red", pauseBefore = 3}
-	},
-	toGreen = {
-		{name = "streets:trafficlight_top_left_green", pauseBefore = 0}
-	},
-	toOff = {
-		{name = "streets:trafficlight_top_left_off", pauseBefore = 0}
-	},
-	toWarn = {
-		{name = "streets:trafficlight_top_left_warn", pauseBefore = 0}
-	},
-	toFlashRed = {
-		{name = "streets:trafficlight_top_left_flashred", pauseBefore = 0}
-	}
-}
-
-streets.tlRhythm_right = {
-	toRed = {
-		{name = "streets:trafficlight_top_right_yellow", pauseBefore = 0},
-		{name = "streets:trafficlight_top_right_red", pauseBefore = 3}
-	},
-	toGreen = {
-		{name = "streets:trafficlight_top_right_green", pauseBefore = 0}
-	},
-	toOff = {
-		{name = "streets:trafficlight_top_right_off", pauseBefore = 0}
-	},
-	toWarn = {
-		{name = "streets:trafficlight_top_right_warn", pauseBefore = 0}
-	},
-	toFlashRed = {
-		{name = "streets:trafficlight_top_right_flashred", pauseBefore = 0}
-	}
-}
-
-streets.tlSwitch = function(def)
-	if not def.pos or not def.to then
-		return
-	end
-	local rhythm = {}
-	local nodename = minetest.get_node(def.pos).name
-	if nodename:find("left") then
-		rhythm = streets.tlRhythm_left
-	elseif nodename:find("right") then
-		rhythm = streets.tlRhythm_right
-	else
-		rhythm = streets.tlRhythm
-	end
-	if not rhythm[def.to] then
-		return
-	end
-	local meta = minetest.get_meta(def.pos)
-	-- Only switch if new state ~= current state
-	if "to" .. meta:get_string("state") == def.to then
-		return
-	end
-	-- Switch the trafficlight
-	for k, v in pairs(rhythm[def.to]) do
-		minetest.get_meta(def.pos):set_string("state", def.to:gsub("to", ""))
-		minetest.after(v.pauseBefore, function()
-			minetest.swap_node(def.pos, {name = v.name, param2 = minetest.get_node(def.pos).param2})
-		end)
-	end
-end
-
-streets.on_digiline_receive = function(pos, node, channel, msg)
-	local setchan = minetest.get_meta(pos):get_string("channel")
-	if setchan ~= channel then
-		return
-	end
-	-- Tl states
-	if msg == "OFF" then
-		streets.tlSwitch({
-			pos = pos,
-			to = "toOff"
-		})
-	elseif msg == "GREEN" then
-		streets.tlSwitch({
-			pos = pos,
-			to = "toGreen"
-		})
-	elseif msg == "RED" then
-		streets.tlSwitch({
-			pos = pos,
-			to = "toRed"
-		})
-	elseif msg == "WARN" then
-		streets.tlSwitch({
-			pos = pos,
-			to = "toWarn"
-		})
-	elseif msg == "FLASHRED" then
-		streets.tlSwitch({
-			pos = pos,
-			to = "toFlashRed"
-		})
-	elseif msg == "GET" then
-		local state = minetest.get_meta(pos):get_string("state")
-		if not state or state == "" then
-			state = "UNDEFINED"
-		end
-		digiline:receptor_send(pos, digiline.rules.default, channel, state)
-	end
-end
-
-minetest.register_node(":streets:digiline_distributor",{
-	description = streets.S("Digiline distributor"),
-	tiles = {"streets_lampcontroller_top.png","streets_lampcontroller_bottom.png","streets_lampcontroller_sides.png"},
-	groups = {cracky = 1},
-	drawtype = "nodebox",
-	paramtype = "light",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,-0.5,-0.5,0.5,0.5,0.5},
-			{-0.05,0.5,-0.05,0.05,1.6,0.05}
-		}
-	},
-	digiline = {
-		wire = {
-			rules = {
-				{x= 0, y= 0, z=-1},
-				{x= 0, y= 0, z= 1},
-				{x= 1, y= 0, z= 0},
-				{x=-1, y= 0, z= 0},
-				{x= 0, y= 2, z=0}
-			}
-		}
-	}
-})
-
-for _,i in pairs({"","_left","_right"}) do
-	minetest.register_node(":streets:trafficlight_top"..i.."_off",{
-		description = streets.S((i == "" and "Traffic Light") or (i == "_left" and "Traffic Light (Left Turn)") or (i == "_right" and "Traffic Light (Right Turn)")),
-		drawtype="nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		groups = {cracky = 1, level = 2},
-		inventory_image = "streets_trafficlight_inv.png",
-		light_source = 11,
-		sunlight_propagates = true,
-		node_box = {
-			type = "fixed",
-			fixed = streets.tlBox
-		},
-		tiles = {"streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl"..i.."_off.png"},
-		digiline = {
-			receptor = {},
-			effector = {
-				action = function(pos, node, channel, msg)
-					streets.on_digiline_receive(pos, node, channel, msg)
-				end
-			}
-		},
-		on_construct = function(pos)
-			local meta = minetest.get_meta(pos)
-			meta:set_string("formspec", "field[channel;Channel;${channel}]")
-		end,
-		on_receive_fields = function(pos, formname, fields, sender)
-			if (fields.channel) then
-				minetest.get_meta(pos):set_string("channel", fields.channel)
-				minetest.get_meta(pos):set_string("state", "Off")
-			end
-		end,
-	})
-
-	minetest.register_node(":streets:trafficlight_top"..i.."_red",{
-		drop = "streets:trafficlight_top_off",
-		groups = {cracky = 1, not_in_creative_inventory = 1},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		drawtype = "nodebox",
-		tiles = {"streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl"..i.."_red.png"},
-		node_box = {
-			type = "fixed",
-			fixed = streets.tlBox
-		},
-		light_source = 6,
-		digiline = {
-			receptor = {},
-			effector = {
-				action = function(pos, node, channel, msg)
-					streets.on_digiline_receive(pos, node, channel, msg)
-				end
-			}
-		},
-	})
-
-	minetest.register_node(":streets:trafficlight_top"..i.."_yellow",{
-		drop = "streets:trafficlight_top_off",
-		groups = {cracky = 1, not_in_creative_inventory = 1},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		drawtype = "nodebox",
-		tiles = {"streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl"..i.."_yellow.png"},
-		node_box = {
-			type = "fixed",
-			fixed = streets.tlBox
-		},
-		light_source = 6,
-		digiline = {
-			receptor = {},
-			effector = {
-				action = function(pos, node, channel, msg)
-					streets.on_digiline_receive(pos, node, channel, msg)
-				end
-			}
-		},
-	})
-
-	minetest.register_alias("streets:trafficlight_top"..i.."_redyellow","streets:trafficlight_top"..i.."_green")
-
-	minetest.register_node(":streets:trafficlight_top"..i.."_green",{
-		drop = "streets:trafficlight_top_off",
-		groups = {cracky = 1, not_in_creative_inventory = 1},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		drawtype = "nodebox",
-		tiles = {"streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl"..i.."_green.png"},
-		node_box = {
-			type = "fixed",
-			fixed = streets.tlBox
-		},
-		light_source = 6,
-		digiline = {
-			receptor = {},
-			effector = {
-				action = function(pos, node, channel, msg)
-					streets.on_digiline_receive(pos, node, channel, msg)
-				end
-			}
-		},
-	})
-
-	minetest.register_node(":streets:trafficlight_top"..i.."_warn",{
-		drop = "streets:trafficlight_top_off",
-		groups = {cracky = 1, not_in_creative_inventory = 1},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		drawtype = "nodebox",
-		tiles = {"streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png",{
-			name="streets_tl"..i.."_warn.png",
-			animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5},
-		}},
-		node_box = {
-			type = "fixed",
-			fixed = streets.tlBox
-		},
-		light_source = 6,
-		digiline = {
-			receptor = {},
-			effector = {
-				action = function(pos, node, channel, msg)
-					streets.on_digiline_receive(pos, node, channel, msg)
-				end
-			}
-		},
-	})
-
-	minetest.register_node(":streets:trafficlight_top"..i.."_flashred",{
-		drop = "streets:trafficlight_top_off",
-		groups = {cracky = 1, not_in_creative_inventory = 1},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		drawtype = "nodebox",
-		tiles = {"streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png","streets_tl_bg.png",{
-			name="streets_tl"..i.."_flashred.png",
-			animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.5},
-		}},
-		node_box = {
-			type = "fixed",
-			fixed = streets.tlBox
-		},
-		light_source = 6,
-		digiline = {
-			receptor = {},
-			effector = {
-				action = function(pos, node, channel, msg)
-					streets.on_digiline_receive(pos, node, channel, msg)
-				end
-			}
-		},
-	})
-end
-
-minetest.register_craft({
-	output = "streets:trafficlight_top_off",
-	recipe = {
-		{"default:steel_ingot", "dye:red", "default:steel_ingot"},
-		{"default:steel_ingot", "dye:yellow", "default:steel_ingot"},
-		{"default:steel_ingot", "dye:green", "default:steel_ingot"}
-	}
-})
-
-minetest.register_craft({
-	output = "streets:trafficlight_top_left_off",
-	recipe = {
-		{"dye:red", "default:steel_ingot", "default:steel_ingot"},
-		{"dye:yellow", "default:steel_ingot", "default:steel_ingot"},
-		{"dye:green", "default:steel_ingot", "default:steel_ingot"}
-	}
-})
-
-minetest.register_craft({
-	output = "streets:trafficlight_top_right_off",
-	recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "dye:red"},
-		{"default:steel_ingot", "default:steel_ingot", "dye:yellow"},
-		{"default:steel_ingot", "default:steel_ingot", "dye:green"}
-	}
-})
-
-minetest.register_craft({
-	output = "streets:digiline_distributor",
-	recipe = {
-		{"", "digilines:wire_std_00000000", ""},
-		{"digilines:wire_std_00000000", "mesecons_luacontroller:luacontroller0000", "digilines:wire_std_00000000"},
-		{"", "digilines:wire_std_00000000", ""}
-	}
-})
diff --git a/streets/trafficlight/old2new.lua b/streets/trafficlight/old2new.lua
deleted file mode 100644
index 51ba9f3..0000000
--- a/streets/trafficlight/old2new.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---[[
-	StreetsMod: Convert old trafficlights
-]]
-minetest.register_node(":streets:trafficlight_bottom", {
-	diggable = false,
-	pointable = false,
-	drawtype = "airlike",
-	description = "I'm an old node, please drop me",
-	groups = {not_in_creative_inventory = 1}
-})
-minetest.register_abm({
-	nodenames = {"streets:trafficlight_bottom"},
-	interval = 1,
-	chance = 1,
-	action = function(pos, node)
-		minetest.log("action", "Converting trafficlight at position " .. minetest.pos_to_string(pos))
-		-- Replace controller with distributor
-		pos.y = pos.y - 2
-		minetest.set_node(pos, {name = "streets:digiline_distributor"})
-		-- Change bottom pole
-		pos.y = pos.y + 2
-		minetest.set_node(pos, {name = "streets:bigpole", param2 = 2})
-		-- Change middle pole
-		pos.y = pos.y + 1
-		minetest.set_node(pos, {name = "streets:bigpole", param2 = 2})
-		-- Change the top
-		pos.y = pos.y + 1
-		local fd = minetest.get_node(pos).param2
-		local ch = minetest.get_meta(pos):get_string("channel")
-		minetest.set_node(pos, {name = "streets:bigpole", param2 = 2})
-		-- Place new top
-		if fd == 1 then
-			minetest.set_node({x = pos.x - 1, y = pos.y, z = pos.z}, {name = "streets:trafficlight_top_warn", param2 = fd})
-			local meta = minetest.get_meta({x = pos.x - 1, y = pos.y, z = pos.z})
-			meta:set_string("channel", ch)
-			meta:set_string("state", "warn")
-			meta:set_string("formspec", "field[channel;Channel;${channel}]")
-		elseif fd == 2 then
-			minetest.set_node({x = pos.x, y = pos.y, z = pos.z + 1}, {name = "streets:trafficlight_top_warn", param2 = fd})
-			local meta = minetest.get_meta({x = pos.x, y = pos.y, z = pos.z + 1})
-			meta:set_string("channel", ch)
-			meta:set_string("state", "warn")
-			meta:set_string("formspec", "field[channel;Channel;${channel}]")
-		elseif fd == 3 then
-			minetest.set_node({x = pos.x + 1, y = pos.y, z = pos.z}, {name = "streets:trafficlight_top_warn", param2 = fd})
-			local meta = minetest.get_meta({x = pos.x + 1, y = pos.y, z = pos.z})
-			meta:set_string("channel", ch)
-			meta:set_string("state", "warn")
-			meta:set_string("formspec", "field[channel;Channel;${channel}]")
-		elseif fd == 0 then
-			minetest.set_node({x = pos.x, y = pos.y, z = pos.z - 1}, {name = "streets:trafficlight_top_warn", param2 = fd})
-			local meta = minetest.get_meta({x = pos.x, y = pos.y, z = pos.z - 1})
-			meta:set_string("channel", ch)
-			meta:set_string("state", "warn")
-			meta:set_string("formspec", "field[channel;Channel;${channel}]")
-		end
-	end
-})
\ No newline at end of file
diff --git a/streets/trafficlight/textures/streets_tl_bg.png b/streets/trafficlight/textures/streets_tl_bg.png
deleted file mode 100644
index e4213db..0000000
Binary files a/streets/trafficlight/textures/streets_tl_bg.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_flashred.png b/streets/trafficlight/textures/streets_tl_flashred.png
deleted file mode 100644
index 82c118c..0000000
Binary files a/streets/trafficlight/textures/streets_tl_flashred.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_green.png b/streets/trafficlight/textures/streets_tl_green.png
deleted file mode 100644
index 7d7ba80..0000000
Binary files a/streets/trafficlight/textures/streets_tl_green.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_left_flashred.png b/streets/trafficlight/textures/streets_tl_left_flashred.png
deleted file mode 100644
index eb1d432..0000000
Binary files a/streets/trafficlight/textures/streets_tl_left_flashred.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_left_green.png b/streets/trafficlight/textures/streets_tl_left_green.png
deleted file mode 100644
index cd0ae67..0000000
Binary files a/streets/trafficlight/textures/streets_tl_left_green.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_left_off.png b/streets/trafficlight/textures/streets_tl_left_off.png
deleted file mode 100644
index 74c88de..0000000
Binary files a/streets/trafficlight/textures/streets_tl_left_off.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_left_red.png b/streets/trafficlight/textures/streets_tl_left_red.png
deleted file mode 100644
index db0694c..0000000
Binary files a/streets/trafficlight/textures/streets_tl_left_red.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_left_warn.png b/streets/trafficlight/textures/streets_tl_left_warn.png
deleted file mode 100644
index e910682..0000000
Binary files a/streets/trafficlight/textures/streets_tl_left_warn.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_left_yellow.png b/streets/trafficlight/textures/streets_tl_left_yellow.png
deleted file mode 100644
index 5eeddbb..0000000
Binary files a/streets/trafficlight/textures/streets_tl_left_yellow.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_off.png b/streets/trafficlight/textures/streets_tl_off.png
deleted file mode 100644
index fb7dfaa..0000000
Binary files a/streets/trafficlight/textures/streets_tl_off.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_red.png b/streets/trafficlight/textures/streets_tl_red.png
deleted file mode 100644
index 4560199..0000000
Binary files a/streets/trafficlight/textures/streets_tl_red.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_right_flashred.png b/streets/trafficlight/textures/streets_tl_right_flashred.png
deleted file mode 100644
index 14d1e4a..0000000
Binary files a/streets/trafficlight/textures/streets_tl_right_flashred.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_right_green.png b/streets/trafficlight/textures/streets_tl_right_green.png
deleted file mode 100644
index f51ea81..0000000
Binary files a/streets/trafficlight/textures/streets_tl_right_green.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_right_off.png b/streets/trafficlight/textures/streets_tl_right_off.png
deleted file mode 100644
index 7f5c3e5..0000000
Binary files a/streets/trafficlight/textures/streets_tl_right_off.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_right_red.png b/streets/trafficlight/textures/streets_tl_right_red.png
deleted file mode 100644
index 8c25220..0000000
Binary files a/streets/trafficlight/textures/streets_tl_right_red.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_right_warn.png b/streets/trafficlight/textures/streets_tl_right_warn.png
deleted file mode 100644
index 9d60365..0000000
Binary files a/streets/trafficlight/textures/streets_tl_right_warn.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_right_yellow.png b/streets/trafficlight/textures/streets_tl_right_yellow.png
deleted file mode 100644
index c92724a..0000000
Binary files a/streets/trafficlight/textures/streets_tl_right_yellow.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_warn.png b/streets/trafficlight/textures/streets_tl_warn.png
deleted file mode 100644
index 349fa84..0000000
Binary files a/streets/trafficlight/textures/streets_tl_warn.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_tl_yellow.png b/streets/trafficlight/textures/streets_tl_yellow.png
deleted file mode 100644
index 42b4803..0000000
Binary files a/streets/trafficlight/textures/streets_tl_yellow.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_trafficlight_inv.png b/streets/trafficlight/textures/streets_trafficlight_inv.png
deleted file mode 100644
index fb76b72..0000000
Binary files a/streets/trafficlight/textures/streets_trafficlight_inv.png and /dev/null differ
diff --git a/streets/trafficlight/textures/streets_trafficlight_template.png b/streets/trafficlight/textures/streets_trafficlight_template.png
deleted file mode 100644
index f987c9b..0000000
Binary files a/streets/trafficlight/textures/streets_trafficlight_template.png and /dev/null differ
-- 
cgit v1.2.3