Modularize packages
Merge branch 'master' of https://github.com/jxnblk/bassplate

Conflicts:
	package.json
Fix package