Reorg source (issue #72)