Add Images Folder and some modification