(*) Reorganization of services to make it easier to implement multi-platform support
(*) More Android support