Moved request handlers into a separate group for each service to reduce the number of files that need to be looked at.