Extract week related methods to their own unit files