Improve API so that url path pretty much matches local file path