Simplify auth service
Sort imported services alphabetically