This is why I switched to Infinity, it’s much more organized with old folders structure and it’s never messy.