New folder structure, storage scheme