Update and rename Url.php to Uri.php