Un-nest HWRP classes by one level
Add a CLI recipe and associated tests