Refactor: Prepare for possible merge. Also extract RMI-interface