reordering some files etc