Revert "restructure"

This reverts commit c1d702e8cd5ac391a34f4511f97f13bdaf652285.