Yet another major reorganization and a few new features.

15 files changed