Folder demo and data moved to the right place