Add vendored libs
some cleanup