Reorganize week-blocks and dates once more