reorganizing project as per GP conventions