Better package layout.

Closes #2.