api URL reorg / cleanup