Moving set logic, and fixing structure
Merge branch 'master' of github.com:uecode/amazon-bundle