Merge branch 'master' of https://github.com/ModDamage/ModDamage
Finish horrible restructuring.

Let the fixes begin