rev the modules
tidy
lint
reorg
Merge branch 'groom'