Refactor Flow\\Formatter namespace

Requires core patch I28d4e41437e485e518f2a23b6da00cdc430a8c23
& I82ceb0b223159c71796f64a890cf6209a6544209

Change-Id: I2b4df3704f1eff53d8aa473aee404c0068a7b8b8