Add Formatter Module and refactor controllers