Revert "structure"

This reverts commit 06e389e83c0599dca4d46339774d58a50d864338.