Restructure Parts and Circuit