Reorg, fixes #4