Refactroing code
Merge branch 'new-home' of https://github.com/priyanka-techmaes/kisanfarms into new-home