Feature/wp-controller restructuring

https://www.openproject.org/work_packages/8444