Make a major reorganization