Moved some dependencies around due to builds failing, need to review