Revert "pod structure"

This reverts commit 328d0176695d72292cafc43ef2b441c865796e36.