[Z-health-Mgmt] Revision of WP structure