Changed folder names and corrected vendor source location.