Move helpers and include  in autoload