HTTP/REST reorg