Reduce umbrella imports

Wreaks havoc at higher levels when importing the same projects elsewhere too.