Reorganized q1 folder