reorganizing project features re #18