Restructured validation files.