Rearrange dependency