Refactor server management

This fixes #3