Reorganizing dependency files