Refactor of svmp-server