Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 37105)
+++ trunk/scconfig/hooks.c	(revision 37106)
@@ -147,9 +147,9 @@
 	int buildin, plugin;
 
 	/* TODO: get this from librnd */
-	control = get("/local/pcb/lib_hid_common/controls");
+	control = get("/local/module/lib_hid_common/controls");
 	if (control == NULL) {
-		fprintf(stderr, "librnd configuration error: can't figure how lib_hid_common is configured\n(should be coming from plugin.state as /local/pcb/lib_hid_common/controls)\n");
+		fprintf(stderr, "librnd configuration error: can't figure how lib_hid_common is configured\n(should be coming from plugin.state as /local/module/lib_hid_common/controls)\n");
 		exit(1);
 	}
 	buildin = strcmp(control, "buildin") == 0;
Index: trunk/src_plugins/acompnet/Plug.tmpasm
===================================================================
--- trunk/src_plugins/acompnet/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/acompnet/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 	$(PLUGDIR)/acompnet/meshgraph.o
 @]
 
-switch /local/pcb/acompnet/controls
+switch /local/module/acompnet/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/act_draw/Plug.tmpasm
===================================================================
--- trunk/src_plugins/act_draw/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/act_draw/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 @]
 put /local/rnd/mod/SPHASH  {$(PLUGDIR)/act_draw/keywords.sphash}
 
-switch /local/pcb/act_draw/controls
+switch /local/module/act_draw/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/act_read/Plug.tmpasm
===================================================================
--- trunk/src_plugins/act_read/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/act_read/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 put /local/rnd/mod/SPHASH  {$(PLUGDIR)/act_read/keywords.sphash}
 
 
-switch /local/pcb/act_read/controls
+switch /local/module/act_read/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/ar_cpcb/Plug.tmpasm
===================================================================
--- trunk/src_plugins/ar_cpcb/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/ar_cpcb/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 	$(PLUGDIR)/ar_cpcb/ar_cpcb.o
 @]
 
-switch /local/pcb/ar_cpcb/controls
+switch /local/module/ar_cpcb/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/ar_extern/Plug.tmpasm
===================================================================
--- trunk/src_plugins/ar_extern/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/ar_extern/Plug.tmpasm	(revision 37106)
@@ -8,7 +8,7 @@
 	$(PLUGDIR)/ar_extern/ar_extern.o
 @]
 
-switch /local/pcb/ar_extern/controls
+switch /local/module/ar_extern/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/asm/Plug.tmpasm
===================================================================
--- trunk/src_plugins/asm/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/asm/Plug.tmpasm	(revision 37106)
@@ -9,7 +9,7 @@
 @]
 
 
-switch /local/pcb/asm/controls
+switch /local/module/asm/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/autocrop/Plug.tmpasm
===================================================================
--- trunk/src_plugins/autocrop/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/autocrop/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {autocrop}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/autocrop/autocrop.o @]
 
-switch /local/pcb/autocrop/controls
+switch /local/module/autocrop/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/autoplace/Plug.tmpasm
===================================================================
--- trunk/src_plugins/autoplace/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/autoplace/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {autoplace}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/autoplace/autoplace.o $(PLUGDIR)/autoplace/action.o @]
 
-switch /local/pcb/autoplace/controls
+switch /local/module/autoplace/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/autoroute/Plug.tmpasm
===================================================================
--- trunk/src_plugins/autoroute/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/autoroute/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {autoroute}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/autoroute/autoroute.o $(PLUGDIR)/autoroute/mtspace.o $(PLUGDIR)/autoroute/action.o $(PLUGDIR)/autoroute/vector.o @]
 
-switch /local/pcb/autoroute/controls
+switch /local/module/autoroute/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/cam/Plug.tmpasm
===================================================================
--- trunk/src_plugins/cam/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/cam/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 put /local/rnd/mod/CONFFILE {cam.conf}
 put /local/rnd/mod/CONFVAR {cam_conf_internal}
 
-switch /local/pcb/cam/controls
+switch /local/module/cam/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/ch_editpoint/Plug.tmpasm
===================================================================
--- trunk/src_plugins/ch_editpoint/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/ch_editpoint/Plug.tmpasm	(revision 37106)
@@ -9,7 +9,7 @@
 @]
 
 
-switch /local/pcb/ch_editpoint/controls
+switch /local/module/ch_editpoint/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/ch_onpoint/Plug.tmpasm
===================================================================
--- trunk/src_plugins/ch_onpoint/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/ch_onpoint/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 @]
 
 
-switch /local/pcb/ch_onpoint/controls
+switch /local/module/ch_onpoint/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/ddraft/Plug.tmpasm
===================================================================
--- trunk/src_plugins/ddraft/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/ddraft/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 @]
 put /local/rnd/mod/SPHASH  {$(PLUGDIR)/ddraft/fields.sphash}
 
