qk-cg-util
source reorg; generated directory import headers