Rearranging dependencies