-switch /local/pcb/ddraft/controls
+switch /local/module/ddraft/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/diag/Plug.tmpasm
===================================================================
--- trunk/src_plugins/diag/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/diag/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 put /local/rnd/mod/CONF {$(PLUGDIR)/diag/diag_conf.h}
 
 
-switch /local/pcb/diag/controls
+switch /local/module/diag/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/dialogs/Plug.tmpasm
===================================================================
--- trunk/src_plugins/dialogs/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/dialogs/Plug.tmpasm	(revision 37106)
@@ -20,7 +20,7 @@
 put /local/rnd/mod/CONF {$(PLUGDIR)/dialogs/adialogs_conf.h}
 put /local/rnd/mod/CONFVAR {adialogs_conf_internal}
 
-switch /local/pcb/dialogs/controls
+switch /local/module/dialogs/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/distalign/Plug.tmpasm
===================================================================
--- trunk/src_plugins/distalign/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/distalign/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {distalign}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/distalign/distalign.o @]
 
-switch /local/pcb/distalign/controls
+switch /local/module/distalign/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/djopt/Plug.tmpasm
===================================================================
--- trunk/src_plugins/djopt/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/djopt/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 put /local/rnd/mod/MENUFILE {djopt-menu.lht}
 put /local/rnd/mod/MENUVAR {djopt_menu}
 
-switch /local/pcb/djopt/controls
+switch /local/module/djopt/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/draw_csect/Plug.tmpasm
===================================================================
--- trunk/src_plugins/draw_csect/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/draw_csect/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 	$(PLUGDIR)/draw_csect/draw_csect.o
 @]
 
-switch /local/pcb/draw_csect/controls
+switch /local/module/draw_csect/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/draw_fab/Plug.tmpasm
===================================================================
--- trunk/src_plugins/draw_fab/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/draw_fab/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 @]
 put /local/rnd/mod/CONF {$(PLUGDIR)/draw_fab/draw_fab_conf.h}
 
-switch /local/pcb/draw_fab/controls
+switch /local/module/draw_fab/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/draw_fontsel/Plug.tmpasm
===================================================================
--- trunk/src_plugins/draw_fontsel/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/draw_fontsel/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 	$(PLUGDIR)/draw_fontsel/draw_fontsel.o
 @]
 
-switch /local/pcb/draw_fontsel/controls
+switch /local/module/draw_fontsel/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/drc_query/Plug.tmpasm
===================================================================
--- trunk/src_plugins/drc_query/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/drc_query/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 put /local/rnd/mod/CONFFILE {drc_query.conf}
 put /local/rnd/mod/CONFVAR {drc_query_conf_internal}
 
-switch /local/pcb/drc_query/controls
+switch /local/module/drc_query/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/expfeat/Plug.tmpasm
===================================================================
--- trunk/src_plugins/expfeat/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/expfeat/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {expfeat}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/expfeat/expfeat.o @]
 
-switch /local/pcb/expfeat/controls
+switch /local/module/expfeat/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_bom/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_bom/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_bom/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_bom}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_bom/bom.o @]
 
-switch /local/pcb/export_bom/controls
+switch /local/module/export_bom/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_c_draw/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_c_draw/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_c_draw/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_c_draw}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_c_draw/export_c_draw.o @]
 
-switch /local/pcb/export_c_draw/controls
+switch /local/module/export_c_draw/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_debug/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_debug/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_debug/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_debug}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_debug/export_debug.o @]
 
-switch /local/pcb/export_debug/controls
+switch /local/module/export_debug/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_dxf/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_dxf/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_dxf/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 	$(PLUGDIR)/export_dxf/dxf_templ_lht.o
 @]
 
-switch /local/pcb/export_dxf/controls
+switch /local/module/export_dxf/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_excellon/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_excellon/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_excellon/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 put /local/rnd/mod/CONF {$(PLUGDIR)/export_excellon/excellon_conf.h}
 
 
-switch /local/pcb/export_excellon/controls
+switch /local/module/export_excellon/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_fidocadj/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_fidocadj/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_fidocadj/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_fidocadj}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_fidocadj/fidocadj.o @]
 
