Add reorganize.php to reorganize old cache files to new structure
Merge branch 'feature/compare-local' into develop