Added stuff
Changed structure
Merge branch 'master' of github.com:marcusnygren/Elements