Pass storage variable to step
Improve checkout storage, remove groups

Now steps contains groups