Reorg; headers, use "Location" header for everything