Reorganize packages for image-related functionality