Repackaged the libs properly so no need to make new folders