Refactor hosts and URL's