Revert "basic structure"

This reverts commit caa8aff615b9f3aaeff87e22b213c0d02b7775d8.