Revert "restructuring"

This reverts commit 6ac7bc1e32dcd9c584c003d15a32d3aeceade56d.