api draft restructuring