Complete reorganization of services so they can easily be implemented for each platform