A workaround is to use OneDrive with Camera Upload feature turned on, and then sync this back down to your PC. You can choose how to sort (e.g. folders by year and month).