Index: Makefile.in
===================================================================
--- Makefile.in	(revision 36985)
+++ Makefile.in	(revision 36986)
@@ -299,7 +299,7 @@
 
 pcb-rnd$(EXE): $(OBJS) $(OBJS_C99) $(EXEDEPS) $(LIBS_3RD) $(LIBRND_L)/librnd-hid$(SO) $(LIBRND_L)/librnd-poly$(SO) $(LIBRND_L)/librnd-3rd$(SO)
 	$(CC) $(OBJS) $(OBJS_C99) -o pcb-rnd$(EXE) $(LIBS_PRE) \
-		-lrnd-font -lrnd-hid -lrnd-poly -lrnd-3rd \
+		-lrnd-hid -lrnd-font -lrnd-poly -lrnd-core -lrnd-3rd \
 		$(LDFLAGS) $(LIBS)
 
 ### pcb-rnd infra ###
Index: board.c
===================================================================
--- board.c	(revision 36985)
+++ board.c	(revision 36986)
@@ -34,13 +34,13 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/paths.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/poly/rtree.h>
 #include "undo.h"
 #include "draw.h"
 #include "event.h"
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "layer.h"
 #include "netlist.h"
 
Index: brave.c
===================================================================
--- brave.c	(revision 36985)
+++ brave.c	(revision 36986)
@@ -38,7 +38,7 @@
 #include <librnd/core/conf_hid.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/error.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 pcb_brave_t pcb_brave = 0;
 static const char brave_cookie[] = "brave";
Index: buffer.c
===================================================================
--- buffer.c	(revision 36985)
+++ buffer.c	(revision 36986)
@@ -45,7 +45,7 @@
 #include "undo.h"
 #include "funchash_core.h"
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/pixmap.h>
+#include <librnd/hid/pixmap.h>
 #include "obj_arc_op.h"
 #include "obj_line_op.h"
 #include "obj_text_op.h"
@@ -59,9 +59,9 @@
 #include <librnd/core/event.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "extobj.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 static int move_buffer_pre(pcb_opctx_t *ctx, pcb_any_obj_t *ptr2, void *ptr3);
 static void move_buffer_post(pcb_opctx_t *ctx, pcb_any_obj_t *ptr2, void *ptr3);
Index: build_run.c
===================================================================
--- build_run.c	(revision 36985)
+++ build_run.c	(revision 36986)
@@ -34,7 +34,7 @@
 #include "conf_core.h"
 #include "board.h"
 #include "build_run.h"
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include "plug_io.h"
 #include <librnd/core/compat_misc.h>
 
Index: change_act.c
===================================================================
--- change_act.c	(revision 36985)
+++ change_act.c	(revision 36986)
@@ -49,7 +49,7 @@
 #include <librnd/core/compat_misc.h>
 #include "obj_rat_draw.h"
 #include "data_it.h"
-#include <librnd/core/grid.h>
+#include <librnd/hid/grid.h>
 #include "route_style.h"
 #include <librnd/core/hidlib_conf.h>
 #include "obj_subc_parent.h"
Index: conf_act.c
===================================================================
--- conf_act.c	(revision 36985)
+++ conf_act.c	(revision 36986)
@@ -32,7 +32,7 @@
 #include "funchash_core.h"
 #include "route_style.h"
 #include <librnd/core/error.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 #define PCB do_not_use_PCB
 
Index: conf_core.c
===================================================================
--- conf_core.c	(revision 36985)
+++ conf_core.c	(revision 36986)
@@ -8,7 +8,7 @@
 #include <genht/hash.h>
 
 /* Required for win32 path hack: */
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 conf_core_t conf_core;
 
Index: crosshair.c
===================================================================
--- crosshair.c	(revision 36985)
+++ crosshair.c	(revision 36986)
@@ -42,7 +42,7 @@
 #include "search.h"
 #include "polygon.h"
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/poly/offset.h>
 #include "find.h"
@@ -49,7 +49,7 @@
 #include "undo.h"
 #include "event.h"
 #include "thermal.h"
-#include <librnd/core/grid.h>
+#include <librnd/hid/grid.h>
 
 #include "obj_line_draw.h"
 #include "obj_arc_draw.h"
