moved shuffle into new Configuration object
moved logic for shuffling into Configuration, mocking it in tests