Attempt at unifying the subfolder form.