rearranged kiwi.ts to reference in terms of logical rather than alphabetical order