Fix scripts and structure
Rename mat1322