Restructuring before working on bigger changes