Major refactoring, made some working copies
More refactoring. ReplicaManager2 is now Serializable
Deprecated previous classes. Also returned test classes to correct location after refactoring