reorganizing src (2)