Move images to separate folder
Minor code style changes
Point manifest to new image folder.