add flat GV export, restructure traits, rename