re-org to follow the guide