This just mangles the library names for no good reason.

Restructured to better fit existing build structure