Add support for umbrella projects in mix

Fixes #667