Removed non-animal files, moved animal pictures to images.
Fixed conflicts