Revert "flattened"

This reverts commit d0415f310c4585d98ca8e955b2065df3ab7df95c.
undo flatten
Flattened