Changed the Helper classes to be Services instead