Alphabetical re-order & software section