rearranging files
Merge branch 'master' of github.com:larsendt/xhab-spot