Re-arranged code to make the ordering more consistent
Moved models into a models/ folder, and removed some old dependencies
Added an 'id' to the view object when it's retrieved