Support all of these

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
For safety

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Reflow

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Reflows

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Delete empty dirs

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>