Refactoring urls.js a lot