Refacto move hydrators to specific namespace