Organize benchmarks under folder benchmarks instead of samples

Can we add an arg (or maybe a different function) that allows us to specify which project folder a sample or benchmark should go into? Currently both samples and benchmarks show up under samples in Visual Studio.