Code division to simplify PZP code base

Jira Issue: WP-860