Restructure part system again