Start of refactoring out external libs to vendor directory - unstable