Base package setup (revised)

Merged to the wrong branch. Fixed master branch to reflect undo, and now merging to the correct `dev` branch.