Sort files better and remove PacketDevice