Updated to modern static lib structure