Moved libs around to make more sense