Reorganized project into folders