organized models to suit incoming data
Merge pull request #3 from jsuich/user_screen

organized models to suit incoming data