Alphabetisation of the Wiring and Observers

This commit alphabetises some of the dependencies, attrs and moves the
factories around in the wiring to group them in a more sensible way.