More module re-organisation.  LogoutView needs putting in the right
place