Fixing libraries and building.
Reorganize dependencies a bit more.