Reverted /vcp subdirectory scope.