Repair

Attempted to split into smaller segments, RMI functionality lost,
loopback functionality lost, couldn't fit without resetting to earlier
format.  Changed package name only. May try to split code again.