Standardize format (we now use FML's formatter), organize imports
Also remove all mcoverride classes, in favour of a more elegant solution