Fix year/month folders. Closes #1324