Restructure congruence part