Lots of changes to models and some renaming
Merge pull request #131 from findsorguk/updateModels

Lots of changes to models and some renaming