Reorganized project folder