Moved around library dependencies