Rellocate files
Split plugins kw in a different file. Examples add
Improvement in syntax for control files.