Renamed files
Reorganized dump files
Reorganized tests