Revised folder structuring.