move subfolder contents, date regex
Merge branch 'master' of https://github.com/sahellebusch/Prometheus