Updated some libs

This shifted references around & changed path style.