Refactoring urls structure