First couple of changes to modify the way routes work for subfolders.