Moved functions in the url parsing module around