Change helpers folder name and clean users model