Restructuring, and some work on the server.