@@ -60,7 +60,7 @@
 #include "obj_arc_ui.h"
 #include "obj_subc_parent.h"
 
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 typedef struct {
 	int x, y;
Index: crosshair.h
===================================================================
--- crosshair.h	(revision 36985)
+++ crosshair.h	(revision 36986)
@@ -31,7 +31,7 @@
 #define PCB_CROSSHAIR_H
 
 #include "config.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/hidlib.h>
 #include "obj_line.h"
 #include "obj_poly.h"
Index: draw.c
===================================================================
--- draw.c	(revision 36985)
+++ draw.c	(revision 36986)
@@ -40,7 +40,7 @@
 #include <librnd/poly/rtree.h>
 #include "stub_draw.h"
 #include "layer_ui.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/conf_hid.h>
 #include "funchash_core.h"
 
Index: draw.h
===================================================================
--- draw.h	(revision 36985)
+++ draw.h	(revision 36986)
@@ -30,7 +30,7 @@
 #define PCB_DRAW_H
 
 #include "config.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "layer.h"
 
 /* holds information about output window */
Index: draw_wireframe.h
===================================================================
--- draw_wireframe.h	(revision 36985)
+++ draw_wireframe.h	(revision 36986)
@@ -29,7 +29,7 @@
 #define PCB_DRAW_WIREFRAME_H
 
 #include "config.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 /*-----------------------------------------------------------
  * Draws the outline of an arc
Index: drc.c
===================================================================
--- drc.c	(revision 36985)
+++ drc.c	(revision 36986)
@@ -28,7 +28,7 @@
 #include "config.h"
 
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "board.h"
 #include "drc.h"
 #include <librnd/core/hidlib_conf.h>
Index: extobj_act.c
===================================================================
--- extobj_act.c	(revision 36985)
+++ extobj_act.c	(revision 36986)
@@ -29,10 +29,10 @@
 #include <librnd/core/actions.h>
 #include "conf_core.h"
 #include "funchash_core.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "search.h"
 #include "undo.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 #include "extobj.h"
 
Index: extobj_helper.h
===================================================================
--- extobj_helper.h	(revision 36985)
+++ extobj_helper.h	(revision 36986)
@@ -26,8 +26,8 @@
 
 #include "obj_subc.h"
 #include "conf_core.h"
-#include <librnd/core/hid_inlines.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_inlines.h>
+#include <librnd/hid/hid_dad.h>
 #include "change.h"
 #include "undo.h"
 
Index: file_act.c
===================================================================
--- file_act.c	(revision 36985)
+++ file_act.c	(revision 36986)
@@ -49,10 +49,10 @@
 #include "search.h"
 #include <librnd/core/actions.h>
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include "layer_vis.h"
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "netlist.h"
 #include "plug_io.h"
 #include "obj_pstk_inlines.h"
Index: gui_act.c
===================================================================
--- gui_act.c	(revision 36985)
+++ gui_act.c	(revision 36986)
@@ -38,8 +38,8 @@
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
 #include "data.h"
-#include <librnd/core/tool.h>
-#include <librnd/core/grid.h>
+#include <librnd/hid/tool.h>
+#include <librnd/hid/grid.h>
 #include <librnd/core/error.h>
 #include "undo.h"
 #include "funchash_core.h"
@@ -51,7 +51,7 @@
 #include "find.h"
 #include "data_it.h"
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/compat_misc.h>
 #include "event.h"
 #include "layer.h"
@@ -59,10 +59,10 @@
 #include "layer_grp.h"
 #include "layer_vis.h"
 #include "attrib.h"
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_attrib.h>
 #include "operation.h"
 #include "obj_subc_op.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "route_style.h"
 #include "tool_logic.h"
 #include "obj_text_op.h"
Index: hid_cam.c
===================================================================
--- hid_cam.c	(revision 36985)
+++ hid_cam.c	(revision 36986)
@@ -36,7 +36,7 @@
 #include "board.h"
 #include "data.h"
 #include "hid_cam.h"
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/compat_misc.h>
 #include "layer_addr.h"
 #include "layer_vis.h"
Index: hid_cam.h
===================================================================
--- hid_cam.h	(revision 36985)
+++ hid_cam.h	(revision 36986)
@@ -2,7 +2,7 @@
 #define PCB_HID_HELPER_H
 
 #include "layer.h"
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_attrib.h>
 #include <genvector/gds_char.h>
 
 /*** CAM plugin side API ***/
Index: main.c
===================================================================
--- main.c	(revision 36985)
+++ main.c	(revision 36986)
@@ -66,15 +66,15 @@
 #include "layer_ui.h"
 #include "obj_text.h"
 #include "pcb_minuid.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/core/color.h>
 #include "netlist.h"
 #include "extobj.h"
-#include <librnd/core/pixmap.h>
+#include <librnd/hid/pixmap.h>
 
 #include <librnd/core/actions.h>
 #include "actions_pcb.h"
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/compat_misc.h>
 #include "tool_logic.h"
 #include "pixmap_pcb.h"
Index: main_act.c
===================================================================
--- main_act.c	(revision 36985)
+++ main_act.c	(revision 36986)
@@ -52,7 +52,7 @@
 #include <librnd/core/safe_fs.h>
 #include "flag_str.h"
 #include "obj_common.h"
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 #define PCB do_not_use_PCB
 
Index: obj_arc.c
===================================================================
--- obj_arc.c	(revision 36985)
+++ obj_arc.c	(revision 36986)
@@ -41,7 +41,7 @@
 #include "thermal.h"
 #include <librnd/core/compat_misc.h>
 #include "draw_wireframe.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 
 #include "obj_arc.h"
 #include "obj_arc_op.h"
Index: obj_gfx.c
===================================================================
--- obj_gfx.c	(revision 36985)
+++ obj_gfx.c	(revision 36986)
@@ -31,7 +31,7 @@
 #include "config.h"
 
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/actions.h>
 
 
Index: obj_line.c
===================================================================
--- obj_line.c	(revision 36985)
+++ obj_line.c	(revision 36986)
@@ -42,7 +42,7 @@
 #include "thermal.h"
 #include <librnd/core/compat_misc.h>
 #include "rotate.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/misc_util.h>
 
 #include "obj_line.h"
Index: obj_poly.c
===================================================================
--- obj_poly.c	(revision 36985)
+++ obj_poly.c	(revision 36986)
@@ -43,7 +43,7 @@
 #include "rotate.h"
 #include "search.h"
 #include "thermal.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 
 #include "conf_core.h"
 
Index: obj_poly_draw_helper.c
===================================================================
--- obj_poly_draw_helper.c	(revision 36985)
+++ obj_poly_draw_helper.c	(revision 36986)
@@ -29,10 +29,10 @@
  */
 
 #include "config.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "polygon.h"
 #include "obj_poly.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 
 static rnd_coord_t *fc_x = NULL, *fc_y = NULL;
 static size_t fc_alloced = 0;
Index: obj_pstk.c
===================================================================
--- obj_pstk.c	(revision 36985)
+++ obj_pstk.c	(revision 36986)
@@ -47,7 +47,7 @@
 #include "undo.h"
 #include "vtpadstack.h"
 #include "event.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/poly/offset.h>
 
 #define SQR(o) ((o)*(o))
Index: obj_rat.c
===================================================================
--- obj_rat.c	(revision 36985)
+++ obj_rat.c	(revision 36986)
@@ -31,7 +31,7 @@
 #include "data.h"
 #include "data_it.h"
 #include "conf_core.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include "undo.h"
 #include <librnd/poly/rtree.h>
 #include "search.h"
Index: obj_subc.c
===================================================================
--- obj_subc.c	(revision 36985)
+++ obj_subc.c	(revision 36986)
@@ -60,7 +60,7 @@
 #include "pcb_minuid.h"
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include "extobj.h"
 
 #define SUBC_AUX_NAME "subc-aux"
Index: obj_text.c
===================================================================
--- obj_text.c	(revision 36985)
+++ obj_text.c	(revision 36986)
@@ -37,7 +37,7 @@
 #include "board.h"
 #include "data.h"
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include "undo.h"
 #include "polygon.h"
 #include <librnd/poly/offset.h>
Index: object_act.c
===================================================================
--- object_act.c	(revision 36985)
+++ object_act.c	(revision 36986)
@@ -39,7 +39,7 @@
 
 #include "data.h"
 #include "board.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "change.h"
 #include <librnd/core/error.h>
 #include "undo.h"
Index: pixmap_pcb.c
===================================================================
--- pixmap_pcb.c	(revision 36985)
+++ pixmap_pcb.c	(revision 36986)
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <genht/htsp.h>
 
-#include <librnd/core/pixmap.h>
+#include <librnd/hid/pixmap.h>
 #include <librnd/core/error.h>
 #include <librnd/core/math_helper.h>
 #include <librnd/core/compat_misc.h>
Index: pixmap_pcb.h
===================================================================
--- pixmap_pcb.h	(revision 36985)
+++ pixmap_pcb.h	(revision 36986)
@@ -32,7 +32,7 @@
 #include <librnd/core/global_typedefs.h>
 #include <genht/htpp.h>
 
-#include <librnd/core/pixmap.h>
+#include <librnd/hid/pixmap.h>
 
 typedef struct pcb_pixmap_hash_s {
 	htpp_t meta;      /* all pixmaps, hashed and compared only by metadata (including natural_oid) - used to look up a specific transformed version */
Index: plug_io.c
===================================================================
--- plug_io.c	(revision 36985)
+++ plug_io.c	(revision 36986)
@@ -60,7 +60,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "event.h"
 #include <librnd/core/compat_misc.h>
 #include "route_style.h"
@@ -70,7 +70,7 @@
 #include <librnd/core/safe_fs.h>
 #include "plug_footprint.h"
 #include <librnd/core/file_loaded.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "view.h"
 
 pcb_plug_io_t *pcb_plug_io_chain = NULL;
Index: polygon_act.c
===================================================================
--- polygon_act.c	(revision 36985)
+++ polygon_act.c	(revision 36986)
@@ -44,7 +44,7 @@
 #include "draw.h"
 #include "search.h"
 #include "crosshair.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/core/actions.h>
 
 #include "obj_poly.h"
Index: remove_act.c
===================================================================
--- remove_act.c	(revision 36985)
+++ remove_act.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include "config.h"
 #include "data.h"
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "remove.h"
 #include "board.h"
 #include "layer_ui.h"
Index: route_draw.h
===================================================================
--- route_draw.h	(revision 36985)
+++ route_draw.h	(revision 36986)
@@ -2,7 +2,7 @@
 #define PCB_ROUTE_DRAW_H
 
 #include <librnd/core/global_typedefs.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 void pcb_route_draw(pcb_route_t *p_route, rnd_hid_gc_t GC);
 void pcb_route_draw_drc(pcb_route_t *p_route, rnd_hid_gc_t GC);
Index: select_act.c
===================================================================
--- select_act.c	(revision 36985)
+++ select_act.c	(revision 36986)
@@ -40,14 +40,14 @@
 #include "undo.h"
 #include "funchash_core.h"
 
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "select.h"
 #include "draw.h"
 #include "remove.h"
 #include "move.h"
 #include "tool_logic.h"
-#include <librnd/core/grid.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/grid.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/actions.h>
 
Index: stub_draw.h
===================================================================
--- stub_draw.h	(revision 36985)
+++ stub_draw.h	(revision 36986)
@@ -31,7 +31,7 @@
 #ifndef PCB_STUB_DRAW_FAB_H
 #define PCB_STUB_DRAW_FAB_H
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/rnd_bool.h>
 #include <librnd/core/global_typedefs.h>
 #include "draw.h"
Index: tool_logic.c
===================================================================
--- tool_logic.c	(revision 36985)
+++ tool_logic.c	(revision 36986)
@@ -28,9 +28,9 @@
 
 #include <librnd/core/hidlib_conf.h>
 #include "event.h"
-#include <librnd/core/grid.h>
+#include <librnd/hid/grid.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/core/conf_hid.h>
 
 #include "board.h"
Index: undo_act.c
===================================================================
--- undo_act.c	(revision 36985)
+++ undo_act.c	(revision 36986)
@@ -48,7 +48,7 @@
 
 #include "obj_line_draw.h"
 
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 static const char pcb_acts_Atomic[] = "Atomic(Save|Restore|Close|Block)";
 static const char pcb_acth_Atomic[] = "Save or restore the undo serial number.";