Refactoring
adding urls selector and factoring import URLs