Totally rewrite the server code; restructure packages; still work in
progress