make image and accountable policies into modules instead of classes