Improve url organization