refactoring of package names for consistency
Fixing problems with image handling.
image mime types are now set automatically. Although this is a bit of a hack.