Refactored urls. Close #43.