Reorganized spec files.