Collapse signal.go back into server.go