Refactorid rendering of dump.
Files moved.