Include migulorama in contrib file, bump version, some trivial reorg.