Moves Account-related services to appropriate file
Cleans up services-host