Refactor svmp-server