Collapse single providers to multiprovider

[cherking19]

Currently there are some providers that are nested within each other. For simplicity, these should be collapsed into the multiprovider in main.