Revert "restructure"

This reverts commit 6f5445a3abad9f32ab19d6929c308c116a976976.