Moving from URL to URI

Did some minor refactoring to add URI instead of URL. I marked URL as deprecated. Let me know if that is fine