Reorganization, fixes

Fixes #11