New folder structure for demo