Updated with metadata and folder structure