Renamed files and deleted duplicate api's