-switch /local/pcb/export_fidocadj/controls
+switch /local/module/export_fidocadj/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_gcode/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_gcode/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_gcode/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 @]
 
 
-switch /local/pcb/export_gcode/controls
+switch /local/module/export_gcode/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_gerber/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_gerber/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_gerber/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 put /local/rnd/mod/CONF {$(PLUGDIR)/export_gerber/gerber_conf.h}
 
 
-switch /local/pcb/export_gerber/controls
+switch /local/module/export_gerber/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_hpgl/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_hpgl/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_hpgl/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_hpgl}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_hpgl/export_hpgl.o @]
 
-switch /local/pcb/export_hpgl/controls
+switch /local/module/export_hpgl/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_ipcd356/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_ipcd356/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_ipcd356/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_ipcd356}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_ipcd356/ipcd356.o @]
 
-switch /local/pcb/export_ipcd356/controls
+switch /local/module/export_ipcd356/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_lpr/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_lpr/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_lpr/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 @]
 put /local/rnd/mod/CONF {$(PLUGDIR)/export_lpr/export_lpr_conf.h}
 
-switch /local/pcb/export_lpr/controls
+switch /local/module/export_lpr/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_oldconn/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_oldconn/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_oldconn/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_oldconn}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_oldconn/oldconn.o @]
 
-switch /local/pcb/export_oldconn/controls
+switch /local/module/export_oldconn/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_openems/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_openems/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_openems/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 	$(PLUGDIR)/export_openems/mesh.o
 @]
 
-switch /local/pcb/export_openems/controls
+switch /local/module/export_openems/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_openscad/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_openscad/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_openscad/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 	$(PLUGDIR)/export_openscad/export_openscad.o
 @]
 
-switch /local/pcb/export_openscad/controls
+switch /local/module/export_openscad/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_png/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_png/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_png/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 	$(PLUGDIR)/export_png/png.o
 @]
 
-switch /local/pcb/export_png/controls
+switch /local/module/export_png/controls
 	case {disable} end;
 	default
 		put /local/rnd/mod/LDFLAGS         libs/gui/gd/ldflags
@@ -11,7 +11,7 @@
 		end
 end
 
-switch /local/pcb/export_png/controls
+switch /local/module/export_png/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_ps/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_ps/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_ps/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
  $(PLUGDIR)/export_ps/eps.o
 @]
 
-switch /local/pcb/export_ps/controls
+switch /local/module/export_ps/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_stat/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_stat/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_stat/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_stat}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_stat/stat.o @]
 
-switch /local/pcb/export_stat/controls
+switch /local/module/export_stat/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_stl/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_stl/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_stl/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_stl}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_stl/export_stl.o @]
 
-switch /local/pcb/export_stl/controls
+switch /local/module/export_stl/controls
 	case {disable} end;
 	default
 		put /local/rnd/mod/CFLAGS   ?/target/libs/sul/libxml2/cflags
@@ -9,7 +9,7 @@
 	end
 end
 
-switch /local/pcb/export_stl/controls
+switch /local/module/export_stl/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_svg/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_svg/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_svg/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
  $(PLUGDIR)/export_svg/svg.o
 @]
 
-switch /local/pcb/export_svg/controls
+switch /local/module/export_svg/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_vfs_fuse/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_vfs_fuse/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_vfs_fuse/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_vfs_fuse}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_vfs_fuse/export_vfs_fuse.o @]
 
-switch /local/pcb/export_vfs_fuse/controls
+switch /local/module/export_vfs_fuse/controls
 	case {disable} end;
 	default
 		put /local/rnd/mod/CFLAGS   [@@/target/libs/sul/fuse/cflags@@]
@@ -10,7 +10,7 @@
 	end
 end
 
-switch /local/pcb/export_vfs_fuse/controls
+switch /local/module/export_vfs_fuse/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_vfs_mc/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_vfs_mc/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_vfs_mc/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {export_vfs_mc}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_vfs_mc/export_vfs_mc.o @]
 
-switch /local/pcb/export_vfs_mc/controls
+switch /local/module/export_vfs_mc/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/export_xy/Plug.tmpasm
===================================================================
--- trunk/src_plugins/export_xy/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/export_xy/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 put /local/rnd/mod/CONFFILE {export_xy.conf}
 put /local/rnd/mod/CONFVAR {export_xy_conf_internal}
 
-switch /local/pcb/export_xy/controls
+switch /local/module/export_xy/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/extedit/Plug.tmpasm
===================================================================
--- trunk/src_plugins/extedit/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/extedit/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
  $(PLUGDIR)/extedit/extedit.o
 @]
 
