Merge pull request #745 from alphagov/refactor/move-client-views

Refactor/move client views
Separate client and server views for availability