Revert "Test new structure"

This reverts commit d843704031a3ed1ba409ad59545511333423b7df.