Reorganized the URLs file so that it reuses URL patterns