Revert "Merge remote-tracking branch 'origin/new_structure'"

This reverts commit 3c91e1ca445bf9502bba645512e921888d0df255, reversing
changes made to aa521a26850220922a27e60c34d1baa76709989b.