Going back to barebones structure