-switch /local/pcb/extedit/controls
+switch /local/module/extedit/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/exto_std/Plug.tmpasm
===================================================================
--- trunk/src_plugins/exto_std/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/exto_std/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 @]
 
 
-switch /local/pcb/exto_std/controls
+switch /local/module/exto_std/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/fontmode/Plug.tmpasm
===================================================================
--- trunk/src_plugins/fontmode/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/fontmode/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {fontmode}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/fontmode/fontmode.o @]
 
-switch /local/pcb/fontmode/controls
+switch /local/module/fontmode/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/fp_board/Plug.tmpasm
===================================================================
--- trunk/src_plugins/fp_board/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/fp_board/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {fp_board}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/fp_board/fp_board.o @]
 
-switch /local/pcb/fp_board/controls
+switch /local/module/fp_board/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/fp_fs/Plug.tmpasm
===================================================================
--- trunk/src_plugins/fp_fs/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/fp_fs/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 put /local/rnd/mod/CONFFILE {fp_fs.conf}
 put /local/rnd/mod/CONFVAR {fp_fs_conf_internal}
 
-switch /local/pcb/fp_fs/controls
+switch /local/module/fp_fs/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/fp_wget/Plug.tmpasm
===================================================================
--- trunk/src_plugins/fp_wget/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/fp_wget/Plug.tmpasm	(revision 37106)
@@ -9,7 +9,7 @@
 put /local/rnd/mod/CONFFILE {fp_wget.conf}
 put /local/rnd/mod/CONFVAR {fp_wget_conf_internal}
 
-switch /local/pcb/fp_wget/controls
+switch /local/module/fp_wget/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_accel_net/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_accel_net/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_accel_net/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {accel_net-menu.lht}
 put /local/rnd/mod/MENUVAR {accel_net_menu}
 
-switch /local/pcb/import_accel_net/controls
+switch /local/module/import_accel_net/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_calay/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_calay/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_calay/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {calay-menu.lht}
 put /local/rnd/mod/MENUVAR {calay_menu}
 
-switch /local/pcb/import_calay/controls
+switch /local/module/import_calay/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_edif/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_edif/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_edif/Plug.tmpasm	(revision 37106)
@@ -2,7 +2,7 @@
 append /local/rnd/mod/OBJS [@ $(PLUGDIR)/import_edif/edif.o $(PLUGDIR)/import_edif/import_edif.o @]
 append /local/rnd/mod/YACC {$(PLUGDIR)/import_edif/edif}
 
-switch /local/pcb/import_edif/controls
+switch /local/module/import_edif/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_fpcb_nl/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_fpcb_nl/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_fpcb_nl/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {fpcb_nl-menu.lht}
 put /local/rnd/mod/MENUVAR {fpcb_nl_menu}
 
-switch /local/pcb/import_fpcb_nl/controls
+switch /local/module/import_fpcb_nl/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_gnetlist/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_gnetlist/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_gnetlist/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 put /local/rnd/mod/CONFVAR {import_gnetlist_conf_internal}
 
 
-switch /local/pcb/import_gnetlist/controls
+switch /local/module/import_gnetlist/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_hpgl/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_hpgl/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_hpgl/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 put /local/rnd/mod/MENUFILE {hpgl-menu.lht}
 put /local/rnd/mod/MENUVAR {hpgl_menu}
 
-switch /local/pcb/import_hpgl/controls
+switch /local/module/import_hpgl/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_ipcd356/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_ipcd356/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_ipcd356/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {ipcd356-menu.lht}
 put /local/rnd/mod/MENUVAR {ipcd356_menu}
 
-switch /local/pcb/import_ipcd356/controls
+switch /local/module/import_ipcd356/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_ltspice/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_ltspice/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_ltspice/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {ltspice-menu.lht}
 put /local/rnd/mod/MENUVAR {ltspice_menu}
 
-switch /local/pcb/import_ltspice/controls
+switch /local/module/import_ltspice/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_mentor_sch/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_mentor_sch/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_mentor_sch/Plug.tmpasm	(revision 37106)
@@ -8,7 +8,7 @@
 put /local/rnd/mod/MENUVAR {mentor_menu}
 
 
-switch /local/pcb/import_mentor_sch/controls
+switch /local/module/import_mentor_sch/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_mucs/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_mucs/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_mucs/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {mucs-menu.lht}
 put /local/rnd/mod/MENUVAR {mucs_menu}
 
-switch /local/pcb/import_mucs/controls
+switch /local/module/import_mucs/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_net_action/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_net_action/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_net_action/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {import_net_action}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/import_net_action/import_net_action.o @]
 
