refactored url structure