Move Formatter into formatter