rename Formatter classes to Format