Virtual week created and tested.
Provider (and auxiliary classes) refactoring.