Refactor folder structure
Merge branch 'master' into feature/coffeescript

* master:
  Refactor folder structure

Conflicts:
	gulpfile.js
	index.js
	package.json