Yes it was. Satya made some additional changes later (mainly downsizing the hardware division and merging it with OSG/Windows) but the basis of the organization

Yes it was. Satya made some additional changes later (mainly downsizing the hardware division and merging it with OSG/Windows) but the basis of the organizational structure still essentially follows the 2013 reorg - in particular, it's still organized functionally.