Improved URI paths. Relates to #7.