Cleanup API layout

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>