Work merge and major reorganisation