Minor rearchitecting; moving server-related modules into server.py.