Feature/add clean url structure

Delete branch after merge.