Renamed all uri (and get/set uri) to id
Changed visibility for some public attributes
Removed unused methods