Better namespacing for plumbing components
Merge branch 'develop-frontend' into feature/issue-401-plumbing-components-need-better-namespacing