Converting helper files to services