demo folder reorganization