Cheeki Breeki

rearranges stuff on the unity index