Moving most of the integration section to the relevant user and admin se...

...ctions; fixes #1163