reorganizing ImageSource classes