Reorganization of SDK section (see #361)