Upgrade Image creation and add some test images
Rearange Xcode project