diff --git a/src/inc/mgmt.h b/src/inc/mnode.h
similarity index 100%
rename from src/inc/mgmt.h
rename to src/inc/mnode.h
diff --git a/src/inc/buildInfo.h b/src/util/inc/buildInfo.h
similarity index 100%
rename from src/inc/buildInfo.h
rename to src/util/inc/buildInfo.h
diff --git a/src/inc/hash.h b/src/util/inc/hash.h
similarity index 100%
rename from src/inc/hash.h
rename to src/util/inc/hash.h
diff --git a/src/inc/hashutil.h b/src/util/inc/hashutil.h
similarity index 100%
rename from src/inc/hashutil.h
rename to src/util/inc/hashutil.h
diff --git a/src/inc/ihash.h b/src/util/inc/ihash.h
similarity index 100%
rename from src/inc/ihash.h
rename to src/util/inc/ihash.h
diff --git a/src/inc/lz4.h b/src/util/inc/lz4.h
similarity index 100%
rename from src/inc/lz4.h
rename to src/util/inc/lz4.h
diff --git a/src/inc/shash.h b/src/util/inc/shash.h
similarity index 100%
rename from src/inc/shash.h
rename to src/util/inc/shash.h
diff --git a/src/inc/tast.h b/src/util/inc/tast.h
similarity index 100%
rename from src/inc/tast.h
rename to src/util/inc/tast.h
diff --git a/src/inc/tcache.h b/src/util/inc/tcache.h
similarity index 100%
rename from src/inc/tcache.h
rename to src/util/inc/tcache.h
diff --git a/src/inc/tchecksum.h b/src/util/inc/tchecksum.h
similarity index 100%
rename from src/inc/tchecksum.h
rename to src/util/inc/tchecksum.h
diff --git a/src/inc/tcrc32c.h b/src/util/inc/tcrc32c.h
similarity index 100%
rename from src/inc/tcrc32c.h
rename to src/util/inc/tcrc32c.h
diff --git a/src/inc/textbuffer.h b/src/util/inc/textbuffer.h
similarity index 100%
rename from src/inc/textbuffer.h
rename to src/util/inc/textbuffer.h
diff --git a/src/inc/tglobalcfg.h b/src/util/inc/tglobalcfg.h
similarity index 100%
rename from src/inc/tglobalcfg.h
rename to src/util/inc/tglobalcfg.h
diff --git a/src/inc/thash.h b/src/util/inc/thash.h
similarity index 100%
rename from src/inc/thash.h
rename to src/util/inc/thash.h
diff --git a/src/inc/thistogram.h b/src/util/inc/thistogram.h
similarity index 100%
rename from src/inc/thistogram.h
rename to src/util/inc/thistogram.h
diff --git a/src/inc/tidpool.h b/src/util/inc/tidpool.h
similarity index 100%
rename from src/inc/tidpool.h
rename to src/util/inc/tidpool.h
diff --git a/src/inc/tinterpolation.h b/src/util/inc/tinterpolation.h
similarity index 100%
rename from src/inc/tinterpolation.h
rename to src/util/inc/tinterpolation.h
diff --git a/src/inc/tkey.h b/src/util/inc/tkey.h
similarity index 100%
rename from src/inc/tkey.h
rename to src/util/inc/tkey.h
diff --git a/src/inc/tlog.h b/src/util/inc/tlog.h
similarity index 100%
rename from src/inc/tlog.h
rename to src/util/inc/tlog.h
diff --git a/src/inc/tlosertree.h b/src/util/inc/tlosertree.h
similarity index 100%
rename from src/inc/tlosertree.h
rename to src/util/inc/tlosertree.h
diff --git a/src/inc/tmd5.h b/src/util/inc/tmd5.h
similarity index 100%
rename from src/inc/tmd5.h
rename to src/util/inc/tmd5.h
diff --git a/src/inc/tmempool.h b/src/util/inc/tmempool.h
similarity index 100%
rename from src/inc/tmempool.h
rename to src/util/inc/tmempool.h
diff --git a/src/inc/tmodule.h b/src/util/inc/tmodule.h
similarity index 100%
rename from src/inc/tmodule.h
rename to src/util/inc/tmodule.h
diff --git a/src/inc/tnote.h b/src/util/inc/tnote.h
similarity index 100%
rename from src/inc/tnote.h
rename to src/util/inc/tnote.h
diff --git a/src/inc/tsched.h b/src/util/inc/tsched.h
similarity index 100%
rename from src/inc/tsched.h
rename to src/util/inc/tsched.h
diff --git a/src/inc/tschemautil.h b/src/util/inc/tschemautil.h
similarity index 100%
rename from src/inc/tschemautil.h
rename to src/util/inc/tschemautil.h
diff --git a/src/inc/tscompression.h b/src/util/inc/tscompression.h
similarity index 100%
rename from src/inc/tscompression.h
rename to src/util/inc/tscompression.h
diff --git a/src/inc/tskiplist.h b/src/util/inc/tskiplist.h
similarity index 100%
rename from src/inc/tskiplist.h
rename to src/util/inc/tskiplist.h
diff --git a/src/inc/tsocket.h b/src/util/inc/tsocket.h
similarity index 100%
rename from src/inc/tsocket.h
rename to src/util/inc/tsocket.h
diff --git a/src/inc/tsqldef.h b/src/util/inc/tsqldef.h
similarity index 100%
rename from src/inc/tsqldef.h
rename to src/util/inc/tsqldef.h
diff --git a/src/inc/tsqlfunction.h b/src/util/inc/tsqlfunction.h
similarity index 100%
rename from src/inc/tsqlfunction.h
rename to src/util/inc/tsqlfunction.h
diff --git a/src/inc/tstoken.h b/src/util/inc/tstoken.h
similarity index 100%
rename from src/inc/tstoken.h
rename to src/util/inc/tstoken.h
diff --git a/src/inc/tstrbuild.h b/src/util/inc/tstrbuild.h
similarity index 100%
rename from src/inc/tstrbuild.h
rename to src/util/inc/tstrbuild.h
diff --git a/src/inc/tsystem.h b/src/util/inc/tsystem.h
similarity index 100%
rename from src/inc/tsystem.h
rename to src/util/inc/tsystem.h
diff --git a/src/inc/ttime.h b/src/util/inc/ttime.h
similarity index 100%
rename from src/inc/ttime.h
rename to src/util/inc/ttime.h
diff --git a/src/inc/ttimer.h b/src/util/inc/ttimer.h
similarity index 100%
rename from src/inc/ttimer.h
rename to src/util/inc/ttimer.h
diff --git a/src/inc/ttypes.h b/src/util/inc/ttypes.h
similarity index 100%
rename from src/inc/ttypes.h
rename to src/util/inc/ttypes.h
diff --git a/src/inc/tutil.h b/src/util/inc/tutil.h
similarity index 100%
rename from src/inc/tutil.h
rename to src/util/inc/tutil.h