Reorganized phase 1 into folder