Use Week as a top-level concept. Rework Ordinals