revert to older, working structure