Cleanup Tool Changes

Unfortunately the changes highlighted in this pull request include the client changes. maybe they will be excluded as soon as i accept the other pull request.
I would prefer different names for the interface and its implementations, in case of doubt ReplicationPolicyImplementation.