Moved people model into module
Lots of improvments