PLD: move api to separate namespace