Issue 23: I moved server to its own package