-switch /local/pcb/import_net_action/controls
+switch /local/module/import_net_action/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_net_cmd/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_net_cmd/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_net_cmd/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {import_net_cmd}
 append /local/rnd/mod/OBJS [@ $(PLUGDIR)/import_net_cmd/import_net_cmd.o @]
 
-switch /local/pcb/import_net_cmd/controls
+switch /local/module/import_net_cmd/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_netlist/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_netlist/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_netlist/Plug.tmpasm	(revision 37106)
@@ -2,7 +2,7 @@
 append /local/rnd/mod/OBJS [@ $(PLUGDIR)/import_netlist/import_netlist.o @]
 append /local/rnd/mod/YACC {$(PLUGDIR)/import_netlist/netlist}
 
-switch /local/pcb/import_netlist/controls
+switch /local/module/import_netlist/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_orcad_net/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_orcad_net/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_orcad_net/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {orcad_net-menu.lht}
 put /local/rnd/mod/MENUVAR {orcad_net_menu}
 
-switch /local/pcb/import_orcad_net/controls
+switch /local/module/import_orcad_net/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_pads_net/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_pads_net/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_pads_net/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {pads_net-menu.lht}
 put /local/rnd/mod/MENUVAR {pads_net_menu}
 
-switch /local/pcb/import_pads_net/controls
+switch /local/module/import_pads_net/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_protel_net/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_protel_net/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_protel_net/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {protel_net-menu.lht}
 put /local/rnd/mod/MENUVAR {protel_net_menu}
 
-switch /local/pcb/import_protel_net/controls
+switch /local/module/import_protel_net/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_sch2/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_sch2/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_sch2/Plug.tmpasm	(revision 37106)
@@ -2,7 +2,7 @@
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/import_sch2/import_sch.o @]
 put /local/rnd/mod/CONF {$(PLUGDIR)/import_sch2/import_sch_conf.h}
 
-switch /local/pcb/import_sch2/controls
+switch /local/module/import_sch2/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_sch_rnd/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_sch_rnd/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_sch_rnd/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 put /local/rnd/mod/CONFVAR {import_sch_rnd_conf_internal}
 
 
-switch /local/pcb/import_sch_rnd/controls
+switch /local/module/import_sch_rnd/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_tinycad/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_tinycad/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_tinycad/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUFILE {tinycad-menu.lht}
 put /local/rnd/mod/MENUVAR {tinycad_menu}
 
-switch /local/pcb/import_tinycad/controls
+switch /local/module/import_tinycad/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/import_ttf/Plug.tmpasm
===================================================================
--- trunk/src_plugins/import_ttf/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/import_ttf/Plug.tmpasm	(revision 37106)
@@ -7,7 +7,7 @@
 	$(PLUGDIR)/import_ttf/str_approx.o
 @]
 
-switch /local/pcb/import_ttf/controls
+switch /local/module/import_ttf/controls
 	case {disable} end;
 	default
 		put /local/rnd/mod/LDFLAGS         libs/sul/freetype2/ldflags
@@ -15,7 +15,7 @@
 		end
 end
 
-switch /local/pcb/import_ttf/controls
+switch /local/module/import_ttf/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_altium/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_altium/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_altium/Plug.tmpasm	(revision 37106)
@@ -13,7 +13,7 @@
 	../src_3rd/libucdf/ucdf.o
 @]
 
-switch /local/pcb/io_altium/controls
+switch /local/module/io_altium/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_autotrax/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_autotrax/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_autotrax/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 	$(PLUGDIR)/io_autotrax/read.o
 @]
 
-switch /local/pcb/io_autotrax/controls
+switch /local/module/io_autotrax/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_bxl/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_bxl/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_bxl/Plug.tmpasm	(revision 37106)
@@ -10,7 +10,7 @@
 put /local/rnd/mod/BYACCIC  {$(PLUGDIR)/io_bxl/bxl_gram}
 put /local/rnd/mod/UREGLEX  {$(PLUGDIR)/io_bxl/bxl_lex}
 
-switch /local/pcb/io_bxl/controls
+switch /local/module/io_bxl/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_dsn/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_dsn/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_dsn/Plug.tmpasm	(revision 37106)
@@ -9,7 +9,7 @@
 	$(PLUGDIR)/io_dsn/export.o
 @]
 
-switch /local/pcb/io_dsn/controls
+switch /local/module/io_dsn/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_eagle/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_eagle/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_eagle/Plug.tmpasm	(revision 37106)
@@ -9,7 +9,7 @@
  $(PLUGDIR)/io_eagle/trparse_bin.o
 @]
 
