Remerge the admin classes.

Splitting them in separate files in the admin folder caused the 'user setup'
section in the admin index to be given a wrong URL.
Merge remote-tracking branch 'pbs/master'