Builder package

Fixes #19