-switch /local/pcb/io_eagle/controls
+switch /local/module/io_eagle/controls
 	case {disable} end;
 	default
 		put /local/rnd/mod/CFLAGS   /target/libs/sul/libxml2/cflags
@@ -18,7 +18,7 @@
 end
 
 
-switch /local/pcb/io_eagle/controls
+switch /local/module/io_eagle/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_hyp/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_hyp/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_hyp/Plug.tmpasm	(revision 37106)
@@ -14,7 +14,7 @@
 put /local/rnd/mod/LEX  {$(PLUGDIR)/io_hyp/hyp_l}
 
 
-switch /local/pcb/io_hyp/controls
+switch /local/module/io_hyp/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_kicad/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_kicad/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_kicad/Plug.tmpasm	(revision 37106)
@@ -12,7 +12,7 @@
 put /local/rnd/mod/MENUFILE {kicad-menu.lht}
 put /local/rnd/mod/MENUVAR {kicad_menu}
 
-switch /local/pcb/io_kicad/controls
+switch /local/module/io_kicad/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_kicad_legacy/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_kicad_legacy/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_kicad_legacy/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
  $(PLUGDIR)/io_kicad_legacy/write.o
 @]
 
-switch /local/pcb/io_kicad_legacy/controls
+switch /local/module/io_kicad_legacy/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_lihata/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_lihata/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_lihata/Plug.tmpasm	(revision 37106)
@@ -9,7 +9,7 @@
 put /local/rnd/mod/CONF {$(PLUGDIR)/io_lihata/lht_conf.h}
 
 
-switch /local/pcb/io_lihata/controls
+switch /local/module/io_lihata/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_mentor_cell/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_mentor_cell/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_mentor_cell/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
  $(PLUGDIR)/io_mentor_cell/read.o
 @]
 
-switch /local/pcb/io_mentor_cell/controls
+switch /local/module/io_mentor_cell/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_pads/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_pads/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_pads/Plug.tmpasm	(revision 37106)
@@ -13,7 +13,7 @@
 
 #	$(PLUGDIR)/io_pads/write.o
 
-switch /local/pcb/io_pads/controls
+switch /local/module/io_pads/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_pcb/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_pcb/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_pcb/Plug.tmpasm	(revision 37106)
@@ -9,7 +9,7 @@
 put /local/rnd/mod/YACC {$(PLUGDIR)/io_pcb/parse_y}
 put /local/rnd/mod/LEX  {$(PLUGDIR)/io_pcb/parse_l}
 
-switch /local/pcb/io_pcb/controls
+switch /local/module/io_pcb/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/io_tedax/Plug.tmpasm
===================================================================
--- trunk/src_plugins/io_tedax/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/io_tedax/Plug.tmpasm	(revision 37106)
@@ -19,7 +19,7 @@
 put /local/rnd/mod/SPHASH  {$(PLUGDIR)/io_tedax/tdrc_keys.sphash}
 put /local/rnd/mod/SPHASH_ARGS {--multi}
 
-switch /local/pcb/io_tedax/controls
+switch /local/module/io_tedax/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/jostle/Plug.tmpasm
===================================================================
--- trunk/src_plugins/jostle/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/jostle/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {jostle}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/jostle/jostle.o @]
 
-switch /local/pcb/jostle/controls
+switch /local/module/jostle/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/lib_compat_help/Plug.tmpasm
===================================================================
--- trunk/src_plugins/lib_compat_help/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/lib_compat_help/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 	$(PLUGDIR)/lib_compat_help/media.o
 @]
 
-switch /local/pcb/lib_compat_help/controls
+switch /local/module/lib_compat_help/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/lib_formula/Plug.tmpasm
===================================================================
--- trunk/src_plugins/lib_formula/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/lib_formula/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 	$(PLUGDIR)/lib_formula/bisect.o
 @]
 
-switch /local/pcb/lib_formula/controls
+switch /local/module/lib_formula/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/lib_hid_pcbui/Plug.tmpasm
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/lib_hid_pcbui/Plug.tmpasm	(revision 37106)
@@ -8,7 +8,7 @@
   $(PLUGDIR)/lib_hid_pcbui/layersel.o
 @]
 
-switch /local/pcb/lib_hid_pcbui/controls
+switch /local/module/lib_hid_pcbui/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/lib_netmap/Plug.tmpasm
===================================================================
--- trunk/src_plugins/lib_netmap/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/lib_netmap/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 	$(PLUGDIR)/lib_netmap/pstklib.o
 @]
 
