Revert "Still testing structure"

This reverts commit d5439c81002d62fe0a2877f0de11f7241ce9d9ff.
Revert "testing new structure"

This reverts commit 8cddab80f08c620ae9794877f04a91c899e81c6d.