standardise the folder layout
Add keng's NPQ r-group stuff