Consolidate formatters into Flow\\Formatter namespace

Change-Id: I411820a49163752652a535f0bf716cd510afd785
Merge "Consolidate formatters into Flow\\Formatter namespace"