removed useless stuff
move images to org.images