PLD: move wrappers to their own namespace