Move helpers/sorting and models/folder in lib