VID-1832 refactoring to remove non-controller methods from controller an...

...d into helper class

Don't merge yet.