Added URL resolver. Refactored
Rspec
specs