Remove stand-alone interfaces; make enum for geoloc status

Moved interfaces into relating classes.
Replaced 'int enum pattern' by enum for geolocation status.