Change structure so it's all one block