Code tidy-up: removed the "Models" namespace from the type name.

I was looking over the code-base and couldn't help but tidy-up the namespaces.