Add KDR Module, Reformat some other stuff