added the saveimage from shanencross and changed package structure