Fixing up URL structure.