More restructuring
Merge remote-tracking branch 'upstream/master' into feature/postinstall

* upstream/master:
  More restructuring

Conflicts:
	package.json