A big nasty commit which creates 2 separate sections for software and robotics.