Converting images manager into xml manager
Cleaning last commit