Revert "restructure"

This reverts commit 96c4a16ab9cf621dbd422e813db1a64108d21377.