Initial dist subtree commit
moving some things around