fixing sorting and removing a couple unneeded files