Dynamics CRM 2016 Migration code compatibility issues

HI Friends,

We recently did migration from CRM 2011 to CRM 2016 On premise.

We lot of java code using CRM FETCH Kit( https://crmfetchkit.codeplex.com/) to retrieve data in CRM.This tool exposing the Endpoint 2011 organization service.

I think CRM Organization service is deprecated in CRM 2016,we need to re write the code using Web API?As per Microsoft Organization service deprecated after 9.0 release.

Thanks