Make only one include required to load this whole class cluster
Activate support for png/jpg
Add Test for png/jpg file creation