Break long lines
Remove leading './' from archived file names
Include kestrel in demo packages