The construction of new beamlines defined in the ESRF upgrade program, requires high performance optics, for which thermal and mechanical stability will be of the utmost importance. Solutions for optimizing drifts and thermal gradients, as well as vibration free positioning have been analysed. This has lead to new opto-mechanical engineering able to implement generic solutions for the optics, such as new architecture for flat or bent mirrors, multilayer monochromators, and a new generation hexapod for toroidal mirrors. Vertical incidence fine tuning within 200 nrad, as well as horizontal reflection resolution in the range of 50 nrad, has lead to the development of different movers and positioning mechanisms. A review is presented, considering the different design validation stages and laboratory commissioning and showing performance achieved on the very first upgrade beamlines.