Feature/559 new url paths

Implements issue #559