Tidied up classes

Merged Mod and Affix classes as there were two versions of each.