More renaming, build to dist

Fixes #6