PIM-2136 : rename hydrator folders to be consistent with OroGridBundle
PIM-2136 : CS Fix