reorganized folder structure in weeks + xx_extras