Fix package names, Document Server a little