change structure and rename some blocks