Refactored URLMapping
Addapted application for the new URL structure