-switch /local/pcb/lib_netmap/controls
+switch /local/module/lib_netmap/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/lib_polyhelp/Plug.tmpasm
===================================================================
--- trunk/src_plugins/lib_polyhelp/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/lib_polyhelp/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 	$(PLUGDIR)/lib_polyhelp/triangulate.o
 @]
 
-switch /local/pcb/lib_polyhelp/controls
+switch /local/module/lib_polyhelp/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/lib_vfs/Plug.tmpasm
===================================================================
--- trunk/src_plugins/lib_vfs/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/lib_vfs/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 	$(PLUGDIR)/lib_vfs/lib_vfs.o
 @]
 
-switch /local/pcb/lib_vfs/controls
+switch /local/module/lib_vfs/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/millpath/Plug.tmpasm
===================================================================
--- trunk/src_plugins/millpath/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/millpath/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
  $(PLUGDIR)/millpath/toolpath.o
 @]
 
-switch /local/pcb/millpath/controls
+switch /local/module/millpath/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/mincut/Plug.tmpasm
===================================================================
--- trunk/src_plugins/mincut/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/mincut/Plug.tmpasm	(revision 37106)
@@ -2,7 +2,7 @@
 append /local/rnd/mod/OBJS [@ $(PLUGDIR)/mincut/rats_mincut.o $(PLUGDIR)/mincut/pcb-mincut/graph.o $(PLUGDIR)/mincut/pcb-mincut/solve.o @]
 put /local/rnd/mod/CONF {$(PLUGDIR)/mincut/rats_mincut_conf.h}
 
-switch /local/pcb/mincut/controls
+switch /local/module/mincut/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/oldactions/Plug.tmpasm
===================================================================
--- trunk/src_plugins/oldactions/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/oldactions/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {oldactions}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/oldactions/oldactions.o @]
 
-switch /local/pcb/oldactions/controls
+switch /local/module/oldactions/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/order/Plug.tmpasm
===================================================================
--- trunk/src_plugins/order/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/order/Plug.tmpasm	(revision 37106)
@@ -14,7 +14,7 @@
 put /local/rnd/mod/BYACCIC  {$(PLUGDIR)/order/const_gram}
 put /local/rnd/mod/UREGLEX  {$(PLUGDIR)/order/const_lex}
 
-switch /local/pcb/order/controls
+switch /local/module/order/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/order_pcbway/Plug.tmpasm
===================================================================
--- trunk/src_plugins/order_pcbway/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/order_pcbway/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 	$(PLUGDIR)/order_pcbway/pcbway.o
 @]
 
-switch /local/pcb/order_pcbway/controls
+switch /local/module/order_pcbway/controls
 	case {disable} end;
 	default
 		put /local/rnd/mod/CFLAGS   /target/libs/sul/libxml2/cflags
@@ -15,7 +15,7 @@
 end
 
 
-switch /local/pcb/order_pcbway/controls
+switch /local/module/order_pcbway/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/polycombine/Plug.tmpasm
===================================================================
--- trunk/src_plugins/polycombine/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/polycombine/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {polycombine}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/polycombine/polycombine.o @]
 
-switch /local/pcb/polycombine/controls
+switch /local/module/polycombine/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/polystitch/Plug.tmpasm
===================================================================
--- trunk/src_plugins/polystitch/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/polystitch/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {polystitch}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/polystitch/polystitch.o @]
 
-switch /local/pcb/polystitch/controls
+switch /local/module/polystitch/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/propedit/Plug.tmpasm
===================================================================
--- trunk/src_plugins/propedit/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/propedit/Plug.tmpasm	(revision 37106)
@@ -6,7 +6,7 @@
 	$(PLUGDIR)/propedit/propdlg.o
 @]
 
-switch /local/pcb/propedit/controls
+switch /local/module/propedit/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/puller/Plug.tmpasm
===================================================================
--- trunk/src_plugins/puller/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/puller/Plug.tmpasm	(revision 37106)
@@ -3,7 +3,7 @@
 put /local/rnd/mod/MENUVAR {puller_menu}
 append /local/rnd/mod/OBJS_C99 [@ $(PLUGDIR)/puller/puller.o @]
 
-switch /local/pcb/puller/controls
+switch /local/module/puller/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/query/Plug.tmpasm
===================================================================
--- trunk/src_plugins/query/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/query/Plug.tmpasm	(revision 37106)
@@ -16,7 +16,7 @@
 put /local/rnd/mod/LEX  {$(PLUGDIR)/query/query_l}
 put /local/rnd/mod/SPHASH  {$(PLUGDIR)/query/fields.sphash}
 
