New folder structure (as requested)