Revert "restructure"

This reverts commit 101dd3b1a08d0eb54e1491dbdde7fdaaa1d0a380.