Improve traces. Simplify folder management.