Don't group in folders even if they are configured

This branch rectifies my omission in the last one.