moving helpers files to lib