Restructured code to make the entire thing more readable.
Changed how models are used to reflect changes to app.js
Changed how models are used to reflect changes to app.js