[Z-health-Mgmt] Re: Revision of WP structure