reordering files and removing cruft