More commits and folders and stuff
Merge branch 'AndreasBranch'