Cleanup and reorganize UploadImageModel
Small code improvements
Add per plugin settings support and make the contact plugin email configurable