Alphabetisation of the Wiring

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

Also removes some duplicated requires at the top of the wiring.