Revert "Restructure"

This reverts commit e3e29d3c28c97de62dfc561559aef2e10c110fb7.