reorganize, remove mat2 from dependencies
added Compound stub