Completed separation of repositories into XML based and Data Object based.  All tests pass.