[Pooja/Faris] Refactored image model, and removed all tests. It is Pooja's idea, I know :(