Reorganized SrProject/ project structure