Metro and McCormack will cut retail, add affordable housing at Taylor Yard project