LPS-46232 Staging controller classes refactoring

Hey Brian,

@danielkocsis has made some changes in the commits, he separated the "no logic changes" commits from the state changing commits.

Thanks,

Máté