Fixing folder layout.
Merge branch 'master' into cole
Merge pull request #66 from areveal/cole

Cole