Icons vendors

Take icons from images to images/icons and add txt file icon
Move vendors from their respective directory to vendor directory
Resolve Merge Conflicts.