updated for vendor folder, reordered globals