-switch /local/pcb/query/controls
+switch /local/module/query/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/renumber/Plug.tmpasm
===================================================================
--- trunk/src_plugins/renumber/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/renumber/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {renumber}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/renumber/renumber.o $(PLUGDIR)/renumber/renumberblock.o @]
 
-switch /local/pcb/renumber/controls
+switch /local/module/renumber/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/report/Plug.tmpasm
===================================================================
--- trunk/src_plugins/report/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/report/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 @]
 put /local/rnd/mod/CONF {$(PLUGDIR)/report/report_conf.h}
 
-switch /local/pcb/report/controls
+switch /local/module/report/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/rubberband_orig/Plug.tmpasm
===================================================================
--- trunk/src_plugins/rubberband_orig/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/rubberband_orig/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
 @]
 put /local/rnd/mod/CONF {$(PLUGDIR)/rubberband_orig/rubberband_conf.h}
 
-switch /local/pcb/rubberband_orig/controls
+switch /local/module/rubberband_orig/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/serpentine/Plug.tmpasm
===================================================================
--- trunk/src_plugins/serpentine/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/serpentine/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 @]
 put /local/rnd/mod/CONF {$(PLUGDIR)/serpentine/serpentine_conf.h}
 
-switch /local/pcb/serpentine/controls
+switch /local/module/serpentine/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/shand_cmd/Plug.tmpasm
===================================================================
--- trunk/src_plugins/shand_cmd/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/shand_cmd/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {shand_cmd}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/shand_cmd/command.o @]
 
-switch /local/pcb/shand_cmd/controls
+switch /local/module/shand_cmd/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/shape/Plug.tmpasm
===================================================================
--- trunk/src_plugins/shape/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/shape/Plug.tmpasm	(revision 37106)
@@ -5,7 +5,7 @@
  $(PLUGDIR)/shape/shape.o
 @]
 
-switch /local/pcb/shape/controls
+switch /local/module/shape/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/show_netnames/Plug.tmpasm
===================================================================
--- trunk/src_plugins/show_netnames/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/show_netnames/Plug.tmpasm	(revision 37106)
@@ -8,7 +8,7 @@
  $(PLUGDIR)/show_netnames/show_netnames.o
 @]
 
-switch /local/pcb/show_netnames/controls
+switch /local/module/show_netnames/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/sketch_route/Plug.tmpasm
===================================================================
--- trunk/src_plugins/sketch_route/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/sketch_route/Plug.tmpasm	(revision 37106)
@@ -12,7 +12,7 @@
  $(SRC_3RD_DIR)/libcdtr/triangle.o
 @]
 
-switch /local/pcb/sketch_route/controls
+switch /local/module/sketch_route/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/smartdisperse/Plug.tmpasm
===================================================================
--- trunk/src_plugins/smartdisperse/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/smartdisperse/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {smartdisperse}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/smartdisperse/smartdisperse.o @]
 
-switch /local/pcb/smartdisperse/controls
+switch /local/module/smartdisperse/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/teardrops/Plug.tmpasm
===================================================================
--- trunk/src_plugins/teardrops/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/teardrops/Plug.tmpasm	(revision 37106)
@@ -1,7 +1,7 @@
 put /local/rnd/mod {teardrops}
 put /local/rnd/mod/OBJS [@ $(PLUGDIR)/teardrops/teardrops.o @]
 
-switch /local/pcb/teardrops/controls
+switch /local/module/teardrops/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/tool_std/Plug.tmpasm
===================================================================
--- trunk/src_plugins/tool_std/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/tool_std/Plug.tmpasm	(revision 37106)
@@ -19,7 +19,7 @@
 	$(PLUGDIR)/tool_std/tool_via.o
 @]
 
-switch /local/pcb/tool_std/controls
+switch /local/module/tool_std/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;
Index: trunk/src_plugins/vendordrill/Plug.tmpasm
===================================================================
--- trunk/src_plugins/vendordrill/Plug.tmpasm	(revision 37105)
+++ trunk/src_plugins/vendordrill/Plug.tmpasm	(revision 37106)
@@ -4,7 +4,7 @@
 put /local/rnd/mod/MENUFILE {vendor-menu.lht}
 put /local/rnd/mod/MENUVAR {vendor_menu}
 
-switch /local/pcb/vendordrill/controls
+switch /local/module/vendordrill/controls
 	case {buildin}   include /local/pcb/tmpasm/buildin; end;
 	case {plugin}    include /local/pcb/tmpasm/plugin; end;
 	case {disable}   include /local/pcb/tmpasm/disable; end;