Moved remaining two ServerTraits and some Modifiers to Mods.Common