Merge Software and Applications in a single section named Tools

[enridaga]

Not super-clear distinction and not many components as Applications. Joining them makes it neater at the moment.