Reorder software drivers

Changes has been validated by both Xenopathic and I.