Changed path to vendor folder and refactored