De-wrapped variant of B# class output, fixed services order in api scaffold