More work on consolidating KitSH and KitDLL and supporting C-VFS