Moving items into right directory
Fixing some formatting in the dumpcore methods