Clean-up, re-organize and make 'include' work with inventory roles