Move code from Bob into the package; Fix Shuffler tests; All, except trainer tests, are passing