rearrange file dependencies