Move theme options to own folder
Add defautl to layout options
Update theme options assets location
Add default to options class
Update upsell page
Fix conflict