Added url parser and tests for him. Some structure chage...