Further generalized some controllers, services, and directives.