Re-arrange some dependencies