initial refactor of treatment controller

Reviewer: DanV (post)
Issue: 9256