Restructure vendor folder - change all binaries to be gelato specifics, and various fixes