Perform some major restructuring