Moving libs around for legacy