Different CLI layout and setup.py first stab. Fixes #7.