Reorganization, fixes

Fixes #11, and improves my workspace a bit.