#2. Reorganise models into a module to make future additions easier.

Also tidy imports so they are better arranged and avoid relative imports.