Added TODO task for reorganizing how URLs are configured