nozomi: restructure for cfx