Performance improvements on FindMe, now using a sorted array
Start refactoring
Merge model factories and services to have less files and centralize logic