Minor renaming
Reduced visibility of loadImage
No need to use proxy entities anymore
Fixed some imports