refactoring for new server
updated documentation and presentation