Rearrange package. Fixes #2.