Reorganizing src/