small refactor + UML for server package
merge