Cleaning up some spring configuration files.
Turning ServerInfo controller into an annotated controller.